mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-28 16:52:18 +00:00
net/tipc: fix various kernel-doc warnings
kernel-doc and Sphinx fixes to eliminate lots of warnings in preparation for adding to the networking docbook. ../net/tipc/crypto.c:57: warning: cannot understand function prototype: 'enum ' ../net/tipc/crypto.c:69: warning: cannot understand function prototype: 'enum ' ../net/tipc/crypto.c:130: warning: Function parameter or member 'tfm' not described in 'tipc_tfm' ../net/tipc/crypto.c:130: warning: Function parameter or member 'list' not described in 'tipc_tfm' ../net/tipc/crypto.c:172: warning: Function parameter or member 'stat' not described in 'tipc_crypto_stats' ../net/tipc/crypto.c:232: warning: Function parameter or member 'flags' not described in 'tipc_crypto' ../net/tipc/crypto.c:329: warning: Function parameter or member 'ukey' not described in 'tipc_aead_key_validate' ../net/tipc/crypto.c:329: warning: Function parameter or member 'info' not described in 'tipc_aead_key_validate' ../net/tipc/crypto.c:482: warning: Function parameter or member 'aead' not described in 'tipc_aead_tfm_next' ../net/tipc/trace.c:43: warning: cannot understand function prototype: 'unsigned long sysctl_tipc_sk_filter[5] __read_mostly = ' Documentation/networking/tipc:57: ../net/tipc/msg.c:584: WARNING: Unexpected indentation. Documentation/networking/tipc:63: ../net/tipc/name_table.c:536: WARNING: Unexpected indentation. Documentation/networking/tipc:63: ../net/tipc/name_table.c:537: WARNING: Block quote ends without a blank line; unexpected unindent. Documentation/networking/tipc:78: ../net/tipc/socket.c:3809: WARNING: Unexpected indentation. Documentation/networking/tipc:78: ../net/tipc/socket.c:3807: WARNING: Inline strong start-string without end-string. Documentation/networking/tipc:72: ../net/tipc/node.c:904: WARNING: Unexpected indentation. Documentation/networking/tipc:39: ../net/tipc/crypto.c:97: WARNING: Block quote ends without a blank line; unexpected unindent. Documentation/networking/tipc:39: ../net/tipc/crypto.c:98: WARNING: Block quote ends without a blank line; unexpected unindent. Documentation/networking/tipc:39: ../net/tipc/crypto.c:141: WARNING: Inline strong start-string without end-string. ../net/tipc/discover.c:82: warning: Function parameter or member 'skb' not described in 'tipc_disc_init_msg' ../net/tipc/msg.c:69: warning: Function parameter or member 'gfp' not described in 'tipc_buf_acquire' ../net/tipc/msg.c:382: warning: Function parameter or member 'offset' not described in 'tipc_msg_build' ../net/tipc/msg.c:708: warning: Function parameter or member 'net' not described in 'tipc_msg_lookup_dest' ../net/tipc/subscr.c:65: warning: Function parameter or member 'seq' not described in 'tipc_sub_check_overlap' ../net/tipc/subscr.c:65: warning: Function parameter or member 'found_lower' not described in 'tipc_sub_check_overlap' ../net/tipc/subscr.c:65: warning: Function parameter or member 'found_upper' not described in 'tipc_sub_check_overlap' ../net/tipc/udp_media.c:75: warning: Function parameter or member 'proto' not described in 'udp_media_addr' ../net/tipc/udp_media.c:75: warning: Function parameter or member 'port' not described in 'udp_media_addr' ../net/tipc/udp_media.c:75: warning: Function parameter or member 'ipv4' not described in 'udp_media_addr' ../net/tipc/udp_media.c:75: warning: Function parameter or member 'ipv6' not described in 'udp_media_addr' ../net/tipc/udp_media.c:98: warning: Function parameter or member 'rcast' not described in 'udp_bearer' Also fixed a typo of "duest" to "dest". Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
ff10527e89
commit
5fcb7d47fe
@ -1,5 +1,5 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
/**
|
||||
/*
|
||||
* net/tipc/crypto.c: TIPC crypto for key handling & packet en/decryption
|
||||
*
|
||||
* Copyright (c) 2019, Ericsson AB
|
||||
@ -51,7 +51,7 @@
|
||||
|
||||
#define TIPC_REKEYING_INTV_DEF (60 * 24) /* default: 1 day */
|
||||
|
||||
/**
|
||||
/*
|
||||
* TIPC Key ids
|
||||
*/
|
||||
enum {
|
||||
@ -63,7 +63,7 @@ enum {
|
||||
KEY_MAX = KEY_3,
|
||||
};
|
||||
|
||||
/**
|
||||
/*
|
||||
* TIPC Crypto statistics
|
||||
*/
|
||||
enum {
|
||||
@ -90,7 +90,7 @@ int sysctl_tipc_max_tfms __read_mostly = TIPC_MAX_TFMS_DEF;
|
||||
/* Key exchange switch, default: on */
|
||||
int sysctl_tipc_key_exchange_enabled __read_mostly = 1;
|
||||
|
||||
/**
|
||||
/*
|
||||
* struct tipc_key - TIPC keys' status indicator
|
||||
*
|
||||
* 7 6 5 4 3 2 1 0
|
||||
@ -123,6 +123,8 @@ struct tipc_key {
|
||||
|
||||
/**
|
||||
* struct tipc_tfm - TIPC TFM structure to form a list of TFMs
|
||||
* @tfm: cipher handle/key
|
||||
* @list: linked list of TFMs
|
||||
*/
|
||||
struct tipc_tfm {
|
||||
struct crypto_aead *tfm;
|
||||
@ -138,7 +140,7 @@ struct tipc_tfm {
|
||||
* @salt: the key's SALT value
|
||||
* @authsize: authentication tag size (max = 16)
|
||||
* @mode: crypto mode is applied to the key
|
||||
* @hint[]: a hint for user key
|
||||
* @hint: a hint for user key
|
||||
* @rcu: struct rcu_head
|
||||
* @key: the aead key
|
||||
* @gen: the key's generation
|
||||
@ -166,6 +168,7 @@ struct tipc_aead {
|
||||
|
||||
/**
|
||||
* struct tipc_crypto_stats - TIPC Crypto statistics
|
||||
* @stat: array of crypto statistics
|
||||
*/
|
||||
struct tipc_crypto_stats {
|
||||
unsigned int stat[MAX_STATS];
|
||||
@ -194,6 +197,7 @@ struct tipc_crypto_stats {
|
||||
* @key_master: flag indicates if master key exists
|
||||
* @legacy_user: flag indicates if a peer joins w/o master key (for bwd comp.)
|
||||
* @nokey: no key indication
|
||||
* @flags: combined flags field
|
||||
* @lock: tipc_key lock
|
||||
*/
|
||||
struct tipc_crypto {
|
||||
@ -324,6 +328,8 @@ do { \
|
||||
|
||||
/**
|
||||
* tipc_aead_key_validate - Validate a AEAD user key
|
||||
* @ukey: pointer to user key data
|
||||
* @info: netlink info pointer
|
||||
*/
|
||||
int tipc_aead_key_validate(struct tipc_aead_key *ukey, struct genl_info *info)
|
||||
{
|
||||
@ -477,6 +483,7 @@ static void tipc_aead_users_set(struct tipc_aead __rcu *aead, int val)
|
||||
|
||||
/**
|
||||
* tipc_aead_tfm_next - Move TFM entry to the next one in list and return it
|
||||
* @aead: the AEAD key pointer
|
||||
*/
|
||||
static struct crypto_aead *tipc_aead_tfm_next(struct tipc_aead *aead)
|
||||
{
|
||||
|
@ -74,6 +74,7 @@ struct tipc_discoverer {
|
||||
/**
|
||||
* tipc_disc_init_msg - initialize a link setup message
|
||||
* @net: the applicable net namespace
|
||||
* @skb: buffer containing message
|
||||
* @mtyp: message type (request or response)
|
||||
* @b: ptr to bearer issuing message
|
||||
*/
|
||||
@ -380,7 +381,7 @@ int tipc_disc_create(struct net *net, struct tipc_bearer *b,
|
||||
|
||||
/**
|
||||
* tipc_disc_delete - destroy object sending periodic link setup requests
|
||||
* @d: ptr to link duest structure
|
||||
* @d: ptr to link dest structure
|
||||
*/
|
||||
void tipc_disc_delete(struct tipc_discoverer *d)
|
||||
{
|
||||
|
@ -58,11 +58,13 @@ static unsigned int align(unsigned int i)
|
||||
/**
|
||||
* tipc_buf_acquire - creates a TIPC message buffer
|
||||
* @size: message size (including TIPC header)
|
||||
* @gfp: memory allocation flags
|
||||
*
|
||||
* Returns a new buffer with data pointers set to the specified size.
|
||||
*
|
||||
* NOTE: Headroom is reserved to allow prepending of a data link header.
|
||||
* There may also be unrequested tailroom present at the buffer's end.
|
||||
* NOTE:
|
||||
* Headroom is reserved to allow prepending of a data link header.
|
||||
* There may also be unrequested tailroom present at the buffer's end.
|
||||
*/
|
||||
struct sk_buff *tipc_buf_acquire(u32 size, gfp_t gfp)
|
||||
{
|
||||
@ -367,6 +369,7 @@ int tipc_msg_fragment(struct sk_buff *skb, const struct tipc_msg *hdr,
|
||||
* tipc_msg_build - create buffer chain containing specified header and data
|
||||
* @mhdr: Message header, to be prepended to data
|
||||
* @m: User message
|
||||
* @offset: buffer offset for fragmented messages (FIXME)
|
||||
* @dsz: Total length of user data
|
||||
* @pktmax: Max packet size that can be used
|
||||
* @list: Buffer or chain of buffers to be returned to caller
|
||||
@ -580,7 +583,7 @@ bool tipc_msg_try_bundle(struct sk_buff *tskb, struct sk_buff **skb, u32 mss,
|
||||
* @skb: buffer to be extracted from.
|
||||
* @iskb: extracted inner buffer, to be returned
|
||||
* @pos: position in outer message of msg to be extracted.
|
||||
* Returns position of next msg
|
||||
* Returns position of next msg.
|
||||
* Consumes outer buffer when last packet extracted
|
||||
* Returns true when there is an extracted buffer, otherwise false
|
||||
*/
|
||||
@ -698,6 +701,7 @@ bool tipc_msg_skb_clone(struct sk_buff_head *msg, struct sk_buff_head *cpy)
|
||||
|
||||
/**
|
||||
* tipc_msg_lookup_dest(): try to find new destination for named message
|
||||
* @net: pointer to associated network namespace
|
||||
* @skb: the buffer containing the message.
|
||||
* @err: error code to be used by caller if lookup fails
|
||||
* Does not consume buffer
|
||||
|
@ -534,9 +534,9 @@ struct publication *tipc_nametbl_remove_publ(struct net *net, u32 type,
|
||||
*
|
||||
* On exit:
|
||||
* - if translation is deferred to another node, leave 'dnode' unchanged and
|
||||
* return 0
|
||||
* return 0
|
||||
* - if translation is attempted and succeeds, set 'dnode' to the publishing
|
||||
* node and return the published (non-zero) port number
|
||||
* node and return the published (non-zero) port number
|
||||
* - if translation is attempted and fails, set 'dnode' to 0 and return 0
|
||||
*
|
||||
* Note that for legacy users (node configured with Z.C.N address format) the
|
||||
|
@ -900,10 +900,11 @@ static void tipc_node_link_up(struct tipc_node *n, int bearer_id,
|
||||
*
|
||||
* This function is only called in a very special situation where link
|
||||
* failover can be already started on peer node but not on this node.
|
||||
* This can happen when e.g.
|
||||
* This can happen when e.g.::
|
||||
*
|
||||
* 1. Both links <1A-2A>, <1B-2B> down
|
||||
* 2. Link endpoint 2A up, but 1A still down (e.g. due to network
|
||||
* disturbance, wrong session, etc.)
|
||||
* disturbance, wrong session, etc.)
|
||||
* 3. Link <1B-2B> up
|
||||
* 4. Link endpoint 2A down (e.g. due to link tolerance timeout)
|
||||
* 5. Node 2 starts failover onto link <1B-2B>
|
||||
|
@ -3799,8 +3799,8 @@ int tipc_nl_publ_dump(struct sk_buff *skb, struct netlink_callback *cb)
|
||||
/**
|
||||
* tipc_sk_filtering - check if a socket should be traced
|
||||
* @sk: the socket to be examined
|
||||
* @sysctl_tipc_sk_filter[]: the socket tuple for filtering,
|
||||
* (portid, sock type, name type, name lower, name upper)
|
||||
* @sysctl_tipc_sk_filter: the socket tuple for filtering:
|
||||
* (portid, sock type, name type, name lower, name upper)
|
||||
*
|
||||
* Returns true if the socket meets the socket tuple data
|
||||
* (value 0 = 'any') or when there is no tuple set (all = 0),
|
||||
|
@ -56,8 +56,10 @@ static void tipc_sub_send_event(struct tipc_subscription *sub,
|
||||
}
|
||||
|
||||
/**
|
||||
* tipc_sub_check_overlap - test for subscription overlap with the
|
||||
* given values
|
||||
* tipc_sub_check_overlap - test for subscription overlap with the given values
|
||||
* @seq: tipc_name_seq to check
|
||||
* @found_lower: lower value to test
|
||||
* @found_upper: upper value to test
|
||||
*
|
||||
* Returns 1 if there is overlap, otherwise 0.
|
||||
*/
|
||||
|
@ -36,7 +36,7 @@
|
||||
#define CREATE_TRACE_POINTS
|
||||
#include "trace.h"
|
||||
|
||||
/**
|
||||
/*
|
||||
* socket tuples for filtering in socket traces:
|
||||
* (portid, sock type, name type, name lower, name upper)
|
||||
*/
|
||||
|
@ -64,6 +64,11 @@
|
||||
*
|
||||
* This is the bearer level originating address used in neighbor discovery
|
||||
* messages, and all fields should be in network byte order
|
||||
*
|
||||
* @proto: Ethernet protocol in use
|
||||
* @port: port being used
|
||||
* @ipv4: IPv4 address of neighbor
|
||||
* @ipv6: IPv6 address of neighbor
|
||||
*/
|
||||
struct udp_media_addr {
|
||||
__be16 proto;
|
||||
@ -88,6 +93,7 @@ struct udp_replicast {
|
||||
* @ubsock: bearer associated socket
|
||||
* @ifindex: local address scope
|
||||
* @work: used to schedule deferred work on a bearer
|
||||
* @rcast: associated udp_replicast container
|
||||
*/
|
||||
struct udp_bearer {
|
||||
struct tipc_bearer __rcu *bearer;
|
||||
@ -772,7 +778,7 @@ static int tipc_udp_enable(struct net *net, struct tipc_bearer *b,
|
||||
if (err)
|
||||
goto free;
|
||||
|
||||
/**
|
||||
/*
|
||||
* The bcast media address port is used for all peers and the ip
|
||||
* is used if it's a multicast address.
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user