netdev
[Top] [All Lists]

Re: [PATCH] iptables: Fix warning in CONNMARK

To: Thomas Graf <tgraf@xxxxxxx>
Subject: Re: [PATCH] iptables: Fix warning in CONNMARK
From: Patrick McHardy <kaber@xxxxxxxxx>
Date: Sun, 24 Oct 2004 16:17:34 +0200
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>, laforge@xxxxxxxxxxxxx, hno@xxxxxxxxxxxxxxx, netdev@xxxxxxxxxxx, Netfilter Development Mailinglist <netfilter-devel@xxxxxxxxxxxxxxxxxxx>
In-reply-to: <20041024135721.GO21977@postel.suug.ch>
References: <20041024135721.GO21977@postel.suug.ch>
Sender: netdev-bounce@xxxxxxxxxxx
User-agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.7.3) Gecko/20041008 Debian/1.7.3-5
Applied, thanks.

Thomas Graf wrote:

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>