6.1-stable patches

added patches:
	netfilter-nf_tables-fix-kdoc-warnings-after-gc-rework.patch

diff --git a/queue-6.1/netfilter-nf_tables-fix-kdoc-warnings-after-gc-rework.patch b/queue-6.1/netfilter-nf_tables-fix-kdoc-warnings-after-gc-rework.patch
new file mode 100644 (file)
index 0000000..2b1108b
--- /dev/null
+++ b/queue-6.1/netfilter-nf_tables-fix-kdoc-warnings-after-gc-rework.patch
@@ -0,0 +1,47 @@
+From 08713cb006b6f07434f276c5ee214fb20c7fd965 Mon Sep 17 00:00:00 2001
+From: Florian Westphal <fw@strlen.de>
+Date: Thu, 10 Aug 2023 23:59:03 +0200
+Subject: netfilter: nf_tables: fix kdoc warnings after gc rework
+
+From: Florian Westphal <fw@strlen.de>
+
+commit 08713cb006b6f07434f276c5ee214fb20c7fd965 upstream.
+
+Jakub Kicinski says:
+  We've got some new kdoc warnings here:
+  net/netfilter/nft_set_pipapo.c:1557: warning: Function parameter or member '_set' not described in 'pipapo_gc'
+  net/netfilter/nft_set_pipapo.c:1557: warning: Excess function parameter 'set' description in 'pipapo_gc'
+  include/net/netfilter/nf_tables.h:577: warning: Function parameter or member 'dead' not described in 'nft_set'
+
+Fixes: 5f68718b34a5 ("netfilter: nf_tables: GC transaction API to avoid race with control plane")
+Fixes: f6c383b8c31a ("netfilter: nf_tables: adapt set backend to use GC transaction API")
+Reported-by: Jakub Kicinski <kuba@kernel.org>
+Closes: https://lore.kernel.org/netdev/20230810104638.746e46f1@kernel.org/
+Signed-off-by: Florian Westphal <fw@strlen.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/net/netfilter/nf_tables.h |    1 +
+ net/netfilter/nft_set_pipapo.c    |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+--- a/include/net/netfilter/nf_tables.h
++++ b/include/net/netfilter/nf_tables.h
+@@ -529,6 +529,7 @@ struct nft_set_elem_expr {
+  *    @expr: stateful expression
+  *    @ops: set ops
+  *    @flags: set flags
++ *    @dead: set will be freed, never cleared
+  *    @genmask: generation mask
+  *    @klen: key length
+  *    @dlen: data length
+--- a/net/netfilter/nft_set_pipapo.c
++++ b/net/netfilter/nft_set_pipapo.c
+@@ -1550,7 +1550,7 @@ static void nft_pipapo_gc_deactivate(str
+ 
+ /**
+  * pipapo_gc() - Drop expired entries from set, destroy start and end elements
+- * @set:      nftables API set representation
++ * @_set:     nftables API set representation
+  * @m:                Matching data
+  */
+ static void pipapo_gc(const struct nft_set *_set, struct nft_pipapo_match *m)

diff --git a/queue-6.1/series b/queue-6.1/series
index 9fc13597f07b41e73be65cb80f6604d5fd8d8a92..f20be435980604a1060b0f9342465b97c9d816f5 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -228,3 +228,4 @@ i2c-i801-unregister-tco_pdev-in-i801_probe-error-path.patch
 asoc-amd-yc-fix-non-functional-mic-on-lenovo-82qf-and-82ug.patch
 kernel-sched-modify-initial-boot-task-idle-setup.patch
 sched-rt-fix-live-lock-between-select_fallback_rq-and-rt-push.patch
+netfilter-nf_tables-fix-kdoc-warnings-after-gc-rework.patch