Re: linux-next: build warning after merge of the net-next tree

[Stephen Rothwell]

Hi all,

On Tue, 17 May 2022 11:03:03 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> After merging the net-next tree, today's linux-next build (powerpc
> ppc64_defconfig) produced this warning:
> 
> net/netfilter/nf_conntrack_netlink.c:1717:12: warning: 'ctnetlink_dump_one_entry' defined but not used [-Wunused-function]
>  1717 | static int ctnetlink_dump_one_entry(struct sk_buff *skb,
>       |            ^~~~~~~~~~~~~~~~~~~~~~~~
> 
> Introduced by commit
> 
>   8a75a2c17410 ("netfilter: conntrack: remove unconfirmed list")

So for my i386 defconfig build this became on error, so I have applied
the following patch for today.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 17 May 2022 18:58:43 +1000
Subject: [PATCH] fix up for "netfilter: conntrack: remove unconfirmed list"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 net/netfilter/nf_conntrack_netlink.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index e768f59741a6..722af5e309ba 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -1714,6 +1714,7 @@ static int ctnetlink_done_list(struct netlink_callback *cb)
 	return 0;
 }
 
+#ifdef CONFIG_NF_CONNTRACK_EVENTS
 static int ctnetlink_dump_one_entry(struct sk_buff *skb,
 				    struct netlink_callback *cb,
 				    struct nf_conn *ct,
@@ -1754,6 +1755,7 @@ static int ctnetlink_dump_one_entry(struct sk_buff *skb,
 
 	return res;
 }
+#endif
 
 static int
 ctnetlink_dump_unconfirmed(struct sk_buff *skb, struct netlink_callback *cb)
-- 
2.35.1
-- 
Cheers,
Stephen Rothwell

Attachment: pgpThQfl4GnhC.pgp
Description: OpenPGP digital signature