OSDN Git Service

net: Revert upstream changes which break routing in tunnel scenarios
authorSubash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Wed, 20 Jul 2016 23:25:30 +0000 (17:25 -0600)
committerSubash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Thu, 21 Jul 2016 16:58:54 +0000 (10:58 -0600)
commit3d78e4301157af4be20a2f3b96cb2fcde7026248
tree13b76ed3ad31ee90cb456f83c2634c2cf93e3301
parent9e4b3ba4afcff08bce320513610955391ab95806
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>
include/net/xfrm.h
net/ipv4/xfrm4_policy.c
net/ipv6/ip6_output.c
net/ipv6/route.c
net/ipv6/xfrm6_policy.c
net/xfrm/xfrm_policy.c