Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[deliverable/linux.git] / net / ipv4 / netfilter / nf_conntrack_l3proto_ipv4_compat.c

diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
index f8fc7ab201c9ef3b85193be19fae129ae0a0163d..c6f3c406f707a06a041035f27776d3966e0f27a0 100644 (file)
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
@@ -236,13 +236,12 @@ struct ct_expect_iter_state {
 
 static struct hlist_node *ct_expect_get_first(struct seq_file *seq)
 {
-       struct net *net = seq_file_net(seq);
        struct ct_expect_iter_state *st = seq->private;
        struct hlist_node *n;
 
        for (st->bucket = 0; st->bucket < nf_ct_expect_hsize; st->bucket++) {
                n = rcu_dereference(
-                       hlist_first_rcu(&net->ct.expect_hash[st->bucket]));
+                       hlist_first_rcu(&nf_ct_expect_hash[st->bucket]));
                if (n)
                        return n;
        }
@@ -252,7 +251,6 @@ static struct hlist_node *ct_expect_get_first(struct seq_file *seq)
 static struct hlist_node *ct_expect_get_next(struct seq_file *seq,
                                             struct hlist_node *head)
 {
-       struct net *net = seq_file_net(seq);
        struct ct_expect_iter_state *st = seq->private;
 
        head = rcu_dereference(hlist_next_rcu(head));
@@ -260,7 +258,7 @@ static struct hlist_node *ct_expect_get_next(struct seq_file *seq,
                if (++st->bucket >= nf_ct_expect_hsize)
                        return NULL;
                head = rcu_dereference(
-                       hlist_first_rcu(&net->ct.expect_hash[st->bucket]));
+                       hlist_first_rcu(&nf_ct_expect_hash[st->bucket]));
        }
        return head;
 }
@@ -301,6 +299,9 @@ static int exp_seq_show(struct seq_file *s, void *v)
 
        exp = hlist_entry(n, struct nf_conntrack_expect, hnode);
 
+       if (!net_eq(nf_ct_net(exp->master), seq_file_net(s)))
+               return 0;
+
        if (exp->tuple.src.l3num != AF_INET)
                return 0;