4 files changed, 43 insertions, 0 deletions

diff --git a/include/net/netns/hash.h b/include/net/netns/hash.h
new file mode 100644
index 000000000000..548d78f2cc47
--- /dev/null
+++ b/include/net/netns/hash.h
@@ -0,0 +1,21 @@
+#ifndef __NET_NS_HASH_H__
+#define __NET_NS_HASH_H__
+
+#include <asm/cache.h>
+
+struct net;
+
+static inline unsigned net_hash_mix(struct net *net)
+{
+#ifdef CONFIG_NET_NS
+        /*
+         * shift this right to eliminate bits, that are
+         * always zeroed
+         */
+
+        return (unsigned)(((unsigned long)net) >> L1_CACHE_SHIFT);
+#else
+        return 0;
+#endif
+}
+#endif
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index 34ee348a2cf2..a6ed83853dcc 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -18,6 +18,7 @@ struct netns_ipv4 {
         struct ctl_table_header *forw_hdr;
         struct ctl_table_header *frags_hdr;
         struct ctl_table_header *ipv4_hdr;
+        struct ctl_table_header *route_hdr;
 #endif
         struct ipv4_devconf     *devconf_all;
         struct ipv4_devconf     *devconf_dflt;
@@ -36,6 +37,7 @@ struct netns_ipv4 {
         struct xt_table         *iptable_mangle;
         struct xt_table         *iptable_raw;
         struct xt_table         *arptable_filter;
+        struct xt_table         *iptable_security;
 #endif
 
         int sysctl_icmp_echo_ignore_all;
@@ -44,5 +46,8 @@ struct netns_ipv4 {
         int sysctl_icmp_ratelimit;
         int sysctl_icmp_ratemask;
         int sysctl_icmp_errors_use_inbound_ifaddr;
+
+        struct timer_list rt_secret_timer;
+        atomic_t rt_genid;
 };
 #endif
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index ac053be6c256..5bacd838e88b 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -35,6 +35,7 @@ struct netns_ipv6 {
         struct xt_table         *ip6table_filter;
         struct xt_table         *ip6table_mangle;
         struct xt_table         *ip6table_raw;
+        struct xt_table         *ip6table_security;
 #endif
         struct rt6_info         *ip6_null_entry;
         struct rt6_statistics   *rt6_stats;
diff --git a/include/net/netns/mib.h b/include/net/netns/mib.h
new file mode 100644
index 000000000000..449147604642
--- /dev/null
+++ b/include/net/netns/mib.h
@@ -0,0 +1,16 @@
+#ifndef __NETNS_MIB_H__
+#define __NETNS_MIB_H__
+
+#include <net/snmp.h>
+
+struct netns_mib {
+        DEFINE_SNMP_STAT(struct tcp_mib, tcp_statistics);
+        DEFINE_SNMP_STAT(struct ipstats_mib, ip_statistics);
+        DEFINE_SNMP_STAT(struct linux_mib, net_statistics);
+        DEFINE_SNMP_STAT(struct udp_mib, udp_statistics);
+        DEFINE_SNMP_STAT(struct udp_mib, udplite_statistics);
+        DEFINE_SNMP_STAT(struct icmp_mib, icmp_statistics);
+        DEFINE_SNMP_STAT(struct icmpmsg_mib, icmpmsg_statistics);
+};
+
+#endif