diff options
| author | Nick Sillik <n.sillik@temple.edu> | 2005-07-27 14:46:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-07-27 14:46:03 -0700 |
| commit | 7cee432a22bb328ea7a4012dacc5a3471fabeb07 (patch) | |
| tree | afa3905fe3a110b5baf8e47e3aabdb0faaadb8be /net | |
| parent | a77be819f94fc55627ee257f496198ad703aaad4 (diff) | |
| download | talos-obmc-linux-7cee432a22bb328ea7a4012dacc5a3471fabeb07.tar.gz talos-obmc-linux-7cee432a22bb328ea7a4012dacc5a3471fabeb07.zip | |
[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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/netfilter/ip_conntrack_core.c | 2 |
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, /* 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); |
