summaryrefslogtreecommitdiffstats
path: root/include/net/net_namespace.h
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-03-31 19:41:14 -0700
committerDavid S. Miller <davem@davemloft.net>2008-03-31 19:41:14 -0700
commit8efa6e93cb2666dceafc4844057fdcb9aa324fb7 (patch)
tree3fbf8da25edf1b942411d89896400effd5a83419 /include/net/net_namespace.h
parent3edf8fa5ccf10688a9280b5cbca8ed3947c42866 (diff)
downloadblackbird-op-linux-8efa6e93cb2666dceafc4844057fdcb9aa324fb7.tar.gz
blackbird-op-linux-8efa6e93cb2666dceafc4844057fdcb9aa324fb7.zip
[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.h6
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 @@
#include <linux/workqueue.h>
#include <linux/list.h>
+#include <net/netns/core.h>
#include <net/netns/unix.h>
#include <net/netns/packet.h>
#include <net/netns/ipv4.h>
@@ -46,10 +47,7 @@ struct net {
struct sock *rtnl; /* rtnetlink socket */
- /* core sysctls */
- struct ctl_table_header *sysctl_core_hdr;
- int sysctl_somaxconn;
-
+ struct netns_core core;
struct netns_packet packet;
struct netns_unix unx;
struct netns_ipv4 ipv4;
OpenPOWER on IntegriCloud