diff options
| author |   Pablo Neira Ayuso <pablo@netfilter.org> | 2007-12-12 10:34:29 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@sunset.davemloft.net> | 2007-12-14 13:54:33 -0800 |
| commit | f2a89004da23a5ed2d78ac5550ccda5b714fe7d0 (patch) | |
| tree | 71b945c3364b92103d66109880f60d32868fdc8a /net | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | linux-dev-f2a89004da23a5ed2d78ac5550ccda5b714fe7d0.tar.xz linux-dev-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.c | 4 |
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); |