Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06bd6c03 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

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: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dfc3b0e8

include/linux/mroute.h

+7 −3
Original line number Diff line number Diff line
@@ -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

net/ipv4/ipmr.c

+0 −2
Original line number Diff line number Diff line
@@ -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();