ipv4: ipmr: move mroute data into seperate structure

[net-next-2.6.git] / include / net / netns / ipv4.h

diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index b15e518f952af2c0114cbec2f107b0f7207c674d..72e762ab3e5def6f41749a8f81d4afb59d2ffe0a 100644 (file)
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -59,18 +59,7 @@ struct netns_ipv4 {
        atomic_t rt_genid;
 
 #ifdef CONFIG_IP_MROUTE
-       struct sock             *mroute_sk;
-       struct timer_list       ipmr_expire_timer;
-       struct mfc_cache        *mfc_unres_queue;
-       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;
-#endif
+       struct mr_table         *mrt;
 #endif
 };
 #endif