Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bd52143 authored by Patrick McHardy's avatar Patrick McHardy
Browse files

ipv6: ip6mr: move mroute data into seperate structure 



Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent f30a7784

include/linux/mroute6.h

+1 −4
Original line number Original line Diff line number Diff line
@@ -229,10 +229,7 @@ extern int ip6mr_get_route(struct net *net, struct sk_buff *skb, 
			   struct rtmsg *rtm, int nowait);

			   struct rtmsg *rtm, int nowait);





#ifdef CONFIG_IPV6_MROUTE

#ifdef CONFIG_IPV6_MROUTE

static inline struct sock *mroute6_socket(struct net *net)

extern struct sock *mroute6_socket(struct net *net);

{

	return net->ipv6.mroute6_sk;

}

extern int ip6mr_sk_done(struct sock *sk);

extern int ip6mr_sk_done(struct sock *sk);

#else

#else

static inline struct sock *mroute6_socket(struct net *net) { return NULL; }

static inline struct sock *mroute6_socket(struct net *net) { return NULL; }

include/net/netns/ipv6.h

+1 −12
Original line number Original line Diff line number Diff line
@@ -59,18 +59,7 @@ struct netns_ipv6 { 
	struct sock             *tcp_sk;

	struct sock             *tcp_sk;

	struct sock             *igmp_sk;

	struct sock             *igmp_sk;

#ifdef CONFIG_IPV6_MROUTE

#ifdef CONFIG_IPV6_MROUTE

	struct sock		*mroute6_sk;

	struct mr6_table	*mrt6;

	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

#endif

#endif

};

};

#endif
 
#endif