summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2007-12-12 10:34:29 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2007-12-14 13:54:33 -0800
commitf2a89004da23a5ed2d78ac5550ccda5b714fe7d0 (patch)
tree71b945c3364b92103d66109880f60d32868fdc8a /net
parentda8cadb31b82c9d41fc593c8deab6aa20b162d6b (diff)
downloadlinux-stable-f2a89004da23a5ed2d78ac5550ccda5b714fe7d0.tar.gz
linux-stable-f2a89004da23a5ed2d78ac5550ccda5b714fe7d0.tar.bz2
linux-stable-f2a89004da23a5ed2d78ac5550ccda5b714fe7d0.zip
[NETFILTER]: ctnetlink: set expected bit for related conntracks
This patch is a fix. It sets IPS_EXPECTED for related conntracks. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nf_conntrack_netlink.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 9be1826e6cdd..7d231243754a 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -1024,8 +1024,10 @@ ctnetlink_create_conntrack(struct nlattr *cda[],
}
/* setup master conntrack: this is a confirmed expectation */
- if (master_ct)
+ if (master_ct) {
+ __set_bit(IPS_EXPECTED_BIT, &ct->status);
ct->master = master_ct;
+ }
add_timer(&ct->timeout);
nf_conntrack_hash_insert(ct);