diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-05-11 14:40:53 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-05-11 14:40:53 +0200 |
| commit | 6bd521433942d85e80f7a731a88cc91a327f38e0 (patch) | |
| tree | e263e39fc6096ef77e2a1c22d5972447785b2aa5 /include | |
| parent | f30a77842129b5656360cc1f5db48a3fcfb64528 (diff) | |
| download | linux-3.10-6bd521433942d85e80f7a731a88cc91a327f38e0.tar.gz linux-3.10-6bd521433942d85e80f7a731a88cc91a327f38e0.tar.bz2 linux-3.10-6bd521433942d85e80f7a731a88cc91a327f38e0.zip | |
ipv6: ip6mr: move mroute data into seperate structure
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mroute6.h | 5 | ||||
| -rw-r--r-- | include/net/netns/ipv6.h | 13 |
2 files changed, 2 insertions, 16 deletions
diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h index 94a0cb521ca..0370dd4f238 100644 --- a/include/linux/mroute6.h +++ b/include/linux/mroute6.h @@ -229,10 +229,7 @@ extern int ip6mr_get_route(struct net *net, struct sk_buff *skb, struct rtmsg *rtm, int nowait); #ifdef CONFIG_IPV6_MROUTE -static inline struct sock *mroute6_socket(struct net *net) -{ - return net->ipv6.mroute6_sk; -} +extern struct sock *mroute6_socket(struct net *net); extern int ip6mr_sk_done(struct sock *sk); #else static inline struct sock *mroute6_socket(struct net *net) { return NULL; } diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h index 9cb3b5f2cd7..4e2780e6d8b 100644 --- a/include/net/netns/ipv6.h +++ b/include/net/netns/ipv6.h @@ -59,18 +59,7 @@ struct netns_ipv6 { struct sock *tcp_sk; struct sock *igmp_sk; #ifdef CONFIG_IPV6_MROUTE - struct sock *mroute6_sk; - struct timer_list ipmr_expire_timer; - struct list_head mfc6_unres_queue; - struct list_head *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; -#endif + struct mr6_table *mrt6; #endif }; #endif |