Skip to content

Commit 0dd1805

Browse files
committed
Merge branch 'net-fix-kernel-doc-problems-in-include-net'
Randy Dunlap says: ==================== net: fix kernel-doc problems in include/net/ Fix many (but not all) kernel-doc warnings in include/net/. [PATCH v2 net 1/9] net: bonding: remove kernel-doc comment marker [PATCH v2 net 2/9] net: cfg802154: fix kernel-doc notation warnings [PATCH v2 net 3/9] codel: fix kernel-doc notation warnings [PATCH v2 net 4/9] devlink: fix kernel-doc notation warnings [PATCH v2 net 5/9] inet: frags: remove kernel-doc comment marker [PATCH v2 net 6/9] net: llc: fix kernel-doc notation warnings [PATCH v2 net 7/9] net: NSH: fix kernel-doc notation warning [PATCH v2 net 8/9] pie: fix kernel-doc notation warning [PATCH v2 net 9/9] rsi: remove kernel-doc comment marker ==================== Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 9840036 + 04be3c9 commit 0dd1805

File tree

9 files changed

+29
-22
lines changed

9 files changed

+29
-22
lines changed

include/net/bonding.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ struct bond_vlan_tag {
277277
unsigned short vlan_id;
278278
};
279279

280-
/**
280+
/*
281281
* Returns NULL if the net_device does not belong to any of the bond's slaves
282282
*
283283
* Caller must hold bond lock for read

include/net/cfg802154.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,8 @@ wpan_phy_cca_cmp(const struct wpan_phy_cca *a, const struct wpan_phy_cca *b)
170170
}
171171

172172
/**
173-
* @WPAN_PHY_FLAG_TRANSMIT_POWER: Indicates that transceiver will support
173+
* enum wpan_phy_flags - WPAN PHY state flags
174+
* @WPAN_PHY_FLAG_TXPOWER: Indicates that transceiver will support
174175
* transmit power setting.
175176
* @WPAN_PHY_FLAG_CCA_ED_LEVEL: Indicates that transceiver will support cca ed
176177
* level setting.

include/net/codel.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ struct codel_vars {
145145
* @maxpacket: largest packet we've seen so far
146146
* @drop_count: temp count of dropped packets in dequeue()
147147
* @drop_len: bytes of dropped packets in dequeue()
148-
* ecn_mark: number of packets we ECN marked instead of dropping
149-
* ce_mark: number of packets CE marked because sojourn time was above ce_threshold
148+
* @ecn_mark: number of packets we ECN marked instead of dropping
149+
* @ce_mark: number of packets CE marked because sojourn time was above ce_threshold
150150
*/
151151
struct codel_stats {
152152
u32 maxpacket;

include/net/devlink.h

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ struct devlink_dpipe_field {
221221
/**
222222
* struct devlink_dpipe_header - dpipe header object
223223
* @name: header name
224-
* @id: index, global/local detrmined by global bit
224+
* @id: index, global/local determined by global bit
225225
* @fields: fields
226226
* @fields_count: number of fields
227227
* @global: indicates if header is shared like most protocol header
@@ -241,7 +241,7 @@ struct devlink_dpipe_header {
241241
* @header_index: header index (packets can have several headers of same
242242
* type like in case of tunnels)
243243
* @header: header
244-
* @fieled_id: field index
244+
* @field_id: field index
245245
*/
246246
struct devlink_dpipe_match {
247247
enum devlink_dpipe_match_type type;
@@ -256,7 +256,7 @@ struct devlink_dpipe_match {
256256
* @header_index: header index (packets can have several headers of same
257257
* type like in case of tunnels)
258258
* @header: header
259-
* @fieled_id: field index
259+
* @field_id: field index
260260
*/
261261
struct devlink_dpipe_action {
262262
enum devlink_dpipe_action_type type;
@@ -292,7 +292,7 @@ struct devlink_dpipe_value {
292292
* struct devlink_dpipe_entry - table entry object
293293
* @index: index of the entry in the table
294294
* @match_values: match values
295-
* @matche_values_count: count of matches tuples
295+
* @match_values_count: count of matches tuples
296296
* @action_values: actions values
297297
* @action_values_count: count of actions values
298298
* @counter: value of counter
@@ -342,7 +342,9 @@ struct devlink_dpipe_table_ops;
342342
*/
343343
struct devlink_dpipe_table {
344344
void *priv;
345+
/* private: */
345346
struct list_head list;
347+
/* public: */
346348
const char *name;
347349
bool counters_enabled;
348350
bool counter_control_extern;
@@ -355,13 +357,13 @@ struct devlink_dpipe_table {
355357

356358
/**
357359
* struct devlink_dpipe_table_ops - dpipe_table ops
358-
* @actions_dump - dumps all tables actions
359-
* @matches_dump - dumps all tables matches
360-
* @entries_dump - dumps all active entries in the table
361-
* @counters_set_update - when changing the counter status hardware sync
360+
* @actions_dump: dumps all tables actions
361+
* @matches_dump: dumps all tables matches
362+
* @entries_dump: dumps all active entries in the table
363+
* @counters_set_update: when changing the counter status hardware sync
362364
* maybe needed to allocate/free counter related
363365
* resources
364-
* @size_get - get size
366+
* @size_get: get size
365367
*/
366368
struct devlink_dpipe_table_ops {
367369
int (*actions_dump)(void *priv, struct sk_buff *skb);
@@ -374,8 +376,8 @@ struct devlink_dpipe_table_ops {
374376

375377
/**
376378
* struct devlink_dpipe_headers - dpipe headers
377-
* @headers - header array can be shared (global bit) or driver specific
378-
* @headers_count - count of headers
379+
* @headers: header array can be shared (global bit) or driver specific
380+
* @headers_count: count of headers
379381
*/
380382
struct devlink_dpipe_headers {
381383
struct devlink_dpipe_header **headers;
@@ -387,7 +389,7 @@ struct devlink_dpipe_headers {
387389
* @size_min: minimum size which can be set
388390
* @size_max: maximum size which can be set
389391
* @size_granularity: size granularity
390-
* @size_unit: resource's basic unit
392+
* @unit: resource's basic unit
391393
*/
392394
struct devlink_resource_size_params {
393395
u64 size_min;
@@ -457,6 +459,7 @@ struct devlink_flash_notify {
457459

458460
/**
459461
* struct devlink_param - devlink configuration parameter data
462+
* @id: devlink parameter id number
460463
* @name: name of the parameter
461464
* @generic: indicates if the parameter is generic or driver specific
462465
* @type: parameter type
@@ -632,6 +635,7 @@ enum devlink_param_generic_id {
632635
* struct devlink_flash_update_params - Flash Update parameters
633636
* @fw: pointer to the firmware data to update from
634637
* @component: the flash component to update
638+
* @overwrite_mask: which types of flash update are supported (may be %0)
635639
*
636640
* With the exception of fw, drivers must opt-in to parameters by
637641
* setting the appropriate bit in the supported_flash_update_params field in

include/net/inet_frag.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ struct fqdir {
2929
};
3030

3131
/**
32-
* fragment queue flags
32+
* enum: fragment queue flags
3333
*
3434
* @INET_FRAG_FIRST_IN: first fragment has arrived
3535
* @INET_FRAG_LAST_IN: final fragment has arrived

include/net/llc_pdu.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa)
269269
/**
270270
* llc_pdu_decode_da - extracts dest address of input frame
271271
* @skb: input skb that destination address must be extracted from it
272-
* @sa: pointer to destination address (6 byte array).
272+
* @da: pointer to destination address (6 byte array).
273273
*
274274
* This function extracts destination address(MAC) of input frame.
275275
*/
@@ -321,7 +321,7 @@ static inline void llc_pdu_init_as_ui_cmd(struct sk_buff *skb)
321321

322322
/**
323323
* llc_pdu_init_as_test_cmd - sets PDU as TEST
324-
* @skb - Address of the skb to build
324+
* @skb: Address of the skb to build
325325
*
326326
* Sets a PDU as TEST
327327
*/
@@ -369,6 +369,8 @@ struct llc_xid_info {
369369
/**
370370
* llc_pdu_init_as_xid_cmd - sets bytes 3, 4 & 5 of LLC header as XID
371371
* @skb: input skb that header must be set into it.
372+
* @svcs_supported: The class of the LLC (I or II)
373+
* @rx_window: The size of the receive window of the LLC
372374
*
373375
* This function sets third,fourth,fifth and sixth bytes of LLC header as
374376
* a XID PDU.

include/net/nsh.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192

193193
/**
194194
* struct nsh_md1_ctx - Keeps track of NSH context data
195-
* @nshc<1-4>: NSH Contexts.
195+
* @context: NSH Contexts.
196196
*/
197197
struct nsh_md1_ctx {
198198
__be32 context[4];

include/net/pie.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
/**
1818
* struct pie_params - contains pie parameters
1919
* @target: target delay in pschedtime
20-
* @tudpate: interval at which drop probability is calculated
20+
* @tupdate: interval at which drop probability is calculated
2121
* @limit: total number of packets that can be in the queue
2222
* @alpha: parameter to control drop probability
2323
* @beta: parameter to control drop probability

include/net/rsi_91x.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright (c) 2017 Redpine Signals Inc.
33
*
44
* Permission to use, copy, modify, and/or distribute this software for any

0 commit comments

Comments
 (0)