]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
netfilter: netns nf_conntrack: H323 conntracking in netns
authorAlexey Dobriyan <adobriyan@gmail.com>
Wed, 8 Oct 2008 09:35:09 +0000 (11:35 +0200)
committerPatrick 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_h323_main.c

index dfb826c973d947b1f2a9763ec51a77511c7c6b0f..c1504f71cdff08d8ad98685d73b2bba4e5a6c10f 100644 (file)
@@ -1210,6 +1210,7 @@ static struct nf_conntrack_expect *find_expect(struct nf_conn *ct,
                                               union nf_inet_addr *addr,
                                               __be16 port)
 {
+       struct net *net = nf_ct_net(ct);
        struct nf_conntrack_expect *exp;
        struct nf_conntrack_tuple tuple;
 
@@ -1219,7 +1220,7 @@ static struct nf_conntrack_expect *find_expect(struct nf_conn *ct,
        tuple.dst.u.tcp.port = port;
        tuple.dst.protonum = IPPROTO_TCP;
 
-       exp = __nf_ct_expect_find(&init_net, &tuple);
+       exp = __nf_ct_expect_find(net, &tuple);
        if (exp && exp->master == ct)
                return exp;
        return NULL;