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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 486 bytes --]

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

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[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")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Florian Westphal <fw@strlen.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

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

[Steffen Klassert]

On Mon, May 11, 2020 at 10:33:42AM +0200, Florian Westphal wrote:
> 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@canb.auug.org.au>
> Signed-off-by: Florian Westphal <fw@strlen.de>

Applied, thanks Florian!