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

Commit 889cd83c authored by Yuval Mintz's avatar Yuval Mintz Committed by David S. Miller
Browse files

ip6mr: Remove MFC_NOTIFY and refactor flags 



MFC_NOTIFY exists in ip6mr, probably as some legacy code
[was already removed for ipmr in commit
06bd6c03 ("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: default avatarYuval Mintz <yuvalm@mellanox.com>
Acked-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3feda6b4

include/linux/mroute.h

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

include/linux/mroute6.h

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

include/linux/mroute_base.h

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

net/ipv6/ip6mr.c

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