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

Commit 9478d12d authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net: Move netif_index_is_l3_master to l3mdev.h 



Change CONFIG dependency to CONFIG_NET_L3_MASTER_DEV as well.

Signed-off-by: default avatarDavid Ahern <dsa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ec539514

include/linux/netdevice.h

+0 −21
Original line number Diff line number Diff line
@@ -3840,27 +3840,6 @@ static inline bool netif_is_ovs_master(const struct net_device *dev) 
	return dev->priv_flags & IFF_OPENVSWITCH;

}



static inline bool netif_index_is_l3_master(struct net *net, int ifindex)

{

	bool rc = false;



#if IS_ENABLED(CONFIG_NET_VRF)

	struct net_device *dev;



	if (ifindex == 0)

		return false;



	rcu_read_lock();



	dev = dev_get_by_index_rcu(net, ifindex);

	if (dev)

		rc = netif_is_l3_master(dev);



	rcu_read_unlock();

#endif

	return rc;

}



/* This device needs to keep skb dst for qdisc enqueue or ndo_start_xmit() */

static inline void netif_keep_dst(struct net_device *dev)

{

include/net/l3mdev.h

+24 −0
Original line number Diff line number Diff line
@@ -81,6 +81,25 @@ static inline struct rtable *l3mdev_get_rtable(const struct net_device *dev, 
	return NULL;

}



static inline bool netif_index_is_l3_master(struct net *net, int ifindex)

{

	struct net_device *dev;

	bool rc = false;



	if (ifindex == 0)

		return false;



	rcu_read_lock();



	dev = dev_get_by_index_rcu(net, ifindex);

	if (dev)

		rc = netif_is_l3_master(dev);



	rcu_read_unlock();



	return rc;

}



#else



static inline int l3mdev_master_ifindex_rcu(struct net_device *dev)
@@ -120,6 +139,11 @@ static inline struct rtable *l3mdev_get_rtable(const struct net_device *dev, 
	return NULL;

}



static inline bool netif_index_is_l3_master(struct net *net, int ifindex)

{

	return false;

}



#endif



#endif /* _NET_L3MDEV_H_ */

include/net/route.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <net/inetpeer.h>

#include <net/flow.h>

#include <net/inet_sock.h>

#include <net/l3mdev.h>

#include <linux/in_route.h>

#include <linux/rtnetlink.h>

#include <linux/rcupdate.h>