From 57e49e66ead19fb91697f2ba69047e97bdb660e9 Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Wed, 8 Oct 2008 11:35:09 +0200 Subject: [PATCH] --- yaml --- r: 112095 b: refs/heads/master c: a5c3a8005cb7a36ebcc5b849f6045069ce4f7ca8 h: refs/heads/master i: 112093: 134c089649b915d6e28befeedc6084508a4fc60d 112091: fc762b4c0c738115bd91cbf26df4a716652fdd5a 112087: 1aa8b55ddd48c6434ae1ee07119cc91b7a49924a 112079: 1bb272b57bda9eea968c5aa10b7c661102ecfefc 112063: 0674544f502df3d2a51eb94adf30751eb70fff77 v: v3 --- [refs] | 2 +- trunk/net/netfilter/nf_conntrack_sip.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 936000ebc5a1..5bd80bf6582f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08f6547d266fdba087f7fa7963fc0610be5b7cd7 +refs/heads/master: a5c3a8005cb7a36ebcc5b849f6045069ce4f7ca8 diff --git a/trunk/net/netfilter/nf_conntrack_sip.c b/trunk/net/netfilter/nf_conntrack_sip.c index a006080eb389..6813f1c8863f 100644 --- a/trunk/net/netfilter/nf_conntrack_sip.c +++ b/trunk/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 ||