projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
08f6547
)
netfilter: netns nf_conntrack: SIP conntracking in netns
author
Alexey Dobriyan
<adobriyan@gmail.com>
Wed, 8 Oct 2008 09:35:09 +0000
(11:35 +0200)
committer
Patrick McHardy
<kaber@trash.net>
Wed, 8 Oct 2008 09:35:09 +0000
(11:35 +0200)
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
net/netfilter/nf_conntrack_sip.c
patch
|
blob
|
blame
|
history
diff --git
a/net/netfilter/nf_conntrack_sip.c
b/net/netfilter/nf_conntrack_sip.c
index a006080eb3899861615f01c027b86941b73f28f4..6813f1c8863f245ac84ffc7ad3a1b9e36c8e5cd3 100644
(file)
--- a/
net/netfilter/nf_conntrack_sip.c
+++ b/
net/netfilter/nf_conntrack_sip.c
@@
-736,6
+736,7
@@
static int set_expected_rtp_rtcp(struct sk_buff *skb,
struct nf_conntrack_expect *exp, *rtp_exp, *rtcp_exp;
enum ip_conntrack_info ctinfo;
struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
+ struct net *net = nf_ct_net(ct);
enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);
union nf_inet_addr *saddr;
struct nf_conntrack_tuple tuple;
@@
-775,7
+776,7
@@
static int set_expected_rtp_rtcp(struct sk_buff *skb,
rcu_read_lock();
do {
- exp = __nf_ct_expect_find(
&init_
net, &tuple);
+ exp = __nf_ct_expect_find(net, &tuple);
if (!exp || exp->master == ct ||
nfct_help(exp->master)->helper != nfct_help(ct)->helper ||