diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-04-13 05:03:22 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 14:49:34 -0700 |
| commit | 0c12295a741d3186987f96f518cfbdaf01abb087 (patch) | |
| tree | e71d0f5e5193870318e86cd519edf728b1e2a079 /include | |
| parent | 862465f2e7e90975e7bf0ecfbb171dd3adedd950 (diff) | |
| download | linux-0c12295a741d3186987f96f518cfbdaf01abb087.tar.bz2 | |
ipv4: ipmr: move mroute data into seperate structure
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/netns/ipv4.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h index 5d06429968d5..72e762ab3e5d 100644 --- 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 list_head mfc_unres_queue; - struct list_head *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 |