[NETNS]: Introduce a netns_core structure.

[firefly-linux-kernel-4.4.55.git] / include / net / net_namespace.h

diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 923f2b8b909600b3962035f714308ddc5e8acf9d..c01d45fe08c3d8d57c37f608de97ae93e70cdf7c 100644 (file)
--- 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;
@@ -118,6 +116,12 @@ static inline void release_net(struct net *net)
 {
        atomic_dec(&net->use_count);
 }
+
+static inline
+int net_eq(const struct net *net1, const struct net *net2)
+{
+       return net1 == net2;
+}
 #else
 static inline struct net *get_net(struct net *net)
 {
@@ -141,6 +145,12 @@ static inline struct net *maybe_get_net(struct net *net)
 {
        return net;
 }
+
+static inline
+int net_eq(const struct net *net1, const struct net *net2)
+{
+       return 1;
+}
 #endif
 
 #define for_each_net(VAR)                              \