diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2007-09-12 11:55:17 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 16:49:04 -0700 |
| commit | 772698f6362680b65211f7efc68121f1e4c28aa5 (patch) | |
| tree | bf7adc5563ee2de618a2b1d3c6ee1800595dd65c /include/linux | |
| parent | [NET]: Basic network namespace infrastructure. (diff) | |
| download | linux-dev-772698f6362680b65211f7efc68121f1e4c28aa5.tar.xz linux-dev-772698f6362680b65211f7efc68121f1e4c28aa5.zip | |
[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>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/init_task.h | 2 | ||||
| -rw-r--r-- | include/linux/nsproxy.h | 1 |
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 @@ #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/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 { struct mnt_namespace *mnt_ns; struct pid_namespace *pid_ns; struct user_namespace *user_ns; + struct net *net_ns; }; extern struct nsproxy init_nsproxy; |