]> git.baikalelectronics.ru Git - kernel.git/commit
net: Replace vrf_master_ifindex{, _rcu} with l3mdev equivalents
authorDavid Ahern <dsa@cumulusnetworks.com>
Wed, 30 Sep 2015 03:07:13 +0000 (20:07 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 30 Sep 2015 03:40:33 +0000 (20:40 -0700)
commitfc17638e8c8163cb95ff7b65288f133e0a9b24cf
tree558ac72668d0b93938f20a7ba08bb7e14b2ac6ed
parentfce19a58c4865f0b208b4f04cd16f2691804662f
net: Replace vrf_master_ifindex{, _rcu} with l3mdev equivalents

Replace calls to vrf_master_ifindex_rcu and vrf_master_ifindex with either
l3mdev_master_ifindex_rcu or l3mdev_master_ifindex.

The pattern:
    oif = vrf_master_ifindex(dev) ? : dev->ifindex;
is replaced with
    oif = l3mdev_fib_oif(dev);

And remove the now unused vrf macros.

Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/vrf.h
net/ipv4/fib_frontend.c
net/ipv4/icmp.c
net/ipv4/ip_fragment.c
net/ipv4/route.c
net/ipv4/xfrm4_policy.c
net/ipv6/xfrm6_policy.c