diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-03-31 22:41:14 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-31 22:41:14 -0400 |
commit | 8efa6e93cb2666dceafc4844057fdcb9aa324fb7 (patch) | |
tree | 3fbf8da25edf1b942411d89896400effd5a83419 /include/net/net_namespace.h | |
parent | 3edf8fa5ccf10688a9280b5cbca8ed3947c42866 (diff) |
[NETNS]: Introduce a netns_core structure.
There's already some stuff on the struct net, that should better
be folded into netns_core structure. I'm making the per-proto inuse
counter be per-net also, which is also a candidate for this, so
introduce this structure and populate it a bit.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/net_namespace.h')
-rw-r--r-- | include/net/net_namespace.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index f8f3d1a5fc35..c01d45fe08c3 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h | |||
@@ -8,6 +8,7 @@ | |||
8 | #include <linux/workqueue.h> | 8 | #include <linux/workqueue.h> |
9 | #include <linux/list.h> | 9 | #include <linux/list.h> |
10 | 10 | ||
11 | #include <net/netns/core.h> | ||
11 | #include <net/netns/unix.h> | 12 | #include <net/netns/unix.h> |
12 | #include <net/netns/packet.h> | 13 | #include <net/netns/packet.h> |
13 | #include <net/netns/ipv4.h> | 14 | #include <net/netns/ipv4.h> |
@@ -46,10 +47,7 @@ struct net { | |||
46 | 47 | ||
47 | struct sock *rtnl; /* rtnetlink socket */ | 48 | struct sock *rtnl; /* rtnetlink socket */ |
48 | 49 | ||
49 | /* core sysctls */ | 50 | struct netns_core core; |
50 | struct ctl_table_header *sysctl_core_hdr; | ||
51 | int sysctl_somaxconn; | ||
52 | |||
53 | struct netns_packet packet; | 51 | struct netns_packet packet; |
54 | struct netns_unix unx; | 52 | struct netns_unix unx; |
55 | struct netns_ipv4 ipv4; | 53 | struct netns_ipv4 ipv4; |