---

yaml --- r: 66407 b: refs/heads/master c: 4fabcd7 h: refs/heads/master i: 66405: bf7a7eb 66403: ad8891c 66399: 06f34e4 v: v3
git-mirror · Oct 10, 2007 · deda9db · deda9db
1 parent a6f5bac
commit deda9db
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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);