ANDROID: revert core of "xfrm: Use actual socket sk instead of skb socket for xfrm_output_resume"

The mentioned CL makes CtsnetTestCases fails on
  CtsNetTestCases:android.net.cts.IpSecManagerTest#testAesGcm128Tcp6

Bug: 186608065
Bug: 197517655
Test: CtsNetTestCases
Change-Id: I65eb4e45623af5d6ff8ec634ac11aa039f5cceef
Signed-off-by: Howard Chen <howardsoc@google.com>
Signed-off-by: Alistair Delva <adelva@google.com>
This commit is contained in:
Howard Chen
2021-05-13 11:16:04 +08:00
committed by Treehugger Robot
parent 35c849e3f6
commit bf0d1e087b

View File

@@ -610,7 +610,7 @@ EXPORT_SYMBOL_GPL(xfrm_output_resume);
static int xfrm_output2(struct net *net, struct sock *sk, struct sk_buff *skb)
{
return xfrm_output_resume(sk, skb, 1);
return xfrm_output_resume(skb->sk, skb, 1);
}
static int xfrm_output_gso(struct net *net, struct sock *sk, struct sk_buff *skb)