3 files changed, 12 insertions, 26 deletions

diff --git a/include/net/netns/generic.h b/include/net/netns/generic.h
index ff4982ab84b6..81a31c0db3e7 100644
--- a/include/net/netns/generic.h
+++ b/include/net/netns/generic.h
@@ -14,11 +14,8 @@
  * The rules are simple:
  * 1. set pernet_operations->id.  After register_pernet_device you
  *    will have the id of your private pointer.
- * 2. Either set pernet_operations->size (to have the code allocate and
- *    free a private structure pointed to from struct net ) or 
- *    call net_assign_generic() to put the private data on the struct
- *    net (most preferably this should be done in the ->init callback
- *    of the ops registered);
+ * 2. set pernet_operations->size to have the code allocate and free
+ *    a private structure pointed to from struct net.
  * 3. do not change this pointer while the net is alive;
  * 4. do not try to have any private reference on the net_generic object.
  *
@@ -46,6 +43,4 @@ static inline void *net_generic(struct net *net, int id)
 
         return ptr;
 }
-
-extern int net_assign_generic(struct net *net, int id, void *data);
 #endif
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index 2764994c9136..d68c3f121774 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -55,19 +55,14 @@ struct netns_ipv4 {
         int sysctl_rt_cache_rebuild_count;
         int current_rt_cache_rebuild_count;
 
-        struct timer_list rt_secret_timer;
         atomic_t rt_genid;
 
 #ifdef CONFIG_IP_MROUTE
-        struct sock             *mroute_sk;
-        struct mfc_cache        **mfc_cache_array;
-        struct vif_device       *vif_table;
-        int                     maxvif;
-        atomic_t                cache_resolve_queue_len;
-        int                     mroute_do_assert;
-        int                     mroute_do_pim;
-#if defined(CONFIG_IP_PIMSM_V1) || defined(CONFIG_IP_PIMSM_V2)
-        int                     mroute_reg_vif_num;
+#ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
+        struct mr_table         *mrt;
+#else
+        struct list_head        mr_tables;
+        struct fib_rules_ops    *mr_rules_ops;
 #endif
 #endif
 };
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index 1f11ebc22151..81abfcb2eb4e 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -59,15 +59,11 @@ struct netns_ipv6 {
         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;
+#ifndef CONFIG_IPV6_MROUTE_MULTIPLE_TABLES
+        struct mr6_table        *mrt6;
+#else
+        struct list_head        mr6_tables;
+        struct fib_rules_ops    *mr6_rules_ops;
 #endif
 #endif
 };