net: Move netif_index_is_l3_master to l3mdev.h

Change CONFIG dependency to CONFIG_NET_L3_MASTER_DEV as well.

Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 72bf9e37a2f0ad1621719af76aefcd5b49fc7925..b9450784ae0651a0f61986ac41a66416499074db 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -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)
 {

diff --git a/include/net/l3mdev.h b/include/net/l3mdev.h
index e382c777bab8695f3507544f99e4b7bfbf86f62a..87cee05a0a179cf83c44c707895aec732f342339 100644 (file)
--- a/include/net/l3mdev.h
+++ b/include/net/l3mdev.h
@@ -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_ */

diff --git a/include/net/route.h b/include/net/route.h
index a565d0dad12cfd0f995b732e225a185ce4e9a6b7..e211dc167db13a36ee8dc2a0874df48942f21a31 100644 (file)
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -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>