netdev
[Top] [All Lists]

[PATCH] iptables: Fix warning in CONNMARK

To: "David S. Miller" <davem@xxxxxxxxxxxxx>
Subject: [PATCH] iptables: Fix warning in CONNMARK
From: Thomas Graf <tgraf@xxxxxxx>
Date: Sun, 24 Oct 2004 15:57:21 +0200
Cc: laforge@xxxxxxxxxxxxx, hno@xxxxxxxxxxxxxxx, netdev@xxxxxxxxxxx
Sender: netdev-bounce@xxxxxxxxxxx
Signed-off-by: Thomas Graf <tgraf@xxxxxxx>

--- linux-2.6.10-rc1-bk1.orig/net/ipv4/netfilter/ipt_CONNMARK.c 2004-10-24 
10:58:49.000000000 +0200
+++ linux-2.6.10-rc1-bk1/net/ipv4/netfilter/ipt_CONNMARK.c      2004-10-24 
15:35:18.000000000 +0200
@@ -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;

<Prev in Thread] Current Thread [Next in Thread>