aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2010-05-11 08:40:53 -0400
committerPatrick McHardy <kaber@trash.net>2010-05-11 08:40:53 -0400
commit6bd521433942d85e80f7a731a88cc91a327f38e0 (patch)
treee263e39fc6096ef77e2a1c22d5972447785b2aa5 /include/net
parentf30a77842129b5656360cc1f5db48a3fcfb64528 (diff)
ipv6: ip6mr: move mroute data into seperate structure
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/netns/ipv6.h13
1 files changed, 1 insertions, 12 deletions
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index 9cb3b5f2cd75..4e2780e6d8bc 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -59,18 +59,7 @@ struct netns_ipv6 {
59 struct sock *tcp_sk; 59 struct sock *tcp_sk;
60 struct sock *igmp_sk; 60 struct sock *igmp_sk;
61#ifdef CONFIG_IPV6_MROUTE 61#ifdef CONFIG_IPV6_MROUTE
62 struct sock *mroute6_sk; 62 struct mr6_table *mrt6;
63 struct timer_list ipmr_expire_timer;
64 struct list_head mfc6_unres_queue;
65 struct list_head *mfc6_cache_array;
66 struct mif_device *vif6_table;
67 int maxvif;
68 atomic_t cache_resolve_queue_len;
69 int mroute_do_assert;
70 int mroute_do_pim;
71#ifdef CONFIG_IPV6_PIMSM_V2
72 int mroute_reg_vif_num;
73#endif
74#endif 63#endif
75}; 64};
76#endif 65#endif