Commit a4902d91 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Steffen Klassert
Browse files

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



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 94579ac3

net/xfrm/xfrm_output.c

+0 −4
Original line number Diff line number Diff line
@@ -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;

	}