Merge branch 'next'

[karo-tx-linux.git] / net / netfilter / nf_conntrack_h323_main.c

diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c
index 5dc0478108ae978dadd2997f04d50bf396100c6c..c1504f71cdff08d8ad98685d73b2bba4e5a6c10f 100644 (file)
--- a/net/netfilter/nf_conntrack_h323_main.c
+++ b/net/netfilter/nf_conntrack_h323_main.c
@@ -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(&tuple);
+       exp = __nf_ct_expect_find(net, &tuple);
        if (exp && exp->master == ct)
                return exp;
        return NULL;