Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Randy Dunlap and committed by
Jakub Kicinski
5fcb7d47 ff10527e

+40 -19
+12 -5
net/tipc/crypto.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 - /** 2 + /* 3 3 * net/tipc/crypto.c: TIPC crypto for key handling & packet en/decryption 4 4 * 5 5 * Copyright (c) 2019, Ericsson AB ··· 51 51 52 52 #define TIPC_REKEYING_INTV_DEF (60 * 24) /* default: 1 day */ 53 53 54 - /** 54 + /* 55 55 * TIPC Key ids 56 56 */ 57 57 enum { ··· 63 63 KEY_MAX = KEY_3, 64 64 }; 65 65 66 - /** 66 + /* 67 67 * TIPC Crypto statistics 68 68 */ 69 69 enum { ··· 90 90 /* Key exchange switch, default: on */ 91 91 int sysctl_tipc_key_exchange_enabled __read_mostly = 1; 92 92 93 - /** 93 + /* 94 94 * struct tipc_key - TIPC keys' status indicator 95 95 * 96 96 * 7 6 5 4 3 2 1 0 ··· 123 123 124 124 /** 125 125 * struct tipc_tfm - TIPC TFM structure to form a list of TFMs 126 + * @tfm: cipher handle/key 127 + * @list: linked list of TFMs 126 128 */ 127 129 struct tipc_tfm { 128 130 struct crypto_aead *tfm; ··· 140 138 * @salt: the key's SALT value 141 139 * @authsize: authentication tag size (max = 16) 142 140 * @mode: crypto mode is applied to the key 143 - * @hint[]: a hint for user key 141 + * @hint: a hint for user key 144 142 * @rcu: struct rcu_head 145 143 * @key: the aead key 146 144 * @gen: the key's generation ··· 168 166 169 167 /** 170 168 * struct tipc_crypto_stats - TIPC Crypto statistics 169 + * @stat: array of crypto statistics 171 170 */ 172 171 struct tipc_crypto_stats { 173 172 unsigned int stat[MAX_STATS]; ··· 197 194 * @key_master: flag indicates if master key exists 198 195 * @legacy_user: flag indicates if a peer joins w/o master key (for bwd comp.) 199 196 * @nokey: no key indication 197 + * @flags: combined flags field 200 198 * @lock: tipc_key lock 201 199 */ 202 200 struct tipc_crypto { ··· 328 324 329 325 /** 330 326 * tipc_aead_key_validate - Validate a AEAD user key 327 + * @ukey: pointer to user key data 328 + * @info: netlink info pointer 331 329 */ 332 330 int tipc_aead_key_validate(struct tipc_aead_key *ukey, struct genl_info *info) 333 331 { ··· 483 477 484 478 /** 485 479 * tipc_aead_tfm_next - Move TFM entry to the next one in list and return it 480 + * @aead: the AEAD key pointer 486 481 */ 487 482 static struct crypto_aead *tipc_aead_tfm_next(struct tipc_aead *aead) 488 483 {
+2 -1
net/tipc/discover.c
··· 74 74 /** 75 75 * tipc_disc_init_msg - initialize a link setup message 76 76 * @net: the applicable net namespace 77 + * @skb: buffer containing message 77 78 * @mtyp: message type (request or response) 78 79 * @b: ptr to bearer issuing message 79 80 */ ··· 381 380 382 381 /** 383 382 * tipc_disc_delete - destroy object sending periodic link setup requests 384 - * @d: ptr to link duest structure 383 + * @d: ptr to link dest structure 385 384 */ 386 385 void tipc_disc_delete(struct tipc_discoverer *d) 387 386 {
+7 -3
net/tipc/msg.c
··· 58 58 /** 59 59 * tipc_buf_acquire - creates a TIPC message buffer 60 60 * @size: message size (including TIPC header) 61 + * @gfp: memory allocation flags 61 62 * 62 63 * Returns a new buffer with data pointers set to the specified size. 63 64 * 64 - * NOTE: Headroom is reserved to allow prepending of a data link header. 65 - * There may also be unrequested tailroom present at the buffer's end. 65 + * NOTE: 66 + * Headroom is reserved to allow prepending of a data link header. 67 + * There may also be unrequested tailroom present at the buffer's end. 66 68 */ 67 69 struct sk_buff *tipc_buf_acquire(u32 size, gfp_t gfp) 68 70 { ··· 369 367 * tipc_msg_build - create buffer chain containing specified header and data 370 368 * @mhdr: Message header, to be prepended to data 371 369 * @m: User message 370 + * @offset: buffer offset for fragmented messages (FIXME) 372 371 * @dsz: Total length of user data 373 372 * @pktmax: Max packet size that can be used 374 373 * @list: Buffer or chain of buffers to be returned to caller ··· 583 580 * @skb: buffer to be extracted from. 584 581 * @iskb: extracted inner buffer, to be returned 585 582 * @pos: position in outer message of msg to be extracted. 586 - * Returns position of next msg 583 + * Returns position of next msg. 587 584 * Consumes outer buffer when last packet extracted 588 585 * Returns true when there is an extracted buffer, otherwise false 589 586 */ ··· 701 698 702 699 /** 703 700 * tipc_msg_lookup_dest(): try to find new destination for named message 701 + * @net: pointer to associated network namespace 704 702 * @skb: the buffer containing the message. 705 703 * @err: error code to be used by caller if lookup fails 706 704 * Does not consume buffer
+2 -2
net/tipc/name_table.c
··· 534 534 * 535 535 * On exit: 536 536 * - if translation is deferred to another node, leave 'dnode' unchanged and 537 - * return 0 537 + * return 0 538 538 * - if translation is attempted and succeeds, set 'dnode' to the publishing 539 - * node and return the published (non-zero) port number 539 + * node and return the published (non-zero) port number 540 540 * - if translation is attempted and fails, set 'dnode' to 0 and return 0 541 541 * 542 542 * Note that for legacy users (node configured with Z.C.N address format) the
+3 -2
net/tipc/node.c
··· 900 900 * 901 901 * This function is only called in a very special situation where link 902 902 * failover can be already started on peer node but not on this node. 903 - * This can happen when e.g. 903 + * This can happen when e.g.:: 904 + * 904 905 * 1. Both links <1A-2A>, <1B-2B> down 905 906 * 2. Link endpoint 2A up, but 1A still down (e.g. due to network 906 - * disturbance, wrong session, etc.) 907 + * disturbance, wrong session, etc.) 907 908 * 3. Link <1B-2B> up 908 909 * 4. Link endpoint 2A down (e.g. due to link tolerance timeout) 909 910 * 5. Node 2 starts failover onto link <1B-2B>
+2 -2
net/tipc/socket.c
··· 3799 3799 /** 3800 3800 * tipc_sk_filtering - check if a socket should be traced 3801 3801 * @sk: the socket to be examined 3802 - * @sysctl_tipc_sk_filter[]: the socket tuple for filtering, 3803 - * (portid, sock type, name type, name lower, name upper) 3802 + * @sysctl_tipc_sk_filter: the socket tuple for filtering: 3803 + * (portid, sock type, name type, name lower, name upper) 3804 3804 * 3805 3805 * Returns true if the socket meets the socket tuple data 3806 3806 * (value 0 = 'any') or when there is no tuple set (all = 0),
+4 -2
net/tipc/subscr.c
··· 56 56 } 57 57 58 58 /** 59 - * tipc_sub_check_overlap - test for subscription overlap with the 60 - * given values 59 + * tipc_sub_check_overlap - test for subscription overlap with the given values 60 + * @seq: tipc_name_seq to check 61 + * @found_lower: lower value to test 62 + * @found_upper: upper value to test 61 63 * 62 64 * Returns 1 if there is overlap, otherwise 0. 63 65 */
+1 -1
net/tipc/trace.c
··· 36 36 #define CREATE_TRACE_POINTS 37 37 #include "trace.h" 38 38 39 - /** 39 + /* 40 40 * socket tuples for filtering in socket traces: 41 41 * (portid, sock type, name type, name lower, name upper) 42 42 */
+7 -1
net/tipc/udp_media.c
··· 64 64 * 65 65 * This is the bearer level originating address used in neighbor discovery 66 66 * messages, and all fields should be in network byte order 67 + * 68 + * @proto: Ethernet protocol in use 69 + * @port: port being used 70 + * @ipv4: IPv4 address of neighbor 71 + * @ipv6: IPv6 address of neighbor 67 72 */ 68 73 struct udp_media_addr { 69 74 __be16 proto; ··· 93 88 * @ubsock: bearer associated socket 94 89 * @ifindex: local address scope 95 90 * @work: used to schedule deferred work on a bearer 91 + * @rcast: associated udp_replicast container 96 92 */ 97 93 struct udp_bearer { 98 94 struct tipc_bearer __rcu *bearer; ··· 778 772 if (err) 779 773 goto free; 780 774 781 - /** 775 + /* 782 776 * The bcast media address port is used for all peers and the ip 783 777 * is used if it's a multicast address. 784 778 */