leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

inet: Move VRF table lookup to inlined function

Browse Source 
Table lookup compiles out when VRF is not enabled.

Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Ahern 2015-08-16 17:13:27 -06:00 committed by David S. Miller
parent 808d28c468
commit dc028da54e
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/net/vrf.h
View File

@ -81,6 +81,25 @@ static inline int vrf_dev_table(const struct net_device *dev)
return tb_id;
}
static inline int vrf_dev_table_ifindex(struct net *net, int ifindex)
{
struct net_device *dev;
int 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 int vrf_dev_table_rtnl(const struct net_device *dev)
{
@ -125,6 +144,11 @@ static inline int vrf_dev_table(const struct net_device *dev)
return 0;
}
static inline int vrf_dev_table_ifindex(struct net *net, int ifindex)
{
return 0;
}
static inline int vrf_dev_table_rtnl(const struct net_device *dev)
{
return 0;

10
net/ipv4/af_inet.c
View File

@ -450,15 +450,7 @@ int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
goto out;
}
if (sk->sk_bound_dev_if) {
struct net_device *dev;
rcu_read_lock();
dev = dev_get_by_index_rcu(net, sk->sk_bound_dev_if);
if (dev)
tb_id = vrf_dev_table_rcu(dev) ? : tb_id;
rcu_read_unlock();
}
tb_id = vrf_dev_table_ifindex(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