diff options
| author |   Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2015-11-26 15:23:45 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-11-30 15:26:22 -0500 |
| commit | 06bd6c0370bb88a2256c6763a32bc4e4ade06521 (patch) | |
| tree | 0fb0e5937b7dc653c538cd6f796691a5e470822d | |
| parent | net: remove unnecessary mroute.h includes (diff) | |
| download | linux-dev-06bd6c0370bb88a2256c6763a32bc4e4ade06521.tar.xz linux-dev-06bd6c0370bb88a2256c6763a32bc4e4ade06521.zip | |
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>
| -rw-r--r-- | include/linux/mroute.h | 10 | ||||
| -rw-r--r-- | net/ipv4/ipmr.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/include/linux/mroute.h b/include/linux/mroute.h index 79aaa9fc1a15..fa66ebc1fed6 100644 --- a/include/linux/mroute.h +++ b/include/linux/mroute.h @@ -64,6 +64,13 @@ struct vif_device { #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 list_head list; __be32 mfc_mcastgrp; /* Group the entry belongs to */ @@ -89,9 +96,6 @@ struct mfc_cache { struct rcu_head rcu; }; -#define MFC_STATIC 1 -#define MFC_NOTIFY 2 - #define MFC_LINES 64 #ifdef __BIG_ENDIAN diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index a2d248d9c35c..a74e61883b8f 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -2199,8 +2199,6 @@ int ipmr_get_route(struct net *net, struct sk_buff *skb, } 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); read_unlock(&mrt_lock); rcu_read_unlock(); |