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

net/tipc: fix tipc header files for kernel-doc

Fix tipc header files for adding to the networking docbook.

Remove some uses of "/**" that were not kernel-doc notation.

Fix some source formatting to eliminate Sphinx warnings.

Add missing struct member and function argument kernel-doc descriptions.

Correct the description of a couple of struct members that were
marked as "(FIXME)".

Documentation/networking/tipc:18: ../net/tipc/name_table.h:65: WARNING: Unexpected indentation.
Documentation/networking/tipc:18: ../net/tipc/name_table.h:66: WARNING: Block quote ends without a blank line; unexpected unindent.

../net/tipc/bearer.h:128: warning: Function parameter or member 'min_win' not described in 'tipc_media'
../net/tipc/bearer.h:128: warning: Function parameter or member 'max_win' not described in 'tipc_media'

../net/tipc/bearer.h:171: warning: Function parameter or member 'min_win' not described in 'tipc_bearer'
../net/tipc/bearer.h:171: warning: Function parameter or member 'max_win' not described in 'tipc_bearer'
../net/tipc/bearer.h:171: warning: Function parameter or member 'disc' not described in 'tipc_bearer'
../net/tipc/bearer.h:171: warning: Function parameter or member 'up' not described in 'tipc_bearer'
../net/tipc/bearer.h:171: warning: Function parameter or member 'refcnt' not described in 'tipc_bearer'

../net/tipc/name_distr.h:68: warning: Function parameter or member 'port' not described in 'distr_item'

../net/tipc/name_table.h:111: warning: Function parameter or member 'services' not described in 'name_table'
../net/tipc/name_table.h:111: warning: Function parameter or member 'cluster_scope_lock' not described in 'name_table'
../net/tipc/name_table.h:111: warning: Function parameter or member 'rc_dests' not described in 'name_table'
../net/tipc/name_table.h:111: warning: Function parameter or member 'snd_nxt' not described in 'name_table'

../net/tipc/subscr.h:67: warning: Function parameter or member 'kref' not described in 'tipc_subscription'
../net/tipc/subscr.h:67: warning: Function parameter or member 'net' not described in 'tipc_subscription'
../net/tipc/subscr.h:67: warning: Function parameter or member 'service_list' not described in 'tipc_subscription'
../net/tipc/subscr.h:67: warning: Function parameter or member 'conid' not described in 'tipc_subscription'
../net/tipc/subscr.h:67: warning: Function parameter or member 'inactive' not described in 'tipc_subscription'
../net/tipc/subscr.h:67: warning: Function parameter or member 'lock' not described in 'tipc_subscription'

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
ff10527e 7fe2af16

+24 -14
+7 -3
net/tipc/bearer.h
··· 93 93 * @raw2addr: convert from raw addr format to media addr format 94 94 * @priority: default link (and bearer) priority 95 95 * @tolerance: default time (in ms) before declaring link failure 96 - * @window: default window (in packets) before declaring link congestion 96 + * @min_win: minimum window (in packets) before declaring link congestion 97 + * @max_win: maximum window (in packets) before declaring link congestion 97 98 * @mtu: max packet size bearer can support for media type not dependent on 98 99 * underlying device MTU 99 100 * @type_id: TIPC media identifier ··· 139 138 * @pt: packet type for bearer 140 139 * @rcu: rcu struct for tipc_bearer 141 140 * @priority: default link priority for bearer 142 - * @window: default window size for bearer 141 + * @min_win: minimum window (in packets) before declaring link congestion 142 + * @max_win: maximum window (in packets) before declaring link congestion 143 143 * @tolerance: default link tolerance for bearer 144 144 * @domain: network domain to which links can be established 145 145 * @identity: array index of this bearer within TIPC bearer array 146 - * @link_req: ptr to (optional) structure making periodic link setup requests 146 + * @disc: ptr to link setup request 147 147 * @net_plane: network plane ('A' through 'H') currently associated with bearer 148 + * @up: bearer up flag (bit 0) 149 + * @refcnt: tipc_bearer reference counter 148 150 * 149 151 * Note: media-specific code is responsible for initialization of the fields 150 152 * indicated below when a bearer is enabled; TIPC's generic bearer code takes
+3 -3
net/tipc/crypto.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 - /** 2 + /* 3 3 * net/tipc/crypto.h: Include file for TIPC crypto 4 4 * 5 5 * Copyright (c) 2019, Ericsson AB ··· 53 53 #define TIPC_AES_GCM_IV_SIZE 12 54 54 #define TIPC_AES_GCM_TAG_SIZE 16 55 55 56 - /** 56 + /* 57 57 * TIPC crypto modes: 58 58 * - CLUSTER_KEY: 59 59 * One single key is used for both TX & RX in all nodes in the cluster. ··· 69 69 extern int sysctl_tipc_max_tfms __read_mostly; 70 70 extern int sysctl_tipc_key_exchange_enabled __read_mostly; 71 71 72 - /** 72 + /* 73 73 * TIPC encryption message format: 74 74 * 75 75 * 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
+1 -1
net/tipc/name_distr.h
··· 46 46 * @type: name sequence type 47 47 * @lower: name sequence lower bound 48 48 * @upper: name sequence upper bound 49 - * @ref: publishing port reference 49 + * @port: publishing port reference 50 50 * @key: publication key 51 51 * 52 52 * ===> All fields are stored in network byte order. <===
+6 -3
net/tipc/name_table.h
··· 60 60 * @key: publication key, unique across the cluster 61 61 * @id: publication id 62 62 * @binding_node: all publications from the same node which bound this one 63 - * - Remote publications: in node->publ_list 64 - * Used by node/name distr to withdraw publications when node is lost 63 + * - Remote publications: in node->publ_list; 64 + * Used by node/name distr to withdraw publications when node is lost 65 65 * - Local/node scope publications: in name_table->node_scope list 66 66 * - Local/cluster scope publications: in name_table->cluster_scope list 67 67 * @binding_sock: all publications from the same socket which bound this one ··· 92 92 93 93 /** 94 94 * struct name_table - table containing all existing port name publications 95 - * @seq_hlist: name sequence hash lists 95 + * @services: name sequence hash lists 96 96 * @node_scope: all local publications with node scope 97 97 * - used by name_distr during re-init of name table 98 98 * @cluster_scope: all local publications with cluster scope 99 99 * - used by name_distr to send bulk updates to new nodes 100 100 * - used by name_distr during re-init of name table 101 + * @cluster_scope_lock: lock for accessing @cluster_scope 101 102 * @local_publ_count: number of publications issued by this node 103 + * @rc_dests: destination node counter 104 + * @snd_nxt: next sequence number to be used 102 105 */ 103 106 struct name_table { 104 107 struct hlist_head services[TIPC_NAMETBL_SIZE];
+7 -4
net/tipc/subscr.h
··· 48 48 49 49 /** 50 50 * struct tipc_subscription - TIPC network topology subscription object 51 - * @subscriber: pointer to its subscriber 52 - * @seq: name sequence associated with subscription 51 + * @kref: reference count for this subscription 52 + * @net: network namespace associated with subscription 53 53 * @timer: timer governing subscription duration (optional) 54 - * @nameseq_list: adjacent subscriptions in name sequence's subscription list 54 + * @service_list: adjacent subscriptions in name sequence's subscription list 55 55 * @sub_list: adjacent subscriptions in subscriber's subscription list 56 56 * @evt: template for events generated by subscription 57 + * @conid: connection identifier of topology server 58 + * @inactive: true if this subscription is inactive 59 + * @lock: serialize up/down and timer events 57 60 */ 58 61 struct tipc_subscription { 59 62 struct kref kref; ··· 67 64 struct tipc_event evt; 68 65 int conid; 69 66 bool inactive; 70 - spinlock_t lock; /* serialize up/down and timer events */ 67 + spinlock_t lock; 71 68 }; 72 69 73 70 struct tipc_subscription *tipc_sub_subscribe(struct net *net,