1 files changed, 22 insertions, 0 deletions

diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 700c53a3c6fa..6fc13d905c5f 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -19,6 +19,7 @@
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
 #include <net/netns/conntrack.h>
 #endif
+#include <net/netns/xfrm.h>
 
 struct proc_dir_entry;
 struct net_device;
@@ -74,6 +75,9 @@ struct net {
         struct netns_ct         ct;
 #endif
 #endif
+#ifdef CONFIG_XFRM
+        struct netns_xfrm       xfrm;
+#endif
         struct net_generic      *gen;
 };
 
@@ -192,6 +196,24 @@ static inline void release_net(struct net *net)
 }
 #endif
 
+#ifdef CONFIG_NET_NS
+
+static inline void write_pnet(struct net **pnet, struct net *net)
+{
+        *pnet = net;
+}
+
+static inline struct net *read_pnet(struct net * const *pnet)
+{
+        return *pnet;
+}
+
+#else
+
+#define write_pnet(pnet, net)   do { (void)(net);} while (0)
+#define read_pnet(pnet)         (&init_net)
+
+#endif
 
 #define for_each_net(VAR)                               \
         list_for_each_entry(VAR, &net_namespace_list, list)