aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-09-12 05:55:17 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:49:04 -0400
commit772698f6362680b65211f7efc68121f1e4c28aa5 (patch)
treebf7adc5563ee2de618a2b1d3c6ee1800595dd65c
parent5f256becd868bf63b70da8f2769033d6734670e9 (diff)
[NET]: Add a network namespace parameter to tasks
This is the network namespace from which all which all sockets and anything else under user control ultimately get their network namespace parameters. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/init_task.h2
-rw-r--r--include/linux/nsproxy.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index f8abfa349ef9..e2c1ffcff62c 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -9,6 +9,7 @@
9#include <linux/ipc.h> 9#include <linux/ipc.h>
10#include <linux/pid_namespace.h> 10#include <linux/pid_namespace.h>
11#include <linux/user_namespace.h> 11#include <linux/user_namespace.h>
12#include <net/net_namespace.h>
12 13
13#define INIT_FDTABLE \ 14#define INIT_FDTABLE \
14{ \ 15{ \
@@ -78,6 +79,7 @@ extern struct nsproxy init_nsproxy;
78 .nslock = __SPIN_LOCK_UNLOCKED(nsproxy.nslock), \ 79 .nslock = __SPIN_LOCK_UNLOCKED(nsproxy.nslock), \
79 .uts_ns = &init_uts_ns, \ 80 .uts_ns = &init_uts_ns, \
80 .mnt_ns = NULL, \ 81 .mnt_ns = NULL, \
82 .net_ns = &init_net, \
81 INIT_IPC_NS(ipc_ns) \ 83 INIT_IPC_NS(ipc_ns) \
82 .user_ns = &init_user_ns, \ 84 .user_ns = &init_user_ns, \
83} 85}
diff --git a/include/linux/nsproxy.h b/include/linux/nsproxy.h
index ce06188b7a56..bec4485e3d76 100644
--- a/include/linux/nsproxy.h
+++ b/include/linux/nsproxy.h
@@ -29,6 +29,7 @@ struct nsproxy {
29 struct mnt_namespace *mnt_ns; 29 struct mnt_namespace *mnt_ns;
30 struct pid_namespace *pid_ns; 30 struct pid_namespace *pid_ns;
31 struct user_namespace *user_ns; 31 struct user_namespace *user_ns;
32 struct net *net_ns;
32}; 33};
33extern struct nsproxy init_nsproxy; 34extern struct nsproxy init_nsproxy;
34 35