Merge branch 'master' of /repos/git/net-next-2.6

[firefly-linux-kernel-4.4.55.git] / include / net / netfilter / nf_conntrack.h

diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index 84a4b6fec99d46b678f08b93f02ec41e8c343252..e624dae54fa49b7d713b78641c7f18c2e3cfbae2 100644 (file)
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -152,11 +152,7 @@ extern struct net init_net;
 
 static inline struct net *nf_ct_net(const struct nf_conn *ct)
 {
-#ifdef CONFIG_NET_NS
-       return ct->ct_net;
-#else
-       return &init_net;
-#endif
+       return read_pnet(&ct->ct_net);
 }
 
 /* Alter reply tuple (maybe alter helper). */