diff options
| author | David Ahern <dsa@cumulusnetworks.com> | 2015-09-29 20:07:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-29 20:40:33 -0700 |
| commit | 8e1ed7058b3c79b085cf5b1529698a157499074c (patch) | |
| tree | e06e2badbf4bd51ab51d77dacd69f4e94fedb50c /net/ipv4/route.c | |
| parent | 3236b0042ba6555b45d75b6be12922922e17d66e (diff) | |
| download | talos-obmc-linux-8e1ed7058b3c79b085cf5b1529698a157499074c.tar.gz talos-obmc-linux-8e1ed7058b3c79b085cf5b1529698a157499074c.zip | |
net: Replace calls to vrf_dev_get_rth
Replace calls to vrf_dev_get_rth with l3mdev_get_rtable.
The check on the flow flags is handled in the l3mdev operation.
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 | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index ba466667c45c..1441de1550e6 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -112,7 +112,6 @@ #endif #include <net/secure_seq.h> #include <net/ip_tunnels.h> -#include <net/vrf.h> #include <net/l3mdev.h> #define RT_FL_TOS(oldflp4) \ @@ -2125,11 +2124,10 @@ 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_l3_master(dev_out) && - !(fl4->flowi4_flags & FLOWI_FLAG_VRFSRC)) { - rth = vrf_dev_get_rth(dev_out); + + rth = l3mdev_get_rtable(dev_out, fl4); + if (rth) goto out; - } } if (!fl4->daddr) { |
