xfrm: Always set XFRM_TRANSFORMED in xfrm{4,6}_output_finish

dsahern · davem330 · commit 0c922a4850eb · 2020-04-22T12:32:11.000-07:00
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 &lt;dsahern@gmail.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/ipv4/xfrm4_output.c b/net/ipv4/xfrm4_output.c
@@ -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);
 }
diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
@@ -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);
 }

Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,7 @@ int xfrm4_output_finish(struct sock sk, struct sk_buff skb)`
`58`	`58`	`{`
`59`	`59`	`memset(IPCB(skb), 0, sizeof(*IPCB(skb)));`
`60`	`60`
`61`		`-#ifdef CONFIG_NETFILTER`
`62`	`61`	`IPCB(skb)->flags \|= IPSKB_XFRM_TRANSFORMED;`
`63`		`-#endif`
`64`	`62`
`65`	`63`	`return xfrm_output(sk, skb);`
`66`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,9 +111,7 @@ int xfrm6_output_finish(struct sock sk, struct sk_buff skb)`
`111`	`111`	`{`
`112`	`112`	`memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));`
`113`	`113`
`114`		`-#ifdef CONFIG_NETFILTER`
`115`	`114`	`IP6CB(skb)->flags \|= IP6SKB_XFRM_TRANSFORMED;`
`116`		`-#endif`
`117`	`115`
`118`	`116`	`return xfrm_output(sk, skb);`
`119`	`117`	`}`