diff options
author | Patrick McHardy <kaber@trash.net> | 2010-04-13 01:03:22 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-13 17:49:34 -0400 |
commit | 0c12295a741d3186987f96f518cfbdaf01abb087 (patch) | |
tree | e71d0f5e5193870318e86cd519edf728b1e2a079 /include/net/netns | |
parent | 862465f2e7e90975e7bf0ecfbb171dd3adedd950 (diff) |
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/net/netns')
-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 { | |||
59 | atomic_t rt_genid; | 59 | atomic_t rt_genid; |
60 | 60 | ||
61 | #ifdef CONFIG_IP_MROUTE | 61 | #ifdef CONFIG_IP_MROUTE |
62 | struct sock *mroute_sk; | 62 | struct mr_table *mrt; |
63 | struct timer_list ipmr_expire_timer; | ||
64 | struct list_head mfc_unres_queue; | ||
65 | struct list_head *mfc_cache_array; | ||
66 | struct vif_device *vif_table; | ||
67 | int maxvif; | ||
68 | atomic_t cache_resolve_queue_len; | ||
69 | int mroute_do_assert; | ||
70 | int mroute_do_pim; | ||
71 | #if defined(CONFIG_IP_PIMSM_V1) || defined(CONFIG_IP_PIMSM_V2) | ||
72 | int mroute_reg_vif_num; | ||
73 | #endif | ||
74 | #endif | 63 | #endif |
75 | }; | 64 | }; |
76 | #endif | 65 | #endif |