net: Introduce possible_net_t

[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 74f271a172dd181ad0dd521395e5480f29250cff..095433b8a8b03dec4b99057dd7165c9dc6d7846f 100644 (file)
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -95,9 +95,8 @@ struct nf_conn {
        /* Timer function; drops refcnt when it goes off. */
        struct timer_list timeout;
 
-#ifdef CONFIG_NET_NS
-       struct net *ct_net;
-#endif
+       possible_net_t ct_net;
+
        /* all members below initialized via memset */
        u8 __nfct_init_offset[0];