From 2c3ec3e231d2e0fc66b9e4baeb417a2449db4490 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Wed, 12 Sep 2007 11:55:17 +0200
Subject: [PATCH] --- yaml --- r: 66380 b: refs/heads/master c:
 772698f6362680b65211f7efc68121f1e4c28aa5 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/init_task.h | 2 ++
 trunk/include/linux/nsproxy.h   | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ea4710705af6..6c04093875bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f256becd868bf63b70da8f2769033d6734670e9
+refs/heads/master: 772698f6362680b65211f7efc68121f1e4c28aa5
diff --git a/trunk/include/linux/init_task.h b/trunk/include/linux/init_task.h
index f8abfa349ef9..e2c1ffcff62c 100644
--- a/trunk/include/linux/init_task.h
+++ b/trunk/include/linux/init_task.h
@@ -9,6 +9,7 @@
 #include <linux/ipc.h>
 #include <linux/pid_namespace.h>
 #include <linux/user_namespace.h>
+#include <net/net_namespace.h>
 
 #define INIT_FDTABLE \
 {							\
@@ -78,6 +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_IPC_NS(ipc_ns)						\
 	.user_ns	= &init_user_ns,				\
 }
diff --git a/trunk/include/linux/nsproxy.h b/trunk/include/linux/nsproxy.h
index ce06188b7a56..bec4485e3d76 100644
--- a/trunk/include/linux/nsproxy.h
+++ b/trunk/include/linux/nsproxy.h
@@ -29,6 +29,7 @@ struct nsproxy {
 	struct mnt_namespace *mnt_ns;
 	struct pid_namespace *pid_ns;
 	struct user_namespace *user_ns;
+	struct net 	     *net_ns;
 };
 extern struct nsproxy init_nsproxy;