[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>

2 files changed, 15 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;
diff --git a/include/net/netns/core.h b/include/net/netns/core.h
new file mode 100644
index 000000000000..0e8c0f8435d4
--- /dev/null
+++ b/include/net/netns/core.h
@@ -0,0 +1,13 @@
+#ifndef __NETNS_CORE_H__
+#define __NETNS_CORE_H__
+
+struct ctl_table_header;
+
+struct netns_core {
+        /* core sysctls */
+        struct ctl_table_header *sysctl_hdr;
+
+        int     sysctl_somaxconn;
+};
+
+#endif