projects
/
platform
/
kernel
/
linux-arm64.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a77be81
)
[NETFILTER]: Fix -Wunder error in ip_conntrack_core.c
author
Nick Sillik
<n.sillik@temple.edu>
Wed, 27 Jul 2005 21:46:03 +0000
(14:46 -0700)
committer
David S. Miller
<davem@davemloft.net>
Wed, 27 Jul 2005 21:46:03 +0000
(14:46 -0700)
Signed-off-by: Nick Sillik <n.sillik@temple.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/netfilter/ip_conntrack_core.c
patch
|
blob
|
history
diff --git
a/net/ipv4/netfilter/ip_conntrack_core.c
b/net/ipv4/netfilter/ip_conntrack_core.c
index
63bf882
..
86f04e4
100644
(file)
--- 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
+#if
def
CONFIG_IP_NF_CONNTRACK_MARK
conntrack->mark = exp->master->mark;
#endif
nf_conntrack_get(&conntrack->master->ct_general);