projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
net: Do not drop to make_route if oif is l3mdev
[firefly-linux-kernel-4.4.55.git]
/
net
/
ipv4
/
route.c
diff --git
a/net/ipv4/route.c
b/net/ipv4/route.c
index 4be5ff08f98d266153eaeea1f01605946def415b..85f184e429c63c8c426f58c779dc3544cf2e2a54 100644
(file)
--- a/
net/ipv4/route.c
+++ b/
net/ipv4/route.c
@@
-2196,7
+2196,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.