Patch "netfilter: nf_tables: fix kdoc warnings after gc rework" has been added to the 6.1-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    netfilter: nf_tables: fix kdoc warnings after gc rework

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     netfilter-nf_tables-fix-kdoc-warnings-after-gc-rework.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.


>From 08713cb006b6f07434f276c5ee214fb20c7fd965 Mon Sep 17 00:00:00 2001
From: Florian Westphal <fw@xxxxxxxxx>
Date: Thu, 10 Aug 2023 23:59:03 +0200
Subject: netfilter: nf_tables: fix kdoc warnings after gc rework

From: Florian Westphal <fw@xxxxxxxxx>

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@xxxxxxxxxx>
Closes: https://lore.kernel.org/netdev/20230810104638.746e46f1@xxxxxxxxxx/
Signed-off-by: Florian Westphal <fw@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
 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)


Patches currently in stable-queue which might be from fw@xxxxxxxxx are

queue-6.1/netfilter-nf_tables-disable-toggling-dormant-table-s.patch
queue-6.1/netfilter-nf_tables-fix-memleak-when-more-than-255-e.patch
queue-6.1/netfilter-nf_tables-gc-transaction-race-with-netns-d.patch
queue-6.1/netfilter-nf_tables-don-t-skip-expired-elements-duri.patch
queue-6.1/netfilter-nf_tables-fix-kdoc-warnings-after-gc-rework.patch
queue-6.1/netfilter-nf_tables-fix-gc-transaction-races-with-ne.patch
queue-6.1/netfilter-bpf-adjust-timeouts-of-non-confirmed-cts-i.patch
queue-6.1/netfilter-nft_set_rbtree-skip-sync-gc-for-new-elemen.patch
queue-6.1/netfilter-nf_tables-don-t-fail-inserts-if-duplicate-.patch
queue-6.1/netfilter-nf_tables-defer-gc-run-if-previous-batch-i.patch
queue-6.1/netfilter-conntrack-fix-extension-size-table.patch
queue-6.1/netfilter-ipset-fix-race-between-ipset_cmd_create-an.patch



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux