summaryrefslogtreecommitdiff
path: root/net/xfrm
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2020-05-11 13:00:15 +1000
committerSteffen Klassert <steffen.klassert@secunet.com>2020-06-05 08:10:08 +0200
commita4902d914e508f3691fa7ef885a76d2b7e735805 (patch)
tree0af89c7f65c8638ef35a20ba45eacee52474da7e /net/xfrm
parent94579ac3f6d0820adc83b5dc5358ead0158101e9 (diff)
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>
Diffstat (limited to 'net/xfrm')
-rw-r--r--net/xfrm/xfrm_output.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index e4c23f69f69f..a7ab19353313 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;
}