aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Sillik <n.sillik@temple.edu>2005-07-27 17:46:03 -0400
committerDavid S. Miller <davem@davemloft.net>2005-07-27 17:46:03 -0400
commit7cee432a22bb328ea7a4012dacc5a3471fabeb07 (patch)
treeafa3905fe3a110b5baf8e47e3aabdb0faaadb8be
parenta77be819f94fc55627ee257f496198ad703aaad4 (diff)
[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>
-rw-r--r--net/ipv4/netfilter/ip_conntrack_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c
index 63bf88264980..86f04e41dd8e 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,
510 /* Welcome, Mr. Bond. We've been expecting you... */ 510 /* Welcome, Mr. Bond. We've been expecting you... */
511 __set_bit(IPS_EXPECTED_BIT, &conntrack->status); 511 __set_bit(IPS_EXPECTED_BIT, &conntrack->status);
512 conntrack->master = exp->master; 512 conntrack->master = exp->master;
513#if CONFIG_IP_NF_CONNTRACK_MARK 513#ifdef CONFIG_IP_NF_CONNTRACK_MARK
514 conntrack->mark = exp->master->mark; 514 conntrack->mark = exp->master->mark;
515#endif 515#endif
516 nf_conntrack_get(&conntrack->master->ct_general); 516 nf_conntrack_get(&conntrack->master->ct_general);