ip6mr: Remove MFC_NOTIFY and refactor flags
MFC_NOTIFY exists in ip6mr, probably as some legacy code
[was already removed for ipmr in commit
06bd6c0370
("net: ipmr: remove unused MFC_NOTIFY flag and make the flags enum").
Remove it from ip6mr as well, and move the enum into a common file;
Notice MFC_OFFLOAD is currently only used by ipmr.
Signed-off-by: Yuval Mintz <yuvalm@mellanox.com>
Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
3feda6b46f
Коммит
889cd83cbe
|
@ -65,15 +65,6 @@ struct vif_entry_notifier_info {
|
|||
|
||||
#define VIFF_STATIC 0x8000
|
||||
|
||||
/* mfc_flags:
|
||||
* MFC_STATIC - the entry was added statically (not by a routing daemon)
|
||||
* MFC_OFFLOAD - the entry was offloaded to the hardware
|
||||
*/
|
||||
enum {
|
||||
MFC_STATIC = BIT(0),
|
||||
MFC_OFFLOAD = BIT(1),
|
||||
};
|
||||
|
||||
struct mfc_cache_cmp_arg {
|
||||
__be32 mfc_mcastgrp;
|
||||
__be32 mfc_origin;
|
||||
|
|
|
@ -81,9 +81,6 @@ struct mfc6_cache {
|
|||
};
|
||||
};
|
||||
|
||||
#define MFC_STATIC 1
|
||||
#define MFC_NOTIFY 2
|
||||
|
||||
#define MFC_ASSERT_THRESH (3*HZ) /* Maximal freq. of asserts */
|
||||
|
||||
struct rtmsg;
|
||||
|
|
|
@ -45,6 +45,15 @@ struct vif_device {
|
|||
|
||||
#define VIF_EXISTS(_mrt, _idx) (!!((_mrt)->vif_table[_idx].dev))
|
||||
|
||||
/* mfc_flags:
|
||||
* MFC_STATIC - the entry was added statically (not by a routing daemon)
|
||||
* MFC_OFFLOAD - the entry was offloaded to the hardware
|
||||
*/
|
||||
enum {
|
||||
MFC_STATIC = BIT(0),
|
||||
MFC_OFFLOAD = BIT(1),
|
||||
};
|
||||
|
||||
/**
|
||||
* struct mr_mfc - common multicast routing entries
|
||||
* @mnode: rhashtable list
|
||||
|
|
|
@ -2203,9 +2203,6 @@ int ip6mr_get_route(struct net *net, struct sk_buff *skb, struct rtmsg *rtm,
|
|||
return err;
|
||||
}
|
||||
|
||||
if (rtm->rtm_flags & RTM_F_NOTIFY)
|
||||
cache->_c.mfc_flags |= MFC_NOTIFY;
|
||||
|
||||
err = __ip6mr_fill_mroute(mrt, skb, cache, rtm);
|
||||
read_unlock(&mrt_lock);
|
||||
return err;
|
||||
|
|
Загрузка…
Ссылка в новой задаче