From 709d3a4e3edcb0963185f9481b178c9cfb9aab55 Mon Sep 17 00:00:00 2001 From: Blagovest Kolenichev Date: Thu, 19 Oct 2017 15:28:13 -0700 Subject: net: restore upstream changes which break routing in tunnel scenarios This reverts commit: 3d78e43 net: Revert upstream changes which break routing in tunnel scenarios Restored changes are: f1900fb net: Really fix vti6 with oif in dst lookups 4148987 net: Fix vti use case with oif in dst lookups for IPv6 42a7b32 xfrm: Add oif to dst lookups Now it is save to restore the reverted upstream changes. Also below upstream changes are coming with android@73a2b70 (4.4.92) which will hit conflict if the above changes are not restored. c6a272a BACKPORT: net: xfrm: support setting an output mark. 511953d UPSTREAM: xfrm: Only add l3mdev oif to dst lookups Change-Id: Ia34abd5b9e2625d44922c018756d2214e2bd47bf Signed-off-by: Blagovest Kolenichev --- include/net/xfrm.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/net/xfrm.h b/include/net/xfrm.h index c81d806e415f..185fb037b332 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -285,10 +285,11 @@ struct xfrm_policy_afinfo { unsigned short family; struct dst_ops *dst_ops; void (*garbage_collect)(struct net *net); - struct dst_entry *(*dst_lookup)(struct net *net, int tos, + struct dst_entry *(*dst_lookup)(struct net *net, + int tos, int oif, const xfrm_address_t *saddr, const xfrm_address_t *daddr); - int (*get_saddr)(struct net *net, + int (*get_saddr)(struct net *net, int oif, xfrm_address_t *saddr, xfrm_address_t *daddr); void (*decode_session)(struct sk_buff *skb, -- cgit v1.2.3