From 1013b5345a6186db7194944dd6286cc183763fa8 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <dada1@cosmosbay.com>
Date: Wed, 12 Nov 2008 00:53:30 -0800
Subject: [PATCH] --- yaml --- r: 121838 b: refs/heads/master c:
 8f424b5f32d78b4f353b3cddca9804808ef063eb h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/include/net/net_namespace.h | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 40c32f5b3bbd..fbfe682fcf09 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9eca0a47dee201a73967026985b5f0a79a46bd36
+refs/heads/master: 8f424b5f32d78b4f353b3cddca9804808ef063eb
diff --git a/trunk/include/net/net_namespace.h b/trunk/include/net/net_namespace.h
index 700c53a3c6fa..319557789a40 100644
--- a/trunk/include/net/net_namespace.h
+++ b/trunk/include/net/net_namespace.h
@@ -192,6 +192,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)