Commit 7cee432a authored by Nick Sillik's avatar Nick Sillik Committed by David S. Miller

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

Signed-off-by: default avatarNick Sillik <n.sillik@temple.edu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a77be819
...@@ -510,7 +510,7 @@ init_conntrack(const struct ip_conntrack_tuple *tuple, ...@@ -510,7 +510,7 @@ init_conntrack(const struct ip_conntrack_tuple *tuple,
/* Welcome, Mr. Bond. We've been expecting you... */ /* Welcome, Mr. Bond. We've been expecting you... */
__set_bit(IPS_EXPECTED_BIT, &conntrack->status); __set_bit(IPS_EXPECTED_BIT, &conntrack->status);
conntrack->master = exp->master; conntrack->master = exp->master;
#if CONFIG_IP_NF_CONNTRACK_MARK #ifdef CONFIG_IP_NF_CONNTRACK_MARK
conntrack->mark = exp->master->mark; conntrack->mark = exp->master->mark;
#endif #endif
nf_conntrack_get(&conntrack->master->ct_general); nf_conntrack_get(&conntrack->master->ct_general);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment