diff options
| author | Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2015-11-26 15:23:47 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-30 15:26:22 -0500 |
| commit | 5ea1f13299d8b8edcb2969eda4c81f8e3264b706 (patch) | |
| tree | 32bedf05c7847e9cd8b891b3c2b04e302184dbf6 /net/ipv4 | |
| parent | 520191bb404c4b7b4cdb70a5480ada974b0c2d60 (diff) | |
| download | linux-5ea1f13299d8b8edcb2969eda4c81f8e3264b706.tar.bz2 | |
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: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ipmr.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index a74e61883b8f..ff3dbbb9f11c 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -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); |