Commit 7d4343d5 authored May 11, 2020 by Florian Westphal Committed by Steffen Klassert May 11, 2020

xfrm: fix unused variable warning if CONFIG_NETFILTER=n



After recent change 'x' is only used when CONFIG_NETFILTER is set:

net/ipv4/xfrm4_output.c: In function '__xfrm4_output':
net/ipv4/xfrm4_output.c:19:21: warning: unused variable 'x' [-Wunused-variable]
   19 |  struct xfrm_state *x = skb_dst(skb)->xfrm;

Expand the CONFIG_NETFILTER scope to avoid this.

Fixes: 2ab6096d ("xfrm: remove output_finish indirection from xfrm_state_afinfo")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

parent 2ab6096d

net/ipv4/xfrm4_output.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,9 +16,9 @@

		static int __xfrm4_output(struct net net, struct sock sk, struct sk_buff *skb)
		{
		#ifdef CONFIG_NETFILTER
		struct xfrm_state *x = skb_dst(skb)->xfrm;

		#ifdef CONFIG_NETFILTER
		if (!x) {
		IPCB(skb)->flags \|= IPSKB_REROUTED;
		return dst_output(net, sk, skb);

Admin message