diff options
| author | David Ahern <dsa@cumulusnetworks.com> | 2015-09-29 20:07:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-29 20:40:32 -0700 |
| commit | 007979eaf94d1c888d8c7cf8a5250c2c6c9bd98e (patch) | |
| tree | 9e3bcaa3104caa24e17c3e2bac8f1d4e4415c996 /net/ipv4/route.c | |
| parent | e6934f3ec00b04234acb24a1a2c28af59763d3b5 (diff) | |
| download | talos-obmc-linux-007979eaf94d1c888d8c7cf8a5250c2c6c9bd98e.tar.gz talos-obmc-linux-007979eaf94d1c888d8c7cf8a5250c2c6c9bd98e.zip | |
net: Rename IFF_VRF_MASTER to IFF_L3MDEV_MASTER
Rename IFF_VRF_MASTER to IFF_L3MDEV_MASTER and update the name of the
netif_is_vrf and netif_index_is_vrf macros.
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/route.c')
| -rw-r--r-- | net/ipv4/route.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 8c84a6664b30..a670f894ce13 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -2124,7 +2124,7 @@ struct rtable *__ip_route_output_key(struct net *net, struct flowi4 *fl4) fl4->saddr = inet_select_addr(dev_out, 0, RT_SCOPE_HOST); } - if (netif_is_vrf(dev_out) && + if (netif_is_l3_master(dev_out) && !(fl4->flowi4_flags & FLOWI_FLAG_VRFSRC)) { rth = vrf_dev_get_rth(dev_out); goto out; |
