projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
da8cadb
)
[NETFILTER]: ctnetlink: set expected bit for related conntracks
author
Pablo Neira Ayuso
<
[email protected]
>
Wed, 12 Dec 2007 18:34:29 +0000
(10:34 -0800)
committer
David S. Miller
<
[email protected]
>
Fri, 14 Dec 2007 21:54:33 +0000
(13:54 -0800)
This patch is a fix. It sets IPS_EXPECTED for related conntracks.
Signed-off-by: Pablo Neira Ayuso <
[email protected]
>
Signed-off-by: Patrick McHardy <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
net/netfilter/nf_conntrack_netlink.c
patch
|
blob
|
history
diff --git
a/net/netfilter/nf_conntrack_netlink.c
b/net/netfilter/nf_conntrack_netlink.c
index 9be1826e6cdd30ded188df436c604051b67653c5..7d231243754ac089dbbf0f61f2eef20bd0908395 100644
(file)
--- 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);