diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-10-15 12:43:21 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-10-15 12:43:21 -0700 |
| commit | 2295cddf99e3f7c2be2b1160e2f5e53cc35b09be (patch) | |
| tree | 2c5a619c8aee5ef68028a65a1c059736b005846b /net/ipv4/route.c | |
| parent | 346e320cb2103edef709c4466a29140c4a8e527a (diff) | |
| parent | 2ecbc1f684482b4ed52447a39903bd9b0f222898 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor conflicts in net/mptcp/protocol.h and
tools/testing/selftests/net/Makefile.
In both cases code was added on both sides in the same place
so just keep both.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv4/route.c')
| -rw-r--r-- | net/ipv4/route.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index d15a78b26dfa..dc2a399cd9f4 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -2770,10 +2770,12 @@ struct rtable *ip_route_output_flow(struct net *net, struct flowi4 *flp4, if (IS_ERR(rt)) return rt; - if (flp4->flowi4_proto) + if (flp4->flowi4_proto) { + flp4->flowi4_oif = rt->dst.dev->ifindex; rt = (struct rtable *)xfrm_lookup_route(net, &rt->dst, flowi4_to_flowi(flp4), sk, 0); + } return rt; } |