mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 09:59:32 +00:00
net: ipmr: remove unused MFC_NOTIFY flag and make the flags enum
MFC_NOTIFY was introduced in kernel 2.1.68 but afaik it hasn't been used and I couldn't find any users currently so just remove it. Only MFC_STATIC is left, so move it into an enum, add a description and use BIT(). Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
dfc3b0e891
commit
06bd6c0370
2 changed files with 7 additions and 5 deletions
|
@ -64,6 +64,13 @@ struct vif_device {
|
||||||
|
|
||||||
#define VIFF_STATIC 0x8000
|
#define VIFF_STATIC 0x8000
|
||||||
|
|
||||||
|
/* mfc_flags:
|
||||||
|
* MFC_STATIC - the entry was added statically (not by a routing daemon)
|
||||||
|
*/
|
||||||
|
enum {
|
||||||
|
MFC_STATIC = BIT(0),
|
||||||
|
};
|
||||||
|
|
||||||
struct mfc_cache {
|
struct mfc_cache {
|
||||||
struct list_head list;
|
struct list_head list;
|
||||||
__be32 mfc_mcastgrp; /* Group the entry belongs to */
|
__be32 mfc_mcastgrp; /* Group the entry belongs to */
|
||||||
|
@ -89,9 +96,6 @@ struct mfc_cache {
|
||||||
struct rcu_head rcu;
|
struct rcu_head rcu;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define MFC_STATIC 1
|
|
||||||
#define MFC_NOTIFY 2
|
|
||||||
|
|
||||||
#define MFC_LINES 64
|
#define MFC_LINES 64
|
||||||
|
|
||||||
#ifdef __BIG_ENDIAN
|
#ifdef __BIG_ENDIAN
|
||||||
|
|
|
@ -2199,8 +2199,6 @@ int ipmr_get_route(struct net *net, struct sk_buff *skb,
|
||||||
}
|
}
|
||||||
|
|
||||||
read_lock(&mrt_lock);
|
read_lock(&mrt_lock);
|
||||||
if (!nowait && (rtm->rtm_flags & RTM_F_NOTIFY))
|
|
||||||
cache->mfc_flags |= MFC_NOTIFY;
|
|
||||||
err = __ipmr_fill_mroute(mrt, skb, cache, rtm);
|
err = __ipmr_fill_mroute(mrt, skb, cache, rtm);
|
||||||
read_unlock(&mrt_lock);
|
read_unlock(&mrt_lock);
|
||||||
rcu_read_unlock();
|
rcu_read_unlock();
|
||||||
|
|
Loading…
Reference in a new issue