diff options
| author | Subash Abhinov Kasiviswanathan <subashab@codeaurora.org> | 2016-07-20 17:25:30 -0600 |
|---|---|---|
| committer | Subash Abhinov Kasiviswanathan <subashab@codeaurora.org> | 2016-07-21 10:58:54 -0600 |
| commit | 3d78e4301157af4be20a2f3b96cb2fcde7026248 (patch) | |
| tree | 13b76ed3ad31ee90cb456f83c2634c2cf93e3301 /include | |
| parent | 9e4b3ba4afcff08bce320513610955391ab95806 (diff) | |
net: Revert upstream changes which break routing in tunnel scenarios
This reverts the following -
commit f1900fb5eca2cf9 ("net: Really fix vti6 with oif in dst
lookups")
'commit 4148987a5111b0c ("net: Fix vti use case with oif in dst
lookups for IPv6")
commit 42a7b32b73d6bf2 ("xfrm: Add oif to dst lookups")
Routing in tunneled scenarios are completely broken due to these
upstream commits. Revert these changes as a workaround till a
solution is determined internally and is accepted upstream.
CRs-Fixed: 1039009
Change-Id: I4e02573bc6dadf8d1a2ce50313e6d0c6e6a0e599
Acked-by: Abhinav Kannan <kannana@qti.qualcomm.com>
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/xfrm.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index d6f6e5006ee9..d18cbafc3455 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -285,11 +285,10 @@ 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, int oif, + struct dst_entry *(*dst_lookup)(struct net *net, int tos, const xfrm_address_t *saddr, const xfrm_address_t *daddr); - int (*get_saddr)(struct net *net, int oif, + int (*get_saddr)(struct net *net, xfrm_address_t *saddr, xfrm_address_t *daddr); void (*decode_session)(struct sk_buff *skb, |