xfrm: Always set XFRM_TRANSFORMED in xfrm{4,6}_output_finish (0c922a48) · Commits · 戴 / test

IPSKB_XFRM_TRANSFORMED and IP6SKB_XFRM_TRANSFORMED are skb flags set by xfrm code to tell other skb handlers that the packet has been passed through the xfrm output functions. Simplify the code and just always set them rather than conditionally based on netfilter enabled thus making the flag available for other users. Signed-off-by:

David Ahern <dsahern@gmail.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/ipv4/xfrm4_output.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -58,9 +58,7 @@ int xfrm4_output_finish(struct sock sk, struct sk_buff skb)
		{
		memset(IPCB(skb), 0, sizeof(*IPCB(skb)));

		#ifdef CONFIG_NETFILTER
		IPCB(skb)->flags \|= IPSKB_XFRM_TRANSFORMED;
		#endif

		return xfrm_output(sk, skb);
		}

net/ipv6/xfrm6_output.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -111,9 +111,7 @@ int xfrm6_output_finish(struct sock sk, struct sk_buff skb)
		{
		memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));

		#ifdef CONFIG_NETFILTER
		IP6CB(skb)->flags \|= IP6SKB_XFRM_TRANSFORMED;
		#endif

		return xfrm_output(sk, skb);
		}

Admin message