From: Simon Wunderlich <sw@simonwunderlich.de>
To: netdev@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Simon Horman <horms@kernel.org>,
b.a.t.m.a.n@lists.open-mesh.org,
Sven Eckelmann <sven@narfation.org>,
Simon Wunderlich <sw@simonwunderlich.de>
Subject: [PATCH net-next 07/11] batman-adv: tp_meter: update stale kernel-doc after refactoring
Date: Fri, 5 Jun 2026 09:20:01 +0200 [thread overview]
Message-ID: <20260605072005.490368-8-sw@simonwunderlich.de> (raw)
In-Reply-To: <20260605072005.490368-1-sw@simonwunderlich.de>
From: Sven Eckelmann <sven@narfation.org>
The tp_meter codebase was recently refactored:
* throughput meter sender and receiver variables were split into
two different structures
* the congestion control variables were extracted in a separate structure
But the kernel-doc was not updated everywhere to reflect these changes.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
net/batman-adv/tp_meter.c | 16 ++++++++--------
net/batman-adv/types.h | 14 ++++++++------
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c
index a404d70e053e2..7e98cbfbbb70d 100644
--- a/net/batman-adv/tp_meter.c
+++ b/net/batman-adv/tp_meter.c
@@ -289,7 +289,7 @@ batadv_tp_list_find_sender(struct batadv_priv *bat_priv, const u8 *dst)
* @bat_priv: the bat priv with all the mesh interface information
* @dst: the other endpoint MAC address to look for
*
- * Return: if matching session with @dst was found
+ * Return: true if a matching session with @dst was found, false otherwise
*/
static bool batadv_tp_list_active(struct batadv_priv *bat_priv, const u8 *dst)
__must_hold(&bat_priv->tp_list_lock)
@@ -355,7 +355,7 @@ batadv_tp_list_find_sender_session(struct batadv_priv *bat_priv, const u8 *dst,
/**
* batadv_tp_vars_common_release() - release batadv_tp_vars_common from lists
* and queue for free after rcu grace period
- * @ref: kref pointer of the batadv_tp_vars
+ * @ref: kref pointer of the batadv_tp_vars_common
*/
static void batadv_tp_vars_common_release(struct kref *ref)
{
@@ -391,7 +391,7 @@ static void batadv_tp_sender_put(struct batadv_tp_sender *tp_vars)
}
/**
- * batadv_tp_list_detach() - remove tp receiver session from mesh session list once
+ * batadv_tp_list_detach() - remove tp session from mesh session list once
* @tp_vars: the private data of the current TP meter session
*
* Return: whether tp_vars was detached from list and reference must be freed
@@ -509,7 +509,7 @@ static void batadv_tp_sender_finish(struct work_struct *work)
* batadv_tp_reset_sender_timer() - reschedule the sender timer
* @tp_vars: the private TP meter data for this session
*
- * Reschedule the timer using tp_vars->rto as delay
+ * Reschedule the timer using tp_vars->cc.rto as delay
*/
static void batadv_tp_reset_sender_timer(struct batadv_tp_sender *tp_vars)
{
@@ -621,9 +621,9 @@ static void batadv_tp_fill_prerandom(struct batadv_tp_sender *tp_vars,
*
* Create and send a single TP Meter message.
*
- * Return: 0 on success, BATADV_TP_REASON_DST_UNREACHABLE if the destination is
- * not reachable, BATADV_TP_REASON_MEMORY_ERROR if the packet couldn't be
- * allocated
+ * Return: 0 on success, BATADV_TP_REASON_MEMORY_ERROR if the packet couldn't
+ * be allocated, BATADV_TP_REASON_CANT_SEND if the packet could not be
+ * transmitted
*/
static int batadv_tp_send_msg(struct batadv_tp_sender *tp_vars, const u8 *src,
struct batadv_orig_node *orig_node,
@@ -913,7 +913,7 @@ static int batadv_tp_wait_available(struct batadv_tp_sender *tp_vars, size_t ple
* batadv_tp_send() - main sending thread of a tp meter session
* @arg: address of the related tp_vars
*
- * Return: nothing, this function never returns
+ * Return: 0
*/
static int batadv_tp_send(void *arg)
{
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index 5eb0371def83a..a7fa0d9e09288 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -1331,7 +1331,7 @@ struct batadv_tp_unacked {
/** @len: length of the packet */
u16 len;
- /** @list: list node for &batadv_tp_vars.unacked_list */
+ /** @list: list node for &batadv_tp_vars_common.unacked_list */
struct list_head list;
};
@@ -1367,7 +1367,9 @@ struct batadv_tp_vars_common {
struct rcu_head rcu;
};
-/** struct batadv_tp_sender_cc - congestion control variables */
+/**
+ * struct batadv_tp_sender_cc - congestion control variables
+ */
struct batadv_tp_sender_cc {
/** @fast_recovery: true if in Fast Recovery mode */
bool fast_recovery:1;
@@ -1410,7 +1412,7 @@ struct batadv_tp_sender_cc {
* struct batadv_tp_sender - sender tp meter private variables per session
*/
struct batadv_tp_sender {
- /** @common: common batadv_tp_vars (best be first member) */
+ /** @common: common batadv_tp_vars_common (must be first member) */
struct batadv_tp_vars_common common;
/** @start_time: start time in jiffies */
@@ -1437,7 +1439,7 @@ struct batadv_tp_sender {
/** @cc: congestion control variables */
struct batadv_tp_sender_cc cc;
- /** @cc_lock: lock do protect @cc */
+ /** @cc_lock: lock to protect @cc */
spinlock_t cc_lock;
/** @tot_sent: amount of data sent/ACKed so far */
@@ -1460,7 +1462,7 @@ struct batadv_tp_sender {
* struct batadv_tp_receiver - receiver tp meter private variables per session
*/
struct batadv_tp_receiver {
- /** @common: common batadv_tp_vars (best be first member) */
+ /** @common: common batadv_tp_vars_common (must be first member) */
struct batadv_tp_vars_common common;
/** @receiving: receiving binary semaphore: 1 if receiving, 0 is not */
@@ -1662,7 +1664,7 @@ struct batadv_priv {
/** @forw_bcast_list_lock: lock protecting forw_bcast_list */
spinlock_t forw_bcast_list_lock;
- /** @tp_list_lock: spinlock protecting @tp_list */
+ /** @tp_list_lock: spinlock protecting @tp_sender_list + @tp_receiver_list */
spinlock_t tp_list_lock;
/** @tp_num: number of currently active tp sessions */
--
2.47.3
next prev parent reply other threads:[~2026-06-05 7:20 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-05 7:19 [PATCH net-next 00/11] pull request for net-next: batman-adv 2026-06-05 Simon Wunderlich
2026-06-05 7:19 ` [PATCH net-next 01/11] batman-adv: tp_meter: initialize last_recv_time during init Simon Wunderlich
2026-06-05 7:19 ` [PATCH net-next 02/11] batman-adv: convert cancellation of work items to disable helper Simon Wunderlich
2026-06-05 7:19 ` [PATCH net-next 03/11] batman-adv: drop duplicated wifi_flags assignments Simon Wunderlich
2026-06-05 7:19 ` [PATCH net-next 04/11] batman-adv: use GFP_KERNEL allocations for the wifi detection cache Simon Wunderlich
2026-06-05 7:19 ` [PATCH net-next 05/11] batman-adv: document cleanup of batadv_wifi_net_devices entries Simon Wunderlich
2026-06-05 7:20 ` [PATCH net-next 06/11] batman-adv: correct batadv_wifi_* kernel-doc Simon Wunderlich
2026-06-05 7:20 ` Simon Wunderlich [this message]
2026-06-05 7:20 ` [PATCH net-next 08/11] batman-adv: bla: update stale kernel-doc Simon Wunderlich
2026-06-05 7:20 ` [PATCH net-next 09/11] batman-adv: uapi: keep kernel-doc in struct member order Simon Wunderlich
2026-06-05 7:20 ` [PATCH net-next 10/11] batman-adv: fix batadv_v_ogm_packet_recv error handling kernel-doc Simon Wunderlich
2026-06-05 7:20 ` [PATCH net-next 11/11] batman-adv: fix kernel-doc typos and grammar errors Simon Wunderlich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260605072005.490368-8-sw@simonwunderlich.de \
--to=sw@simonwunderlich.de \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sven@narfation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox