Skip to contentSkip to conversation

: Fix warning in CONNMARK

PATCH In review Patrick McHardy 1 participant 1 message Oct 25, 2004

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 14/19 : Fix warning in CONNMARK

Fix warning in CONNMARK:
net/ipv4/netfilter/ipt_CONNMARK.c:63: warning: suggest parentheses around arithmetic in operand of ^

# This is a BitKeeper generated diff -Nru style patch. #
# ChangeSet
# 2004/10/24 16:16:40+02:00 [email protected]
# [NETFILTER]: Fix warning in CONNMARK
#
# Signed-off-by: Thomas Graf <[email protected]>
# Signed-off-by: Patrick McHardy <[email protected]>
#
# net/ipv4/netfilter/ipt_CONNMARK.c
# 2004/10/24 16:16:34+02:00 [email protected] +1 -1
# [NETFILTER]: Fix warning in CONNMARK
#
# Signed-off-by: Thomas Graf <[email protected]>
# Signed-off-by: Patrick McHardy <[email protected]>
#

net/ipv4/netfilter/ipt_CONNMARK.c +1 -1
diff -Nru a/net/ipv4/netfilter/ipt_CONNMARK.c b/net/ipv4/netfilter/ipt_CONNMARK.c
@@ -60,7 +60,7 @@
 		break;
 	    case IPT_CONNMARK_RESTORE:
 		nfmark = (*pskb)->nfmark;
-		diff = (ct->mark ^ nfmark & markinfo->mask);
+		diff = (ct->mark ^ nfmark) & markinfo->mask;
 		if (diff != 0) {
 		    (*pskb)->nfmark = nfmark ^ diff;
 		    (*pskb)->nfcache |= NFC_ALTERED;