From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 11 May 2020 03:00:15 +0000 (+1000)
Subject: xfrm: merge fixup for "remove output_finish indirection from xfrm_state_afinfo"
X-Git-Tag: v5.10.7~2255^2~56^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a4902d914e508f3691fa7ef885a76d2b7e735805;p=platform%2Fkernel%2Flinux-rpi.git

xfrm: merge fixup for "remove output_finish indirection from xfrm_state_afinfo"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---

diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index e4c23f6..a7ab193 100644
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -574,16 +574,12 @@ int xfrm_output(struct sock *sk, struct sk_buff *skb)
 	switch (x->outer_mode.family) {
 	case AF_INET:
 		memset(IPCB(skb), 0, sizeof(*IPCB(skb)));
-#ifdef CONFIG_NETFILTER
 		IPCB(skb)->flags |= IPSKB_XFRM_TRANSFORMED;
-#endif
 		break;
 	case AF_INET6:
 		memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));
 
-#ifdef CONFIG_NETFILTER
 		IP6CB(skb)->flags |= IP6SKB_XFRM_TRANSFORMED;
-#endif
 		break;
 	}