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

Commit 3236b004 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net: Replace vrf_dev_table and friends 



Replace calls to vrf_dev_table and friends with l3mdev_fib_table
and kin.

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

include/net/vrf.h

+0 −80
Original line number Diff line number Diff line
@@ -34,66 +34,6 @@ struct net_vrf { 




#if IS_ENABLED(CONFIG_NET_VRF)

/* called with rcu_read_lock */

static inline u32 vrf_dev_table_rcu(const struct net_device *dev)

{

	u32 tb_id = 0;



	if (dev) {

		struct net_vrf_dev *vrf_ptr;



		vrf_ptr = rcu_dereference(dev->vrf_ptr);

		if (vrf_ptr)

			tb_id = vrf_ptr->tb_id;

	}

	return tb_id;

}



static inline u32 vrf_dev_table(const struct net_device *dev)

{

	u32 tb_id;



	rcu_read_lock();

	tb_id = vrf_dev_table_rcu(dev);

	rcu_read_unlock();



	return tb_id;

}



static inline u32 vrf_dev_table_ifindex(struct net *net, int ifindex)

{

	struct net_device *dev;

	u32 tb_id = 0;



	if (!ifindex)

		return 0;



	rcu_read_lock();



	dev = dev_get_by_index_rcu(net, ifindex);

	if (dev)

		tb_id = vrf_dev_table_rcu(dev);



	rcu_read_unlock();



	return tb_id;

}



/* called with rtnl */

static inline u32 vrf_dev_table_rtnl(const struct net_device *dev)

{

	u32 tb_id = 0;



	if (dev) {

		struct net_vrf_dev *vrf_ptr;



		vrf_ptr = rtnl_dereference(dev->vrf_ptr);

		if (vrf_ptr)

			tb_id = vrf_ptr->tb_id;

	}

	return tb_id;

}



/* caller has already checked netif_is_l3_master(dev) */

static inline struct rtable *vrf_dev_get_rth(const struct net_device *dev)

{
@@ -108,26 +48,6 @@ static inline struct rtable *vrf_dev_get_rth(const struct net_device *dev) 
}



#else

static inline u32 vrf_dev_table_rcu(const struct net_device *dev)

{

	return 0;

}



static inline u32 vrf_dev_table(const struct net_device *dev)

{

	return 0;

}



static inline u32 vrf_dev_table_ifindex(struct net *net, int ifindex)

{

	return 0;

}



static inline u32 vrf_dev_table_rtnl(const struct net_device *dev)

{

	return 0;

}



static inline struct rtable *vrf_dev_get_rth(const struct net_device *dev)

{

	return ERR_PTR(-ENETUNREACH);

net/ipv4/af_inet.c

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ 
#ifdef CONFIG_IP_MROUTE

#include <linux/mroute.h>

#endif

#include <net/vrf.h>

#include <net/l3mdev.h>





/* The inetsw table contains everything that inet_create needs to
@@ -446,7 +446,7 @@ int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 
			goto out;

	}



	tb_id = vrf_dev_table_ifindex(net, sk->sk_bound_dev_if) ? : tb_id;

	tb_id = l3mdev_fib_table_by_index(net, sk->sk_bound_dev_if) ? : tb_id;

	chk_addr_ret = inet_addr_type_table(net, addr->sin_addr.s_addr, tb_id);



	/* Not specified by any standard per-se, however it breaks too

net/ipv4/fib_frontend.c

+3 −4
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
#include <net/ip_fib.h>

#include <net/rtnetlink.h>

#include <net/xfrm.h>

#include <net/vrf.h>

#include <net/l3mdev.h>

#include <trace/events/fib.h>
@@ -256,7 +255,7 @@ EXPORT_SYMBOL(inet_addr_type); 
unsigned int inet_dev_addr_type(struct net *net, const struct net_device *dev,

				__be32 addr)

{

	u32 rt_table = vrf_dev_table(dev) ? : RT_TABLE_LOCAL;

	u32 rt_table = l3mdev_fib_table(dev) ? : RT_TABLE_LOCAL;



	return __inet_dev_addr_type(net, dev, addr, rt_table);

}
@@ -269,7 +268,7 @@ unsigned int inet_addr_type_dev_table(struct net *net, 
				      const struct net_device *dev,

				      __be32 addr)

{

	u32 rt_table = vrf_dev_table(dev) ? : RT_TABLE_LOCAL;

	u32 rt_table = l3mdev_fib_table(dev) ? : RT_TABLE_LOCAL;



	return __inet_dev_addr_type(net, NULL, addr, rt_table);

}
@@ -804,7 +803,7 @@ static int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb) 
static void fib_magic(int cmd, int type, __be32 dst, int dst_len, struct in_ifaddr *ifa)

{

	struct net *net = dev_net(ifa->ifa_dev->dev);

	u32 tb_id = vrf_dev_table_rtnl(ifa->ifa_dev->dev);

	u32 tb_id = l3mdev_fib_table(ifa->ifa_dev->dev);

	struct fib_table *tb;

	struct fib_config cfg = {

		.fc_protocol = RTPROT_KERNEL,