Merge branch 'ipv6_stable_privacy_address'

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

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index dc4865e90fe489c4859659b3a937e7c1f8a7a4bb..d0ac7d7be8a71cdc13c444677b5bef4f3aa82fc9 100644 (file)
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -126,9 +126,7 @@ struct xfrm_state_walk {
 
 /* Full description of state of transformer. */
 struct xfrm_state {
-#ifdef CONFIG_NET_NS
-       struct net              *xs_net;
-#endif
+       possible_net_t          xs_net;
        union {
                struct hlist_node       gclist;
                struct hlist_node       bydst;
@@ -522,9 +520,7 @@ struct xfrm_policy_queue {
 };
 
 struct xfrm_policy {
-#ifdef CONFIG_NET_NS
-       struct net              *xp_net;
-#endif
+       possible_net_t          xp_net;
        struct hlist_node       bydst;
        struct hlist_node       byidx;