# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/10/24 16:16:40+02:00 tgraf@suug.ch 
#   [NETFILTER]: Fix warning in CONNMARK
#   
#   Signed-off-by: Thomas Graf <tgraf@suug.ch>
#   Signed-off-by: Patrick McHardy <kaber@trash.net>
# 
# net/ipv4/netfilter/ipt_CONNMARK.c
#   2004/10/24 16:16:34+02:00 tgraf@suug.ch +1 -1
#   [NETFILTER]: Fix warning in CONNMARK
#   
#   Signed-off-by: Thomas Graf <tgraf@suug.ch>
#   Signed-off-by: Patrick McHardy <kaber@trash.net>
# 
diff -Nru a/net/ipv4/netfilter/ipt_CONNMARK.c b/net/ipv4/netfilter/ipt_CONNMARK.c
--- a/net/ipv4/netfilter/ipt_CONNMARK.c	2004-10-25 01:13:43 +02:00
+++ b/net/ipv4/netfilter/ipt_CONNMARK.c	2004-10-25 01:13:43 +02:00
@@ -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;