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 /include/linux/mroute.h | |
| parent | 520191bb404c4b7b4cdb70a5480ada974b0c2d60 (diff) | |
| download | op-kernel-dev-5ea1f13299d8b8edcb2969eda4c81f8e3264b706.zip op-kernel-dev-5ea1f13299d8b8edcb2969eda4c81f8e3264b706.tar.gz | |
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 'include/linux/mroute.h')
| -rw-r--r-- | include/linux/mroute.h | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/include/linux/mroute.h b/include/linux/mroute.h index 7c567a2..bf9b322 100644 --- a/include/linux/mroute.h +++ b/include/linux/mroute.h @@ -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 |
