diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-08 09:35:03 (GMT) |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2008-10-08 09:35:03 (GMT) |
| commit | 9b03f38d0487f3908696242286d934c9b38f9d2a (patch) | |
| tree | 8f45ef997e2badfe7c534b6991f3a4816905e4d3 /net/netfilter/nf_conntrack_sip.c | |
| parent | b21f89019399ff75d9c239010e38b840eb6e01e7 (diff) | |
| download | linux-fsl-qoriq-9b03f38d0487f3908696242286d934c9b38f9d2a.tar.xz | |
netfilter: netns nf_conntrack: per-netns expectations
Make per-netns a) expectation hash and b) expectations count.
Expectations always belongs to netns to which it's master conntrack belong.
This is natural and doesn't bloat expectation.
Proc files and leaf users are stubbed to init_net, this is temporary.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_sip.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c index 1fa306b..a006080 100644 --- a/net/netfilter/nf_conntrack_sip.c +++ b/net/netfilter/nf_conntrack_sip.c @@ -775,7 +775,7 @@ static int set_expected_rtp_rtcp(struct sk_buff *skb, rcu_read_lock(); do { - exp = __nf_ct_expect_find(&tuple); + exp = __nf_ct_expect_find(&init_net, &tuple); if (!exp || exp->master == ct || nfct_help(exp->master)->helper != nfct_help(ct)->helper || |