From: Nick Sillik <n.sillik@temple.edu>
Date: Wed, 27 Jul 2005 21:46:03 +0000 (-0700)
Subject: [NETFILTER]: Fix -Wunder error in ip_conntrack_core.c
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7cee432a22bb328ea7a4012dacc5a3471fabeb07;p=mv-sheeva.git

[NETFILTER]: Fix -Wunder error in ip_conntrack_core.c

Signed-off-by: Nick Sillik <n.sillik@temple.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c
index 63bf8826498..86f04e41dd8 100644
--- a/net/ipv4/netfilter/ip_conntrack_core.c
+++ b/net/ipv4/netfilter/ip_conntrack_core.c
@@ -510,7 +510,7 @@ init_conntrack(const struct ip_conntrack_tuple *tuple,
 		/* Welcome, Mr. Bond.  We've been expecting you... */
 		__set_bit(IPS_EXPECTED_BIT, &conntrack->status);
 		conntrack->master = exp->master;
-#if CONFIG_IP_NF_CONNTRACK_MARK
+#ifdef CONFIG_IP_NF_CONNTRACK_MARK
 		conntrack->mark = exp->master->mark;
 #endif
 		nf_conntrack_get(&conntrack->master->ct_general);