Skip to content

Commit 136f1e1

Browse files
matttbekuba-moo
authored andcommitted
mptcp: fix kdoc warnings
The following warnings were visible: $ ./scripts/kernel-doc -Wall -none \ net/mptcp/ include/net/mptcp.h include/uapi/linux/mptcp*.h \ include/trace/events/mptcp.h Warning: net/mptcp/token.c:108 No description found for return value of 'mptcp_token_new_request' Warning: net/mptcp/token.c:151 No description found for return value of 'mptcp_token_new_connect' Warning: net/mptcp/token.c:246 No description found for return value of 'mptcp_token_get_sock' Warning: net/mptcp/token.c:298 No description found for return value of 'mptcp_token_iter_next' Warning: net/mptcp/protocol.c:4431 No description found for return value of 'mptcp_splice_read' Warning: include/uapi/linux/mptcp_pm.h:13 missing initial short description on line: * enum mptcp_event_type Address all of them: either by using the 'Return:' keyword, or by adding a missing initial short description. The MPTCP CI will soon report issues with kdoc to avoid introducing new issues and being flagged by the Netdev CI. Reviewed-by: Geliang Tang <geliang@kernel.org> Reviewed-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Link: https://patch.msgid.link/20260205-net-mptcp-misc-fixes-6-19-rc8-v2-3-c2720ce75c34@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 364a708 commit 136f1e1

3 files changed

Lines changed: 11 additions & 8 deletions

File tree

Documentation/netlink/specs/mptcp_pm.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ definitions:
1515
type: enum
1616
name: event-type
1717
enum-name: mptcp-event-type
18+
doc: Netlink MPTCP event types
1819
name-prefix: mptcp-event-
1920
entries:
2021
-

include/uapi/linux/mptcp_pm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define MPTCP_PM_VER 1
1212

1313
/**
14-
* enum mptcp_event_type
14+
* enum mptcp_event_type - Netlink MPTCP event types
1515
* @MPTCP_EVENT_UNSPEC: unused event
1616
* @MPTCP_EVENT_CREATED: A new MPTCP connection has been created. It is the
1717
* good time to allocate memory and send ADD_ADDR if needed. Depending on the

net/mptcp/token.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ static void mptcp_crypto_key_gen_sha(u64 *key, u32 *token, u64 *idsn)
103103
* It creates a unique token to identify the new mptcp connection,
104104
* a secret local key and the initial data sequence number (idsn).
105105
*
106-
* Returns 0 on success.
106+
* Return: 0 on success.
107107
*/
108108
int mptcp_token_new_request(struct request_sock *req)
109109
{
@@ -146,7 +146,7 @@ int mptcp_token_new_request(struct request_sock *req)
146146
* the computed token at a later time, this is needed to process
147147
* join requests.
148148
*
149-
* returns 0 on success.
149+
* Return: 0 on success.
150150
*/
151151
int mptcp_token_new_connect(struct sock *ssk)
152152
{
@@ -241,7 +241,7 @@ bool mptcp_token_exists(u32 token)
241241
* This function returns the mptcp connection structure with the given token.
242242
* A reference count on the mptcp socket returned is taken.
243243
*
244-
* returns NULL if no connection with the given token value exists.
244+
* Return: NULL if no connection with the given token value exists.
245245
*/
246246
struct mptcp_sock *mptcp_token_get_sock(struct net *net, u32 token)
247247
{
@@ -288,11 +288,13 @@ EXPORT_SYMBOL_GPL(mptcp_token_get_sock);
288288
* @s_slot: start slot number
289289
* @s_num: start number inside the given lock
290290
*
291-
* This function returns the first mptcp connection structure found inside the
292-
* token container starting from the specified position, or NULL.
291+
* Description:
292+
* On successful iteration, the iterator is moved to the next position and a
293+
* reference to the returned socket is acquired.
293294
*
294-
* On successful iteration, the iterator is moved to the next position and
295-
* a reference to the returned socket is acquired.
295+
* Return:
296+
* The first mptcp connection structure found inside the token container
297+
* starting from the specified position, or NULL.
296298
*/
297299
struct mptcp_sock *mptcp_token_iter_next(const struct net *net, long *s_slot,
298300
long *s_num)

0 commit comments

Comments
 (0)