5 files changed, 78 insertions, 0 deletions

diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index ece1c926b5d..977f482d97a 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -49,6 +49,8 @@ struct netns_ipv4 {
         int sysctl_icmp_ratelimit;
         int sysctl_icmp_ratemask;
         int sysctl_icmp_errors_use_inbound_ifaddr;
+        int sysctl_rt_cache_rebuild_count;
+        int current_rt_cache_rebuild_count;
 
         struct timer_list rt_secret_timer;
         atomic_t rt_genid;
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index 2932721180c..afab4e4cbac 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -55,5 +55,17 @@ struct netns_ipv6 {
         struct sock             *ndisc_sk;
         struct sock             *tcp_sk;
         struct sock             *igmp_sk;
+#ifdef CONFIG_IPV6_MROUTE
+        struct sock             *mroute6_sk;
+        struct mfc6_cache       **mfc6_cache_array;
+        struct mif_device       *vif6_table;
+        int                     maxvif;
+        atomic_t                cache_resolve_queue_len;
+        int                     mroute_do_assert;
+        int                     mroute_do_pim;
+#ifdef CONFIG_IPV6_PIMSM_V2
+        int                     mroute_reg_vif_num;
+#endif
+#endif
 };
 #endif
diff --git a/include/net/netns/mib.h b/include/net/netns/mib.h
index 10cb7c336de..0b44112e236 100644
--- a/include/net/netns/mib.h
+++ b/include/net/netns/mib.h
@@ -20,6 +20,9 @@ struct netns_mib {
         DEFINE_SNMP_STAT(struct icmpv6_mib, icmpv6_statistics);
         DEFINE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg_statistics);
 #endif
+#ifdef CONFIG_XFRM_STATISTICS
+        DEFINE_SNMP_STAT(struct linux_xfrm_mib, xfrm_statistics);
+#endif
 };
 
 #endif
diff --git a/include/net/netns/x_tables.h b/include/net/netns/x_tables.h
index b8093971ccb..9554a644a8f 100644
--- a/include/net/netns/x_tables.h
+++ b/include/net/netns/x_tables.h
@@ -4,7 +4,12 @@
 #include <linux/list.h>
 #include <linux/netfilter.h>
 
+struct ebt_table;
+
 struct netns_xt {
         struct list_head tables[NFPROTO_NUMPROTO];
+        struct ebt_table *broute_table;
+        struct ebt_table *frame_filter;
+        struct ebt_table *frame_nat;
 };
 #endif
diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
new file mode 100644
index 00000000000..1ba912749ca
--- /dev/null
+++ b/include/net/netns/xfrm.h
@@ -0,0 +1,56 @@
+#ifndef __NETNS_XFRM_H
+#define __NETNS_XFRM_H
+
+#include <linux/list.h>
+#include <linux/wait.h>
+#include <linux/workqueue.h>
+#include <linux/xfrm.h>
+
+struct ctl_table_header;
+
+struct xfrm_policy_hash {
+        struct hlist_head       *table;
+        unsigned int            hmask;
+};
+
+struct netns_xfrm {
+        struct list_head        state_all;
+        /*
+         * Hash table to find appropriate SA towards given target (endpoint of
+         * tunnel or destination of transport mode) allowed by selector.
+         *
+         * Main use is finding SA after policy selected tunnel or transport
+         * mode. Also, it can be used by ah/esp icmp error handler to find
+         * offending SA.
+         */
+        struct hlist_head       *state_bydst;
+        struct hlist_head       *state_bysrc;
+        struct hlist_head       *state_byspi;
+        unsigned int            state_hmask;
+        unsigned int            state_num;
+        struct work_struct      state_hash_work;
+        struct hlist_head       state_gc_list;
+        struct work_struct      state_gc_work;
+
+        wait_queue_head_t       km_waitq;
+
+        struct list_head        policy_all;
+        struct hlist_head       *policy_byidx;
+        unsigned int            policy_idx_hmask;
+        struct hlist_head       policy_inexact[XFRM_POLICY_MAX * 2];
+        struct xfrm_policy_hash policy_bydst[XFRM_POLICY_MAX * 2];
+        unsigned int            policy_count[XFRM_POLICY_MAX * 2];
+        struct work_struct      policy_hash_work;
+
+        struct sock             *nlsk;
+
+        u32                     sysctl_aevent_etime;
+        u32                     sysctl_aevent_rseqth;
+        int                     sysctl_larval_drop;
+        u32                     sysctl_acq_expires;
+#ifdef CONFIG_SYSCTL
+        struct ctl_table_header *sysctl_hdr;
+#endif
+};
+
+#endif