diff options
| -rw-r--r-- | include/linux/mroute.h | 9 | ||||
| -rw-r--r-- | include/linux/mroute6.h | 3 | ||||
| -rw-r--r-- | include/linux/mroute_base.h | 9 | ||||
| -rw-r--r-- | net/ipv6/ip6mr.c | 3 | 
4 files changed, 9 insertions, 15 deletions
diff --git a/include/linux/mroute.h b/include/linux/mroute.h index 63b36e6c72a0..7ed82e4f11b3 100644 --- a/include/linux/mroute.h +++ b/include/linux/mroute.h @@ -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; diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h index 6acf576fc135..1ac38e6819f5 100644 --- a/include/linux/mroute6.h +++ b/include/linux/mroute6.h @@ -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; diff --git a/include/linux/mroute_base.h b/include/linux/mroute_base.h index cfaec9bd2d3c..f40202b16dae 100644 --- a/include/linux/mroute_base.h +++ b/include/linux/mroute_base.h @@ -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 diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index ddd9e6bba499..c3b3f1c381e1 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -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;  | 
