[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200511083346.24627-1-fw@strlen.de>
Date: Mon, 11 May 2020 10:33:42 +0200
From: Florian Westphal <fw@...len.de>
To: steffen.klassert@...unet.com
Cc: <netdev@...r.kernel.org>, Florian Westphal <fw@...len.de>,
Stephen Rothwell <sfr@...b.auug.org.au>
Subject: [PATCH ipsec-next] 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: 2ab6096db2f1 ("xfrm: remove output_finish indirection from xfrm_state_afinfo")
Reported-by: Stephen Rothwell <sfr@...b.auug.org.au>
Signed-off-by: Florian Westphal <fw@...len.de>
---
net/ipv4/xfrm4_output.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ipv4/xfrm4_output.c b/net/ipv4/xfrm4_output.c
index 502eb189d852..3cff51ba72bb 100644
--- a/net/ipv4/xfrm4_output.c
+++ b/net/ipv4/xfrm4_output.c
@@ -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);
--
2.26.2
Powered by blists - more mailing lists