* [PATCH 2.6 14/19]: Fix warning in CONNMARK
@ 2004-10-25 0:49 Patrick McHardy
0 siblings, 0 replies; only message in thread
From: Patrick McHardy @ 2004-10-25 0:49 UTC (permalink / raw)
To: David S. Miller; +Cc: Netfilter Development Mailinglist
[-- Attachment #1: Type: text/plain, Size: 129 bytes --]
Fix warning in CONNMARK:
net/ipv4/netfilter/ipt_CONNMARK.c:63: warning: suggest parentheses
around arithmetic in operand of ^
[-- Attachment #2: 14.diff --]
[-- Type: text/x-patch, Size: 1000 bytes --]
# 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;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2004-10-25 0:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-10-25 0:49 [PATCH 2.6 14/19]: Fix warning in CONNMARK Patrick McHardy
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.