diff options
| author | David Ahern <dsa@cumulusnetworks.com> | 2016-10-12 13:20:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-13 12:05:26 -0400 |
| commit | 6104e112f4a613506ba1ea9d4b974279f888006b (patch) | |
| tree | a8b14bd20547bbcf015e0fccff23f17dbf02d7ec /net | |
| parent | 3c293f4e08b58ad5b78f78d89ca1fd41f87f8729 (diff) | |
| download | linux-6104e112f4a613506ba1ea9d4b974279f888006b.tar.bz2 | |
net: ipv4: Do not drop to make_route if oif is l3mdev
Commit e0d56fdd7342 was a bit aggressive removing l3mdev calls in
the IPv4 stack. If the fib_lookup fails we do not want to drop to
make_route if the oif is an l3mdev device.
Also reverts 19664c6a0009 ("net: l3mdev: Remove netif_index_is_l3_master")
which removed netif_index_is_l3_master.
Fixes: e0d56fdd7342 ("net: l3mdev: remove redundant calls")
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/route.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index f2be689a6c85..62d4d90c1389 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -2265,7 +2265,8 @@ struct rtable *__ip_route_output_key_hash(struct net *net, struct flowi4 *fl4, if (err) { res.fi = NULL; res.table = NULL; - if (fl4->flowi4_oif) { + if (fl4->flowi4_oif && + !netif_index_is_l3_master(net, fl4->flowi4_oif)) { /* Apparently, routing tables are wrong. Assume, that the destination is on link. |