From deda9db49c6680a1186d5898a2dd44ac5f9ab7c2 Mon Sep 17 00:00:00 2001
From: Daniel Lezcano <dlezcano@fr.ibm.com>
Date: Thu, 13 Sep 2007 09:16:29 +0200
Subject: [PATCH] --- yaml --- r: 66407 b: refs/heads/master c:
 4fabcd7118162e36eea5c53e8895ecc13762bef3 h: refs/heads/master i:   66405:
 bf7a7eb563ae665aa5450d899c835a04cea5e4dd   66403:
 ad8891c2da83d622cde4118eb985eba0d385aa51   66399:
 06f34e467b926f58edaab74d4a2b36d6740af75b v: v3

---
 [refs]                            | 2 +-
 trunk/include/linux/init_task.h   | 2 +-
 trunk/include/net/net_namespace.h | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c6c3dfb795f4..53c22a60fd1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e08b09983fe9cf379faf1aefdf9164268d4610e7
+refs/heads/master: 4fabcd7118162e36eea5c53e8895ecc13762bef3
diff --git a/trunk/include/linux/init_task.h b/trunk/include/linux/init_task.h
index e2c1ffcff62c..513bc3e489f0 100644
--- a/trunk/include/linux/init_task.h
+++ b/trunk/include/linux/init_task.h
@@ -79,7 +79,7 @@ extern struct nsproxy init_nsproxy;
 	.nslock		= __SPIN_LOCK_UNLOCKED(nsproxy.nslock),		\
 	.uts_ns		= &init_uts_ns,					\
 	.mnt_ns		= NULL,						\
-	.net_ns		= &init_net,					\
+	INIT_NET_NS(net_ns)                                             \
 	INIT_IPC_NS(ipc_ns)						\
 	.user_ns	= &init_user_ns,				\
 }
diff --git a/trunk/include/net/net_namespace.h b/trunk/include/net/net_namespace.h
index fac42db7f6d0..3081b6ed35fe 100644
--- a/trunk/include/net/net_namespace.h
+++ b/trunk/include/net/net_namespace.h
@@ -28,7 +28,14 @@ struct net {
 	struct hlist_head	*dev_index_head;
 };
 
+#ifdef CONFIG_NET
+/* Init's network namespace */
 extern struct net init_net;
+#define INIT_NET_NS(net_ns) .net_ns = &init_net,
+#else
+#define INIT_NET_NS(net_ns)
+#endif
+
 extern struct list_head net_namespace_list;
 
 extern void __put_net(struct net *net);