Commit 5ea1f132 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

net: ipmr: move struct mr_table and VIF_EXISTS to mroute.h 



Move the definitions of VIF_EXISTS() and struct mr_table to mroute.h

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 520191bb

include/linux/mroute.h

+19 −2
Original line number Diff line number Diff line
@@ -59,6 +59,25 @@ struct vif_device { 


#define VIFF_STATIC 0x8000



#define VIF_EXISTS(_mrt, _idx) ((_mrt)->vif_table[_idx].dev != NULL)

#define MFC_LINES 64



struct mr_table {

	struct list_head	list;

	possible_net_t		net;

	u32			id;

	struct sock __rcu	*mroute_sk;

	struct timer_list	ipmr_expire_timer;

	struct list_head	mfc_unres_queue;

	struct list_head	mfc_cache_array[MFC_LINES];

	struct vif_device	vif_table[MAXVIFS];

	int			maxvif;

	atomic_t		cache_resolve_queue_len;

	bool			mroute_do_assert;

	bool			mroute_do_pim;

	int			mroute_reg_vif_num;

};



/* mfc_flags:

 * MFC_STATIC - the entry was added statically (not by a routing daemon)

 */
@@ -91,8 +110,6 @@ struct mfc_cache { 
	struct rcu_head	rcu;

};



#define MFC_LINES 64



#ifdef __BIG_ENDIAN

#define MFC_HASH(a,b)	(((((__force u32)(__be32)a)>>24)^(((__force u32)(__be32)b)>>26))&(MFC_LINES-1))

#else

net/ipv4/ipmr.c

+0 −18
Original line number Diff line number Diff line
@@ -67,22 +67,6 @@ 
#include <net/fib_rules.h>

#include <linux/netconf.h>



struct mr_table {

	struct list_head	list;

	possible_net_t		net;

	u32			id;

	struct sock __rcu	*mroute_sk;

	struct timer_list	ipmr_expire_timer;

	struct list_head	mfc_unres_queue;

	struct list_head	mfc_cache_array[MFC_LINES];

	struct vif_device	vif_table[MAXVIFS];

	int			maxvif;

	atomic_t		cache_resolve_queue_len;

	bool			mroute_do_assert;

	bool			mroute_do_pim;

	int			mroute_reg_vif_num;

};



struct ipmr_rule {

	struct fib_rule		common;

};
@@ -104,8 +88,6 @@ static DEFINE_RWLOCK(mrt_lock); 


/* Multicast router control variables */



#define VIF_EXISTS(_mrt, _idx) ((_mrt)->vif_table[_idx].dev != NULL)



/* Special spinlock for queue of unresolved entries */

static DEFINE_SPINLOCK(mfc_unres_lock);