Skip to contentSkip to conversation

linux-next: build warning after merge of the ipsec-next tree

PATCH Applied Stephen Rothwell 3 participants 3 messages May 11, 2020 – May 13, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

Hi all,

After merging the ipsec-next tree, today's linux-next build (arm multi_v7_defconfig) produced this warning:

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;
| ^

Introduced by commit

2ab6096db2f1 ("xfrm: remove output_finish indirection from xfrm_state_afinfo")

Signature · 2 lines
Cheers,
Stephen Rothwell
#1 lore raw

PATCH 1/1 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")
---
 net/ipv4/xfrm4_output.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/xfrm4_output.c +1 -1
index 502eb189d852..3cff51ba72bb 100644
@@ -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);
Signature · 1 line
2.26.2
maintainer Applied
#2 lore raw

Re: [PATCH ipsec-next] xfrm: fix unused variable warning if CONFIG_NETFILTER=n

Quoted 11 lines · Florian Westphal

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")

Applied, thanks Florian!