* [PATCH net-next 01/20] net: 9p: kerneldoc fixes
2020-07-12 23:14 [PATCH net-next 00/20] net simple kerneldoc fixes Andrew Lunn
@ 2020-07-12 23:14 ` Andrew Lunn
2020-07-13 8:13 ` Dominique Martinet
2020-07-12 23:14 ` [PATCH net-next 02/20] net: can: " Andrew Lunn
` (19 subsequent siblings)
20 siblings, 1 reply; 26+ messages in thread
From: Andrew Lunn @ 2020-07-12 23:14 UTC (permalink / raw)
To: David Miller
Cc: netdev, Andrew Lunn, Eric Van Hensbergen, Latchesar Ionkov,
Dominique Martinet
Simple fixes which require no deep knowledge of the code.
Cc: Eric Van Hensbergen <ericvh@gmail.com>
Cc: Latchesar Ionkov <lucho@ionkov.net>
Cc: Dominique Martinet <asmadeus@codewreck.org>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
net/9p/client.c | 2 +-
net/9p/trans_rdma.c | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/net/9p/client.c b/net/9p/client.c
index fc1f3635e5dd..09f1ec589b80 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -811,7 +811,7 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...)
* @uodata: source for zero copy write
* @inlen: read buffer size
* @olen: write buffer size
- * @hdrlen: reader header size, This is the size of response protocol data
+ * @in_hdrlen: reader header size, This is the size of response protocol data
* @fmt: protocol format string (see protocol.c)
*
* Returns request structure (which client must free using p9_tag_remove)
diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c
index b21c3c209815..2885ff9c76f0 100644
--- a/net/9p/trans_rdma.c
+++ b/net/9p/trans_rdma.c
@@ -94,14 +94,15 @@ struct p9_trans_rdma {
struct completion cm_done;
};
+struct p9_rdma_req;
+
/**
- * p9_rdma_context - Keeps track of in-process WR
+ * struct p9_rdma_context - Keeps track of in-process WR
*
* @busa: Bus address to unmap when the WR completes
* @req: Keeps track of requests (send)
* @rc: Keepts track of replies (receive)
*/
-struct p9_rdma_req;
struct p9_rdma_context {
struct ib_cqe cqe;
dma_addr_t busa;
@@ -112,7 +113,7 @@ struct p9_rdma_context {
};
/**
- * p9_rdma_opts - Collection of mount options
+ * struct p9_rdma_opts - Collection of mount options
* @port: port of connection
* @sq_depth: The requested depth of the SQ. This really doesn't need
* to be any deeper than the number of threads used in the client
--
2.27.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH net-next 01/20] net: 9p: kerneldoc fixes
2020-07-12 23:14 ` [PATCH net-next 01/20] net: 9p: " Andrew Lunn
@ 2020-07-13 8:13 ` Dominique Martinet
0 siblings, 0 replies; 26+ messages in thread
From: Dominique Martinet @ 2020-07-13 8:13 UTC (permalink / raw)
To: Andrew Lunn; +Cc: David Miller, netdev, Eric Van Hensbergen, Latchesar Ionkov
Andrew Lunn wrote on Mon, Jul 13, 2020:
> Simple fixes which require no deep knowledge of the code.
>
> Cc: Eric Van Hensbergen <ericvh@gmail.com>
> Cc: Latchesar Ionkov <lucho@ionkov.net>
> Cc: Dominique Martinet <asmadeus@codewreck.org>
Ack.
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Can't hurt & looks correct; thanks.
David, assuming you'll take the whole set so ignoring this patch; please
let me know if I should pick it up.
--
Dominique
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH net-next 02/20] net: can: kerneldoc fixes
2020-07-12 23:14 [PATCH net-next 00/20] net simple kerneldoc fixes Andrew Lunn
2020-07-12 23:14 ` [PATCH net-next 01/20] net: 9p: " Andrew Lunn
@ 2020-07-12 23:14 ` Andrew Lunn
2020-07-12 23:14 ` [PATCH net-next 03/20] net: core: " Andrew Lunn
` (18 subsequent siblings)
20 siblings, 0 replies; 26+ messages in thread
From: Andrew Lunn @ 2020-07-12 23:14 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Andrew Lunn, Oliver Hartkopp, Marc Kleine-Budde
Simple fixes which require no deep knowledge of the code.
Cc: Oliver Hartkopp <socketcan@hartkopp.net>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
net/can/af_can.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/can/af_can.c b/net/can/af_can.c
index 128d37a4c2e0..5c06404bdf3e 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -410,6 +410,7 @@ static struct hlist_head *can_rcv_list_find(canid_t *can_id, canid_t *mask,
/**
* can_rx_register - subscribe CAN frames from a specific interface
+ * @net: the applicable net namespace
* @dev: pointer to netdevice (NULL => subcribe from 'all' CAN devices list)
* @can_id: CAN identifier (see description)
* @mask: CAN mask (see description)
@@ -498,6 +499,7 @@ static void can_rx_delete_receiver(struct rcu_head *rp)
/**
* can_rx_unregister - unsubscribe CAN frames from a specific interface
+ * @net: the applicable net namespace
* @dev: pointer to netdevice (NULL => unsubscribe from 'all' CAN devices list)
* @can_id: CAN identifier
* @mask: CAN mask
--
2.27.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next 03/20] net: core: kerneldoc fixes
2020-07-12 23:14 [PATCH net-next 00/20] net simple kerneldoc fixes Andrew Lunn
2020-07-12 23:14 ` [PATCH net-next 01/20] net: 9p: " Andrew Lunn
2020-07-12 23:14 ` [PATCH net-next 02/20] net: can: " Andrew Lunn
@ 2020-07-12 23:14 ` Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 04/20] net: dccp: " Andrew Lunn
` (17 subsequent siblings)
20 siblings, 0 replies; 26+ messages in thread
From: Andrew Lunn @ 2020-07-12 23:14 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Andrew Lunn
Simple fixes which require no deep knowledge of the code.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
net/core/dev.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/core/dev.c b/net/core/dev.c
index c02bae927812..eab4ebe3c21c 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -7908,6 +7908,7 @@ EXPORT_SYMBOL(netdev_bonding_info_change);
/**
* netdev_get_xmit_slave - Get the xmit slave of master device
+ * @dev: device
* @skb: The packet
* @all_slaves: assume all the slaves are active
*
--
2.27.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next 04/20] net: dccp: kerneldoc fixes
2020-07-12 23:14 [PATCH net-next 00/20] net simple kerneldoc fixes Andrew Lunn
` (2 preceding siblings ...)
2020-07-12 23:14 ` [PATCH net-next 03/20] net: core: " Andrew Lunn
@ 2020-07-12 23:15 ` Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 05/20] net: decnet: " Andrew Lunn
` (16 subsequent siblings)
20 siblings, 0 replies; 26+ messages in thread
From: Andrew Lunn @ 2020-07-12 23:15 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Andrew Lunn, Gerrit Renker
Simple fixes which require no deep knowledge of the code.
Cc: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
net/dccp/ccids/lib/packet_history.c | 2 ++
net/dccp/feat.c | 6 ++++++
net/dccp/input.c | 1 +
net/dccp/ipv4.c | 2 ++
net/dccp/options.c | 4 ++++
net/dccp/timer.c | 2 ++
6 files changed, 17 insertions(+)
diff --git a/net/dccp/ccids/lib/packet_history.c b/net/dccp/ccids/lib/packet_history.c
index 2d41bb036271..5f749da20759 100644
--- a/net/dccp/ccids/lib/packet_history.c
+++ b/net/dccp/ccids/lib/packet_history.c
@@ -365,6 +365,7 @@ void tfrc_rx_hist_purge(struct tfrc_rx_hist *h)
/**
* tfrc_rx_hist_rtt_last_s - reference entry to compute RTT samples against
+ * @h: The non-empty RX history object
*/
static inline struct tfrc_rx_hist_entry *
tfrc_rx_hist_rtt_last_s(const struct tfrc_rx_hist *h)
@@ -374,6 +375,7 @@ static inline struct tfrc_rx_hist_entry *
/**
* tfrc_rx_hist_rtt_prev_s - previously suitable (wrt rtt_last_s) RTT-sampling entry
+ * @h: The non-empty RX history object
*/
static inline struct tfrc_rx_hist_entry *
tfrc_rx_hist_rtt_prev_s(const struct tfrc_rx_hist *h)
diff --git a/net/dccp/feat.c b/net/dccp/feat.c
index 9c3b5e056234..afc071ea1271 100644
--- a/net/dccp/feat.c
+++ b/net/dccp/feat.c
@@ -165,6 +165,8 @@ static const struct {
/**
* dccp_feat_index - Hash function to map feature number into array position
+ * @feat_num: feature to hash, one of %dccp_feature_numbers
+ *
* Returns consecutive array index or -1 if the feature is not understood.
*/
static int dccp_feat_index(u8 feat_num)
@@ -567,6 +569,8 @@ int dccp_feat_clone_list(struct list_head const *from, struct list_head *to)
/**
* dccp_feat_valid_nn_length - Enforce length constraints on NN options
+ * @feat_num: feature to return length of, one of %dccp_feature_numbers
+ *
* Length is between 0 and %DCCP_OPTVAL_MAXLEN. Used for outgoing packets only,
* incoming options are accepted as long as their values are valid.
*/
@@ -1429,6 +1433,8 @@ int dccp_feat_parse_options(struct sock *sk, struct dccp_request_sock *dreq,
/**
* dccp_feat_init - Seed feature negotiation with host-specific defaults
+ * @sk: Socket to initialize.
+ *
* This initialises global defaults, depending on the value of the sysctls.
* These can later be overridden by registering changes via setsockopt calls.
* The last link in the chain is finalise_settings, to make sure that between
diff --git a/net/dccp/input.c b/net/dccp/input.c
index 6dce68a55964..bd9cfdb67436 100644
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -715,6 +715,7 @@ EXPORT_SYMBOL_GPL(dccp_rcv_state_process);
/**
* dccp_sample_rtt - Validate and finalise computation of RTT sample
+ * @sk: socket structure
* @delta: number of microseconds between packet and acknowledgment
*
* The routine is kept generic to work in different contexts. It should be
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index d19557c6d04b..a7e989919c53 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -694,6 +694,8 @@ EXPORT_SYMBOL_GPL(dccp_v4_do_rcv);
/**
* dccp_invalid_packet - check for malformed packets
+ * @skb: Packet to validate
+ *
* Implements RFC 4340, 8.5: Step 1: Check header basics
* Packets that fail these checks are ignored and do not receive Resets.
*/
diff --git a/net/dccp/options.c b/net/dccp/options.c
index 3b42f5c6a63d..daa9eed92646 100644
--- a/net/dccp/options.c
+++ b/net/dccp/options.c
@@ -43,6 +43,7 @@ u64 dccp_decode_value_var(const u8 *bf, const u8 len)
* dccp_parse_options - Parse DCCP options present in @skb
* @sk: client|server|listening dccp socket (when @dreq != NULL)
* @dreq: request socket to use during connection setup, or NULL
+ * @skb: frame to parse
*/
int dccp_parse_options(struct sock *sk, struct dccp_request_sock *dreq,
struct sk_buff *skb)
@@ -471,6 +472,8 @@ static int dccp_insert_option_ackvec(struct sock *sk, struct sk_buff *skb)
/**
* dccp_insert_option_mandatory - Mandatory option (5.8.2)
+ * @skb: frame into which to insert option
+ *
* Note that since we are using skb_push, this function needs to be called
* _after_ inserting the option it is supposed to influence (stack order).
*/
@@ -486,6 +489,7 @@ int dccp_insert_option_mandatory(struct sk_buff *skb)
/**
* dccp_insert_fn_opt - Insert single Feature-Negotiation option into @skb
+ * @skb: frame to insert feature negotiation option into
* @type: %DCCPO_CHANGE_L, %DCCPO_CHANGE_R, %DCCPO_CONFIRM_L, %DCCPO_CONFIRM_R
* @feat: one out of %dccp_feature_numbers
* @val: NN value or SP array (preferred element first) to copy
diff --git a/net/dccp/timer.c b/net/dccp/timer.c
index c0b3672637c4..0e06dfc32273 100644
--- a/net/dccp/timer.c
+++ b/net/dccp/timer.c
@@ -216,6 +216,8 @@ static void dccp_delack_timer(struct timer_list *t)
/**
* dccp_write_xmitlet - Workhorse for CCID packet dequeueing interface
+ * @data: Socket to act on
+ *
* See the comments above %ccid_dequeueing_decision for supported modes.
*/
static void dccp_write_xmitlet(unsigned long data)
--
2.27.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next 05/20] net: decnet: kerneldoc fixes
2020-07-12 23:14 [PATCH net-next 00/20] net simple kerneldoc fixes Andrew Lunn
` (3 preceding siblings ...)
2020-07-12 23:15 ` [PATCH net-next 04/20] net: dccp: " Andrew Lunn
@ 2020-07-12 23:15 ` Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 06/20] net: ipv4: " Andrew Lunn
` (15 subsequent siblings)
20 siblings, 0 replies; 26+ messages in thread
From: Andrew Lunn @ 2020-07-12 23:15 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Andrew Lunn
Simple fixes which require no deep knowledge of the code.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
net/decnet/dn_route.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 9eb7e4b62d9b..4cac31d22a50 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -494,6 +494,8 @@ static int dn_return_long(struct sk_buff *skb)
/**
* dn_route_rx_packet - Try and find a route for an incoming packet
+ * @net: The applicable net namespace
+ * @sk: Socket packet transmitted on
* @skb: The packet to find a route for
*
* Returns: result of input function if route is found, error code otherwise
--
2.27.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next 06/20] net: ipv4: kerneldoc fixes
2020-07-12 23:14 [PATCH net-next 00/20] net simple kerneldoc fixes Andrew Lunn
` (4 preceding siblings ...)
2020-07-12 23:15 ` [PATCH net-next 05/20] net: decnet: " Andrew Lunn
@ 2020-07-12 23:15 ` Andrew Lunn
2020-07-13 16:38 ` Paul Moore
2020-07-12 23:15 ` [PATCH net-next 07/20] net: ipv6: " Andrew Lunn
` (14 subsequent siblings)
20 siblings, 1 reply; 26+ messages in thread
From: Andrew Lunn @ 2020-07-12 23:15 UTC (permalink / raw)
To: David Miller
Cc: netdev, Andrew Lunn, Paul Moore, Alexey Kuznetsov, Eric Dumazet
Simple fixes which require no deep knowledge of the code.
Cc: Paul Moore <paul@paul-moore.com>
Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
net/ipv4/cipso_ipv4.c | 6 ++++--
net/ipv4/ipmr.c | 3 +++
net/ipv4/tcp_input.c | 1 -
net/ipv4/tcp_output.c | 2 ++
net/ipv4/tcp_timer.c | 2 +-
net/ipv4/udp.c | 6 +++---
6 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
index 0f1b9065c0a6..2eb71579f4d2 100644
--- a/net/ipv4/cipso_ipv4.c
+++ b/net/ipv4/cipso_ipv4.c
@@ -283,7 +283,7 @@ static int cipso_v4_cache_check(const unsigned char *key,
/**
* cipso_v4_cache_add - Add an entry to the CIPSO cache
- * @skb: the packet
+ * @cipso_ptr: pointer to CIPSO IP option
* @secattr: the packet's security attributes
*
* Description:
@@ -1535,6 +1535,7 @@ unsigned char *cipso_v4_optptr(const struct sk_buff *skb)
/**
* cipso_v4_validate - Validate a CIPSO option
+ * @skb: the packet
* @option: the start of the option, on error it is set to point to the error
*
* Description:
@@ -2066,7 +2067,7 @@ void cipso_v4_sock_delattr(struct sock *sk)
/**
* cipso_v4_req_delattr - Delete the CIPSO option from a request socket
- * @reg: the request socket
+ * @req: the request socket
*
* Description:
* Removes the CIPSO option from a request socket, if present.
@@ -2158,6 +2159,7 @@ int cipso_v4_sock_getattr(struct sock *sk, struct netlbl_lsm_secattr *secattr)
/**
* cipso_v4_skbuff_setattr - Set the CIPSO option on a packet
* @skb: the packet
+ * @doi_def: the DOI structure
* @secattr: the security attributes
*
* Description:
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index f5c7a58844a4..678639c01e48 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -636,7 +636,10 @@ static int call_ipmr_mfc_entry_notifiers(struct net *net,
/**
* vif_delete - Delete a VIF entry
+ * @mrt: Table to delete from
+ * @vifi: VIF identifier to delete
* @notify: Set to 1, if the caller is a notifier_call
+ * @head: if unregistering the VIF, place it on this queue
*/
static int vif_delete(struct mr_table *mrt, int vifi, int notify,
struct list_head *head)
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index dc77309ea15b..620829065e70 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4448,7 +4448,6 @@ static void tcp_sack_remove(struct tcp_sock *tp)
/**
* tcp_try_coalesce - try to merge skb to prior one
* @sk: socket
- * @dest: destination queue
* @to: prior buffer
* @from: buffer to add in queue
* @fragstolen: pointer to boolean
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 04b70fe31fa2..846dc3992708 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -3335,6 +3335,8 @@ int tcp_send_synack(struct sock *sk)
* sk: listener socket
* dst: dst entry attached to the SYNACK
* req: request_sock pointer
+ * foc: cookie for tcp fast open
+ * synack_type: Type of synback to prepare
*
* Allocate one skb and build a SYNACK packet.
* @dst is consumed : Caller should not use it again.
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index ada046f425d2..0c08c420fbc2 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -314,7 +314,7 @@ void tcp_delack_timer_handler(struct sock *sk)
/**
* tcp_delack_timer() - The TCP delayed ACK timeout handler
- * @data: Pointer to the current socket. (gets casted to struct sock *)
+ * @t: Pointer to the timer. (gets casted to struct sock *)
*
* This function gets (indirectly) called when the kernel timer for a TCP packet
* of this socket expires. Calls tcp_delack_timer_handler() to do the actual work.
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 31530129f137..073d346f515c 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -2743,9 +2743,9 @@ int compat_udp_getsockopt(struct sock *sk, int level, int optname,
#endif
/**
* udp_poll - wait for a UDP event.
- * @file - file struct
- * @sock - socket
- * @wait - poll table
+ * @file: - file struct
+ * @sock: - socket
+ * @wait: - poll table
*
* This is same as datagram poll, except for the special case of
* blocking sockets. If application is using a blocking fd
--
2.27.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH net-next 06/20] net: ipv4: kerneldoc fixes
2020-07-12 23:15 ` [PATCH net-next 06/20] net: ipv4: " Andrew Lunn
@ 2020-07-13 16:38 ` Paul Moore
0 siblings, 0 replies; 26+ messages in thread
From: Paul Moore @ 2020-07-13 16:38 UTC (permalink / raw)
To: Andrew Lunn; +Cc: David Miller, netdev, Alexey Kuznetsov, Eric Dumazet
On Sun, Jul 12, 2020 at 7:15 PM Andrew Lunn <andrew@lunn.ch> wrote:
>
> Simple fixes which require no deep knowledge of the code.
>
> Cc: Paul Moore <paul@paul-moore.com>
> Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
> Cc: Eric Dumazet <edumazet@google.com>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> ---
> net/ipv4/cipso_ipv4.c | 6 ++++--
> net/ipv4/ipmr.c | 3 +++
> net/ipv4/tcp_input.c | 1 -
> net/ipv4/tcp_output.c | 2 ++
> net/ipv4/tcp_timer.c | 2 +-
> net/ipv4/udp.c | 6 +++---
> 6 files changed, 13 insertions(+), 7 deletions(-)
Thanks Andrew. For the cipso_ipv4.c changes ...
Acked-by: Paul Moore <paul@paul-moore.com>
> diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
> index 0f1b9065c0a6..2eb71579f4d2 100644
> --- a/net/ipv4/cipso_ipv4.c
> +++ b/net/ipv4/cipso_ipv4.c
> @@ -283,7 +283,7 @@ static int cipso_v4_cache_check(const unsigned char *key,
>
> /**
> * cipso_v4_cache_add - Add an entry to the CIPSO cache
> - * @skb: the packet
> + * @cipso_ptr: pointer to CIPSO IP option
> * @secattr: the packet's security attributes
> *
> * Description:
> @@ -1535,6 +1535,7 @@ unsigned char *cipso_v4_optptr(const struct sk_buff *skb)
>
> /**
> * cipso_v4_validate - Validate a CIPSO option
> + * @skb: the packet
> * @option: the start of the option, on error it is set to point to the error
> *
> * Description:
> @@ -2066,7 +2067,7 @@ void cipso_v4_sock_delattr(struct sock *sk)
>
> /**
> * cipso_v4_req_delattr - Delete the CIPSO option from a request socket
> - * @reg: the request socket
> + * @req: the request socket
> *
> * Description:
> * Removes the CIPSO option from a request socket, if present.
> @@ -2158,6 +2159,7 @@ int cipso_v4_sock_getattr(struct sock *sk, struct netlbl_lsm_secattr *secattr)
> /**
> * cipso_v4_skbuff_setattr - Set the CIPSO option on a packet
> * @skb: the packet
> + * @doi_def: the DOI structure
> * @secattr: the security attributes
> *
> * Description:
--
paul moore
www.paul-moore.com
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH net-next 07/20] net: ipv6: kerneldoc fixes
2020-07-12 23:14 [PATCH net-next 00/20] net simple kerneldoc fixes Andrew Lunn
` (5 preceding siblings ...)
2020-07-12 23:15 ` [PATCH net-next 06/20] net: ipv4: " Andrew Lunn
@ 2020-07-12 23:15 ` Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 08/20] net: llc: " Andrew Lunn
` (13 subsequent siblings)
20 siblings, 0 replies; 26+ messages in thread
From: Andrew Lunn @ 2020-07-12 23:15 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Andrew Lunn, Alexey Kuznetsov, Hideaki YOSHIFUJI
Simple fixes which require no deep knowledge of the code.
Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
net/ipv6/exthdrs.c | 1 -
net/ipv6/ip6_output.c | 6 ++++--
net/ipv6/ip6_tunnel.c | 10 ++++++----
net/ipv6/udp.c | 3 +++
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index e9b366994475..374105e4394f 100644
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -1232,7 +1232,6 @@ static void ipv6_renew_option(int renewtype,
* @opt: original options
* @newtype: option type to replace in @opt
* @newopt: new option of type @newtype to replace (user-mem)
- * @newoptlen: length of @newopt
*
* Returns a new set of options which is a copy of @opt with the
* option type @newtype replaced with @newopt.
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 8a8c2d0cfcc8..c78e67d7747f 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1118,6 +1118,7 @@ static int ip6_dst_lookup_tail(struct net *net, const struct sock *sk,
/**
* ip6_dst_lookup - perform route lookup on flow
+ * @net: Network namespace to perform lookup in
* @sk: socket which provides route info
* @dst: pointer to dst_entry * for result
* @fl6: flow to lookup
@@ -1136,6 +1137,7 @@ EXPORT_SYMBOL_GPL(ip6_dst_lookup);
/**
* ip6_dst_lookup_flow - perform route lookup on flow with ipsec
+ * @net: Network namespace to perform lookup in
* @sk: socket which provides route info
* @fl6: flow to lookup
* @final_dst: final destination address for ipsec lookup
@@ -1202,11 +1204,11 @@ EXPORT_SYMBOL_GPL(ip6_sk_dst_lookup_flow);
* @skb: Packet for which lookup is done
* @dev: Tunnel device
* @net: Network namespace of tunnel device
- * @sk: Socket which provides route info
+ * @sock: Socket which provides route info
* @saddr: Memory to store the src ip address
* @info: Tunnel information
* @protocol: IP protocol
- * @use_cahce: Flag to enable cache usage
+ * @use_cache: Flag to enable cache usage
* This function performs a route lookup on a tunnel
*
* It returns a valid dst pointer and stores src address to be used in
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 821d96c720b9..f973344fcd85 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -124,8 +124,12 @@ static struct net_device_stats *ip6_get_stats(struct net_device *dev)
return &dev->stats;
}
+#define for_each_ip6_tunnel_rcu(start) \
+ for (t = rcu_dereference(start); t; t = rcu_dereference(t->next))
+
/**
* ip6_tnl_lookup - fetch tunnel matching the end-point addresses
+ * @net: network namespace
* @link: ifindex of underlying interface
* @remote: the address of the tunnel exit-point
* @local: the address of the tunnel entry-point
@@ -136,9 +140,6 @@ static struct net_device_stats *ip6_get_stats(struct net_device *dev)
* else %NULL
**/
-#define for_each_ip6_tunnel_rcu(start) \
- for (t = rcu_dereference(start); t; t = rcu_dereference(t->next))
-
static struct ip6_tnl *
ip6_tnl_lookup(struct net *net, int link,
const struct in6_addr *remote, const struct in6_addr *local)
@@ -302,8 +303,8 @@ static int ip6_tnl_create2(struct net_device *dev)
/**
* ip6_tnl_create - create a new tunnel
+ * @net: network namespace
* @p: tunnel parameters
- * @pt: pointer to new tunnel
*
* Description:
* Create tunnel matching given parameters.
@@ -351,6 +352,7 @@ static struct ip6_tnl *ip6_tnl_create(struct net *net, struct __ip6_tnl_parm *p)
/**
* ip6_tnl_locate - find or create tunnel matching given parameters
+ * @net: network namespace
* @p: tunnel parameters
* @create: != 0 if allowed to create new tunnel if no match found
*
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 7d4151747340..38c0d9350c6b 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -1059,6 +1059,9 @@ static int udpv6_pre_connect(struct sock *sk, struct sockaddr *uaddr,
* @sk: socket we are sending on
* @skb: sk_buff containing the filled-in UDP header
* (checksum field must be zeroed out)
+ * @saddr: source address
+ * @daddr: destination address
+ * @len: length of packet
*/
static void udp6_hwcsum_outgoing(struct sock *sk, struct sk_buff *skb,
const struct in6_addr *saddr,
--
2.27.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next 08/20] net: llc: kerneldoc fixes
2020-07-12 23:14 [PATCH net-next 00/20] net simple kerneldoc fixes Andrew Lunn
` (6 preceding siblings ...)
2020-07-12 23:15 ` [PATCH net-next 07/20] net: ipv6: " Andrew Lunn
@ 2020-07-12 23:15 ` Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 09/20] net: mac80211: " Andrew Lunn
` (12 subsequent siblings)
20 siblings, 0 replies; 26+ messages in thread
From: Andrew Lunn @ 2020-07-12 23:15 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Andrew Lunn
Simple fixes which require no deep knowledge of the code.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
net/llc/af_llc.c | 1 -
net/llc/llc_conn.c | 7 ++++---
net/llc/llc_input.c | 1 +
net/llc/llc_pdu.c | 2 +-
net/llc/llc_sap.c | 3 +++
5 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index 54fb8d452a7b..a7e5d23df5e7 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -980,7 +980,6 @@ static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
* llc_ui_getname - return the address info of a socket
* @sock: Socket to get address of.
* @uaddr: Address structure to return information.
- * @uaddrlen: Length of address structure.
* @peer: Does user want local or remote address information.
*
* Return the address information of a socket.
diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c
index 7b620acaca9e..1144cda2a0fc 100644
--- a/net/llc/llc_conn.c
+++ b/net/llc/llc_conn.c
@@ -284,8 +284,8 @@ out:;
/**
* llc_conn_remove_acked_pdus - Removes acknowledged pdus from tx queue
* @sk: active connection
- * nr: NR
- * how_many_unacked: size of pdu_unack_q after removing acked pdus
+ * @nr: NR
+ * @how_many_unacked: size of pdu_unack_q after removing acked pdus
*
* Removes acknowledged pdus from transmit queue (pdu_unack_q). Returns
* the number of pdus that removed from queue.
@@ -906,6 +906,7 @@ static void llc_sk_init(struct sock *sk)
/**
* llc_sk_alloc - Allocates LLC sock
+ * @net: network namespace
* @family: upper layer protocol family
* @priority: for allocation (%GFP_KERNEL, %GFP_ATOMIC, etc)
*
@@ -951,7 +952,7 @@ void llc_sk_stop_all_timers(struct sock *sk, bool sync)
/**
* llc_sk_free - Frees a LLC socket
- * @sk - socket to free
+ * @sk: - socket to free
*
* Frees a LLC socket
*/
diff --git a/net/llc/llc_input.c b/net/llc/llc_input.c
index 82cb93f66b9b..c309b72a5877 100644
--- a/net/llc/llc_input.c
+++ b/net/llc/llc_input.c
@@ -144,6 +144,7 @@ static inline int llc_fixup_skb(struct sk_buff *skb)
* @skb: received pdu
* @dev: device that receive pdu
* @pt: packet type
+ * @orig_dev: the original receive net device
*
* When the system receives a 802.2 frame this function is called. It
* checks SAP and connection of received pdu and passes frame to
diff --git a/net/llc/llc_pdu.c b/net/llc/llc_pdu.c
index 2e6cb79196bb..792d195c8bae 100644
--- a/net/llc/llc_pdu.c
+++ b/net/llc/llc_pdu.c
@@ -25,7 +25,7 @@ void llc_pdu_set_cmd_rsp(struct sk_buff *skb, u8 pdu_type)
/**
* pdu_set_pf_bit - sets poll/final bit in LLC header
- * @pdu_frame: input frame that p/f bit must be set into it.
+ * @skb: Frame to set bit in
* @bit_value: poll/final bit (0 or 1).
*
* This function sets poll/final bit in LLC header (based on type of PDU).
diff --git a/net/llc/llc_sap.c b/net/llc/llc_sap.c
index be419062e19a..6805ce43a055 100644
--- a/net/llc/llc_sap.c
+++ b/net/llc/llc_sap.c
@@ -37,6 +37,7 @@ static int llc_mac_header_len(unsigned short devtype)
/**
* llc_alloc_frame - allocates sk_buff for frame
+ * @sk: socket to allocate frame to
* @dev: network device this skb will be sent over
* @type: pdu type to allocate
* @data_size: data size to allocate
@@ -273,6 +274,7 @@ void llc_build_and_send_xid_pkt(struct llc_sap *sap, struct sk_buff *skb,
* llc_sap_rcv - sends received pdus to the sap state machine
* @sap: current sap component structure.
* @skb: received frame.
+ * @sk: socket to associate to frame
*
* Sends received pdus to the sap state machine.
*/
@@ -379,6 +381,7 @@ static void llc_do_mcast(struct llc_sap *sap, struct sk_buff *skb,
* llc_sap_mcast - Deliver multicast PDU's to all matching datagram sockets.
* @sap: SAP
* @laddr: address of local LLC (MAC + SAP)
+ * @skb: PDU to deliver
*
* Search socket list of the SAP and finds connections with same sap.
* Deliver clone to each.
--
2.27.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next 09/20] net: mac80211: kerneldoc fixes
2020-07-12 23:14 [PATCH net-next 00/20] net simple kerneldoc fixes Andrew Lunn
` (7 preceding siblings ...)
2020-07-12 23:15 ` [PATCH net-next 08/20] net: llc: " Andrew Lunn
@ 2020-07-12 23:15 ` Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 10/20] net: netfilter: " Andrew Lunn
` (11 subsequent siblings)
20 siblings, 0 replies; 26+ messages in thread
From: Andrew Lunn @ 2020-07-12 23:15 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Andrew Lunn, Johannes Berg
Simple fixes which require no deep knowledge of the code.
Cc: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
net/mac80211/mesh_pathtbl.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index 117519bf33d6..fe4e853c61f4 100644
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -72,7 +72,6 @@ static void mesh_table_free(struct mesh_table *tbl)
}
/**
- *
* mesh_path_assign_nexthop - update mesh path next hop
*
* @mpath: mesh path to update
@@ -140,7 +139,6 @@ static void prepare_for_gate(struct sk_buff *skb, char *dst_addr,
}
/**
- *
* mesh_path_move_to_queue - Move or copy frames from one mpath queue to another
*
* This function is used to transfer or copy frames from an unresolved mpath to
@@ -152,7 +150,7 @@ static void prepare_for_gate(struct sk_buff *skb, char *dst_addr,
*
* The gate mpath must be an active mpath with a valid mpath->next_hop.
*
- * @mpath: An active mpath the frames will be sent to (i.e. the gate)
+ * @gate_mpath: An active mpath the frames will be sent to (i.e. the gate)
* @from_mpath: The failed mpath
* @copy: When true, copy all the frames to the new mpath queue. When false,
* move them.
--
2.27.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next 10/20] net: netfilter: kerneldoc fixes
2020-07-12 23:14 [PATCH net-next 00/20] net simple kerneldoc fixes Andrew Lunn
` (8 preceding siblings ...)
2020-07-12 23:15 ` [PATCH net-next 09/20] net: mac80211: " Andrew Lunn
@ 2020-07-12 23:15 ` Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 11/20] net: netlabel: " Andrew Lunn
` (10 subsequent siblings)
20 siblings, 0 replies; 26+ messages in thread
From: Andrew Lunn @ 2020-07-12 23:15 UTC (permalink / raw)
To: David Miller
Cc: netdev, Andrew Lunn, Pablo Neira Ayuso, Jozsef Kadlecsik,
Florian Westphal
Simple fixes which require no deep knowledge of the code.
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: Jozsef Kadlecsik <kadlec@netfilter.org>
Cc: Florian Westphal <fw@strlen.de>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
net/netfilter/nf_conntrack_core.c | 2 +-
net/netfilter/nf_tables_api.c | 8 ++++----
net/netfilter/nft_set_pipapo.c | 8 ++++----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 79cd9dde457b..cb83a1f8badd 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1006,7 +1006,7 @@ static int nf_ct_resolve_clash_harder(struct sk_buff *skb, u32 repl_idx)
*
* @skb: skb that causes the clash
* @h: tuplehash of the clashing entry already in table
- * @hash_reply: hash slot for reply direction
+ * @reply_hash: hash slot for reply direction
*
* A conntrack entry can be inserted to the connection tracking table
* if there is no existing entry with an identical tuple.
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index f96785586f64..6708a4f2eec8 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -2375,7 +2375,7 @@ static int nf_tables_delchain(struct net *net, struct sock *nlsk,
/**
* nft_register_expr - register nf_tables expr type
- * @ops: expr type
+ * @type: expr type
*
* Registers the expr type for use with nf_tables. Returns zero on
* success or a negative errno code otherwise.
@@ -2394,7 +2394,7 @@ EXPORT_SYMBOL_GPL(nft_register_expr);
/**
* nft_unregister_expr - unregister nf_tables expr type
- * @ops: expr type
+ * @type: expr type
*
* Unregisters the expr typefor use with nf_tables.
*/
@@ -5595,7 +5595,7 @@ struct nft_set_gc_batch *nft_set_gc_batch_alloc(const struct nft_set *set,
/**
* nft_register_obj- register nf_tables stateful object type
- * @obj: object type
+ * @obj_type: object type
*
* Registers the object type for use with nf_tables. Returns zero on
* success or a negative errno code otherwise.
@@ -5614,7 +5614,7 @@ EXPORT_SYMBOL_GPL(nft_register_obj);
/**
* nft_unregister_obj - unregister nf_tables object type
- * @obj: object type
+ * @obj_type: object type
*
* Unregisters the object type for use with nf_tables.
*/
diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c
index 313de1d73168..cc6082a5f7ad 100644
--- a/net/netfilter/nft_set_pipapo.c
+++ b/net/netfilter/nft_set_pipapo.c
@@ -401,7 +401,7 @@ int pipapo_refill(unsigned long *map, int len, int rules, unsigned long *dst,
* nft_pipapo_lookup() - Lookup function
* @net: Network namespace
* @set: nftables API set representation
- * @elem: nftables API element representation containing key data
+ * @key: nftables API element representation containing key data
* @ext: nftables API extension pointer, filled with matching reference
*
* For more details, see DOC: Theory of Operation.
@@ -1075,7 +1075,7 @@ static int pipapo_expand(struct nft_pipapo_field *f,
* @m: Matching data, including mapping table
* @map: Table of rule maps: array of first rule and amount of rules
* in next field a given rule maps to, for each field
- * @ext: For last field, nft_set_ext pointer matching rules map to
+ * @e: For last field, nft_set_ext pointer matching rules map to
*/
static void pipapo_map(struct nft_pipapo_match *m,
union nft_pipapo_map_bucket map[NFT_PIPAPO_MAX_FIELDS],
@@ -1099,7 +1099,7 @@ static void pipapo_map(struct nft_pipapo_match *m,
/**
* pipapo_realloc_scratch() - Reallocate scratch maps for partial match results
* @clone: Copy of matching data with pending insertions and deletions
- * @bsize_max Maximum bucket size, scratch maps cover two buckets
+ * @bsize_max: Maximum bucket size, scratch maps cover two buckets
*
* Return: 0 on success, -ENOMEM on failure.
*/
@@ -1447,7 +1447,7 @@ static void pipapo_unmap(union nft_pipapo_map_bucket *mt, int rules,
/**
* pipapo_drop() - Delete entry from lookup and mapping tables, given rule map
* @m: Matching data
- * @rulemap Table of rule maps, arrays of first rule and amount of rules
+ * @rulemap: Table of rule maps, arrays of first rule and amount of rules
* in next field a given entry maps to, for each field
*
* For each rule in lookup table buckets mapping to this set of rules, drop
--
2.27.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next 11/20] net: netlabel: kerneldoc fixes
2020-07-12 23:14 [PATCH net-next 00/20] net simple kerneldoc fixes Andrew Lunn
` (9 preceding siblings ...)
2020-07-12 23:15 ` [PATCH net-next 10/20] net: netfilter: " Andrew Lunn
@ 2020-07-12 23:15 ` Andrew Lunn
2020-07-13 16:40 ` Paul Moore
2020-07-12 23:15 ` [PATCH net-next 12/20] net: nfc: " Andrew Lunn
` (9 subsequent siblings)
20 siblings, 1 reply; 26+ messages in thread
From: Andrew Lunn @ 2020-07-12 23:15 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Andrew Lunn, Paul Moore
Simple fixes which require no deep knowledge of the code.
Cc: Paul Moore <paul@paul-moore.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
net/netlabel/netlabel_domainhash.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netlabel/netlabel_domainhash.c b/net/netlabel/netlabel_domainhash.c
index a1f2320ecc16..d07de2c0fbc7 100644
--- a/net/netlabel/netlabel_domainhash.c
+++ b/net/netlabel/netlabel_domainhash.c
@@ -92,7 +92,7 @@ static void netlbl_domhsh_free_entry(struct rcu_head *entry)
/**
* netlbl_domhsh_hash - Hashing function for the domain hash table
- * @domain: the domain name to hash
+ * @key: the domain name to hash
*
* Description:
* This is the hashing function for the domain hash table, it returns the
--
2.27.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH net-next 11/20] net: netlabel: kerneldoc fixes
2020-07-12 23:15 ` [PATCH net-next 11/20] net: netlabel: " Andrew Lunn
@ 2020-07-13 16:40 ` Paul Moore
0 siblings, 0 replies; 26+ messages in thread
From: Paul Moore @ 2020-07-13 16:40 UTC (permalink / raw)
To: Andrew Lunn; +Cc: David Miller, netdev
On Sun, Jul 12, 2020 at 7:15 PM Andrew Lunn <andrew@lunn.ch> wrote:
>
> Simple fixes which require no deep knowledge of the code.
>
> Cc: Paul Moore <paul@paul-moore.com>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> ---
> net/netlabel/netlabel_domainhash.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Looks good to me, thanks!
Acked-by: Paul Moore <paul@paul-moore.com>
> diff --git a/net/netlabel/netlabel_domainhash.c b/net/netlabel/netlabel_domainhash.c
> index a1f2320ecc16..d07de2c0fbc7 100644
> --- a/net/netlabel/netlabel_domainhash.c
> +++ b/net/netlabel/netlabel_domainhash.c
> @@ -92,7 +92,7 @@ static void netlbl_domhsh_free_entry(struct rcu_head *entry)
>
> /**
> * netlbl_domhsh_hash - Hashing function for the domain hash table
> - * @domain: the domain name to hash
> + * @key: the domain name to hash
> *
> * Description:
> * This is the hashing function for the domain hash table, it returns the
> --
> 2.27.0.rc2
--
paul moore
www.paul-moore.com
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH net-next 12/20] net: nfc: kerneldoc fixes
2020-07-12 23:14 [PATCH net-next 00/20] net simple kerneldoc fixes Andrew Lunn
` (10 preceding siblings ...)
2020-07-12 23:15 ` [PATCH net-next 11/20] net: netlabel: " Andrew Lunn
@ 2020-07-12 23:15 ` Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 13/20] net: openvswitch: " Andrew Lunn
` (8 subsequent siblings)
20 siblings, 0 replies; 26+ messages in thread
From: Andrew Lunn @ 2020-07-12 23:15 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Andrew Lunn
Simple fixes which require no deep knowledge of the code.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
net/nfc/core.c | 3 +--
net/nfc/nci/core.c | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/net/nfc/core.c b/net/nfc/core.c
index c5f9c3ee82f8..eb377f87bcae 100644
--- a/net/nfc/core.c
+++ b/net/nfc/core.c
@@ -704,7 +704,6 @@ EXPORT_SYMBOL(nfc_tm_deactivated);
* nfc_alloc_send_skb - allocate a skb for data exchange responses
*
* @size: size to allocate
- * @gfp: gfp flags
*/
struct sk_buff *nfc_alloc_send_skb(struct nfc_dev *dev, struct sock *sk,
unsigned int flags, unsigned int size,
@@ -749,7 +748,7 @@ EXPORT_SYMBOL(nfc_alloc_recv_skb);
*
* @dev: The nfc device that found the targets
* @targets: array of nfc targets found
- * @ntargets: targets array size
+ * @n_targets: targets array size
*
* The device driver must call this function when one or many nfc targets
* are found. After calling this function, the device driver must stop
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 7cd524884304..f7b7dc5fe84a 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -1182,7 +1182,7 @@ EXPORT_SYMBOL(nci_free_device);
/**
* nci_register_device - register a nci device in the nfc subsystem
*
- * @dev: The nci device to register
+ * @ndev: The nci device to register
*/
int nci_register_device(struct nci_dev *ndev)
{
@@ -1246,7 +1246,7 @@ EXPORT_SYMBOL(nci_register_device);
/**
* nci_unregister_device - unregister a nci device in the nfc subsystem
*
- * @dev: The nci device to unregister
+ * @ndev: The nci device to unregister
*/
void nci_unregister_device(struct nci_dev *ndev)
{
--
2.27.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next 13/20] net: openvswitch: kerneldoc fixes
2020-07-12 23:14 [PATCH net-next 00/20] net simple kerneldoc fixes Andrew Lunn
` (11 preceding siblings ...)
2020-07-12 23:15 ` [PATCH net-next 12/20] net: nfc: " Andrew Lunn
@ 2020-07-12 23:15 ` Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 14/20] net: rxrpc: " Andrew Lunn
` (7 subsequent siblings)
20 siblings, 0 replies; 26+ messages in thread
From: Andrew Lunn @ 2020-07-12 23:15 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Andrew Lunn, Pravin B Shelar
Simple fixes which require no deep knowledge of the code.
Cc: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
net/openvswitch/flow_netlink.c | 6 +++---
net/openvswitch/vport.c | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
index 79252d4887ff..9d3e50c4d29f 100644
--- a/net/openvswitch/flow_netlink.c
+++ b/net/openvswitch/flow_netlink.c
@@ -1763,11 +1763,11 @@ static void mask_set_nlattr(struct nlattr *attr, u8 val)
* does not include any don't care bit.
* @net: Used to determine per-namespace field support.
* @match: receives the extracted flow match information.
- * @key: Netlink attribute holding nested %OVS_KEY_ATTR_* Netlink attribute
+ * @nla_key: Netlink attribute holding nested %OVS_KEY_ATTR_* Netlink attribute
* sequence. The fields should of the packet that triggered the creation
* of this flow.
- * @mask: Optional. Netlink attribute holding nested %OVS_KEY_ATTR_* Netlink
- * attribute specifies the mask field of the wildcarded flow.
+ * @nla_mask: Optional. Netlink attribute holding nested %OVS_KEY_ATTR_*
+ * Netlink attribute specifies the mask field of the wildcarded flow.
* @log: Boolean to allow kernel error logging. Normally true, but when
* probing for feature compatibility this should be passed in as false to
* suppress unnecessary error logging.
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
index 47febb4504f0..0d44c5c013fa 100644
--- a/net/openvswitch/vport.c
+++ b/net/openvswitch/vport.c
@@ -87,6 +87,7 @@ EXPORT_SYMBOL_GPL(ovs_vport_ops_unregister);
/**
* ovs_vport_locate - find a port that has already been created
*
+ * @net: network namespace
* @name: name of port to find
*
* Must be called with ovs or RCU read lock.
@@ -418,7 +419,7 @@ u32 ovs_vport_find_upcall_portid(const struct vport *vport, struct sk_buff *skb)
*
* @vport: vport that received the packet
* @skb: skb that was received
- * @tun_key: tunnel (if any) that carried packet
+ * @tun_info: tunnel (if any) that carried packet
*
* Must be called with rcu_read_lock. The packet cannot be shared and
* skb->data should point to the Ethernet header.
--
2.27.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next 14/20] net: rxrpc: kerneldoc fixes
2020-07-12 23:14 [PATCH net-next 00/20] net simple kerneldoc fixes Andrew Lunn
` (12 preceding siblings ...)
2020-07-12 23:15 ` [PATCH net-next 13/20] net: openvswitch: " Andrew Lunn
@ 2020-07-12 23:15 ` Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 15/20] net: sched: " Andrew Lunn
` (6 subsequent siblings)
20 siblings, 0 replies; 26+ messages in thread
From: Andrew Lunn @ 2020-07-12 23:15 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Andrew Lunn, David Howells
Simple fixes which require no deep knowledge of the code.
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
net/rxrpc/af_rxrpc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
index 394189b81849..cd7d0d204c74 100644
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
@@ -267,7 +267,7 @@ static int rxrpc_listen(struct socket *sock, int backlog)
* @gfp: The allocation constraints
* @notify_rx: Where to send notifications instead of socket queue
* @upgrade: Request service upgrade for call
- * @intr: The call is interruptible
+ * @interruptibility: The call is interruptible, or can be canceled.
* @debug_id: The debug ID for tracing to be assigned to the call
*
* Allow a kernel service to begin a call on the nominated socket. This just
--
2.27.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next 15/20] net: sched: kerneldoc fixes
2020-07-12 23:14 [PATCH net-next 00/20] net simple kerneldoc fixes Andrew Lunn
` (13 preceding siblings ...)
2020-07-12 23:15 ` [PATCH net-next 14/20] net: rxrpc: " Andrew Lunn
@ 2020-07-12 23:15 ` Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 16/20] net: socket: Move kerneldoc next to function it documents Andrew Lunn
` (5 subsequent siblings)
20 siblings, 0 replies; 26+ messages in thread
From: Andrew Lunn @ 2020-07-12 23:15 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Andrew Lunn, Jamal Hadi Salim, Cong Wang, Jiri Pirko
Simple fixes which require no deep knowledge of the code.
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Cong Wang <xiyou.wangcong@gmail.com>
Cc: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
net/sched/em_canid.c | 1 +
net/sched/ematch.c | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/sched/em_canid.c b/net/sched/em_canid.c
index b9a94fdf9397..5ea84decec19 100644
--- a/net/sched/em_canid.c
+++ b/net/sched/em_canid.c
@@ -40,6 +40,7 @@ struct canid_match {
/**
* em_canid_get_id() - Extracts Can ID out of the sk_buff structure.
+ * @skb: buffer to extract Can ID from
*/
static canid_t em_canid_get_id(struct sk_buff *skb)
{
diff --git a/net/sched/ematch.c b/net/sched/ematch.c
index dd3b8c11a2e0..f885bea5b452 100644
--- a/net/sched/ematch.c
+++ b/net/sched/ematch.c
@@ -389,7 +389,6 @@ EXPORT_SYMBOL(tcf_em_tree_validate);
/**
* tcf_em_tree_destroy - destroy an ematch tree
*
- * @tp: classifier kind handle
* @tree: ematch tree to be deleted
*
* This functions destroys an ematch tree previously created by
@@ -425,7 +424,7 @@ EXPORT_SYMBOL(tcf_em_tree_destroy);
* tcf_em_tree_dump - dump ematch tree into a rtnl message
*
* @skb: skb holding the rtnl message
- * @t: ematch tree to be dumped
+ * @tree: ematch tree to be dumped
* @tlv: TLV type to be used to encapsulate the tree
*
* This function dumps a ematch tree into a rtnl message. It is valid to
--
2.27.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next 16/20] net: socket: Move kerneldoc next to function it documents
2020-07-12 23:14 [PATCH net-next 00/20] net simple kerneldoc fixes Andrew Lunn
` (14 preceding siblings ...)
2020-07-12 23:15 ` [PATCH net-next 15/20] net: sched: " Andrew Lunn
@ 2020-07-12 23:15 ` Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 17/20] net: switchdev: kerneldoc fixes Andrew Lunn
` (4 subsequent siblings)
20 siblings, 0 replies; 26+ messages in thread
From: Andrew Lunn @ 2020-07-12 23:15 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Andrew Lunn
Fix the warning "Function parameter or member 'inode' not described in
'__sock_release'' due to the kerneldoc being placed before
__sock_release() not sock_release(), which does not take an inode
parameter.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
net/socket.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/net/socket.c b/net/socket.c
index d87812a9ed4b..770503c4ca76 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -586,15 +586,6 @@ struct socket *sock_alloc(void)
}
EXPORT_SYMBOL(sock_alloc);
-/**
- * sock_release - close a socket
- * @sock: socket to close
- *
- * The socket is released from the protocol stack if it has a release
- * callback, and the inode is then released if the socket is bound to
- * an inode not a file.
- */
-
static void __sock_release(struct socket *sock, struct inode *inode)
{
if (sock->ops) {
@@ -620,6 +611,14 @@ static void __sock_release(struct socket *sock, struct inode *inode)
sock->file = NULL;
}
+/**
+ * sock_release - close a socket
+ * @sock: socket to close
+ *
+ * The socket is released from the protocol stack if it has a release
+ * callback, and the inode is then released if the socket is bound to
+ * an inode not a file.
+ */
void sock_release(struct socket *sock)
{
__sock_release(sock, NULL);
--
2.27.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next 17/20] net: switchdev: kerneldoc fixes
2020-07-12 23:14 [PATCH net-next 00/20] net simple kerneldoc fixes Andrew Lunn
` (15 preceding siblings ...)
2020-07-12 23:15 ` [PATCH net-next 16/20] net: socket: Move kerneldoc next to function it documents Andrew Lunn
@ 2020-07-12 23:15 ` Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 18/20] net: tipc: " Andrew Lunn
` (3 subsequent siblings)
20 siblings, 0 replies; 26+ messages in thread
From: Andrew Lunn @ 2020-07-12 23:15 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Andrew Lunn, Jiri Pirko
Simple fixes which require no deep knowledge of the code.
Cc: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
net/switchdev/switchdev.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index f25604d68337..865f3e037425 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -304,8 +304,8 @@ static int switchdev_port_obj_add_defer(struct net_device *dev,
* switchdev_port_obj_add - Add port object
*
* @dev: port device
- * @id: object ID
* @obj: object to add
+ * @extack: netlink extended ack
*
* Use a 2-phase prepare-commit transaction model to ensure
* system is not left in a partially updated state due to
@@ -357,7 +357,6 @@ static int switchdev_port_obj_del_defer(struct net_device *dev,
* switchdev_port_obj_del - Delete port object
*
* @dev: port device
- * @id: object ID
* @obj: object to delete
*
* rtnl_lock must be held and must not be in atomic section,
--
2.27.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next 18/20] net: tipc: kerneldoc fixes
2020-07-12 23:14 [PATCH net-next 00/20] net simple kerneldoc fixes Andrew Lunn
` (16 preceding siblings ...)
2020-07-12 23:15 ` [PATCH net-next 17/20] net: switchdev: kerneldoc fixes Andrew Lunn
@ 2020-07-12 23:15 ` Andrew Lunn
2020-07-13 14:10 ` Jon Maloy
2020-07-12 23:15 ` [PATCH net-next 19/20] net: wireless: " Andrew Lunn
` (2 subsequent siblings)
20 siblings, 1 reply; 26+ messages in thread
From: Andrew Lunn @ 2020-07-12 23:15 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Andrew Lunn, Jon Maloy, Ying Xue
Simple fixes which require no deep knowledge of the code.
Cc: Jon Maloy <jmaloy@redhat.com>
Cc: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
net/tipc/bearer.c | 2 +-
net/tipc/discover.c | 5 ++---
net/tipc/link.c | 6 +++---
net/tipc/msg.c | 2 +-
net/tipc/node.c | 4 ++--
net/tipc/socket.c | 8 +++-----
net/tipc/udp_media.c | 2 +-
7 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index e366ec9a7e4d..808b147df7d5 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -595,7 +595,7 @@ void tipc_bearer_bc_xmit(struct net *net, u32 bearer_id,
/**
* tipc_l2_rcv_msg - handle incoming TIPC message from an interface
- * @buf: the received packet
+ * @skb: the received message
* @dev: the net device that the packet was received on
* @pt: the packet_type structure which was used to register this handler
* @orig_dev: the original receive net device in case the device is a bond
diff --git a/net/tipc/discover.c b/net/tipc/discover.c
index bfe43da127c0..d4ecacddb40c 100644
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
@@ -74,7 +74,7 @@ struct tipc_discoverer {
/**
* tipc_disc_init_msg - initialize a link setup message
* @net: the applicable net namespace
- * @type: message type (request or response)
+ * @mtyp: message type (request or response)
* @b: ptr to bearer issuing message
*/
static void tipc_disc_init_msg(struct net *net, struct sk_buff *skb,
@@ -339,7 +339,7 @@ static void tipc_disc_timeout(struct timer_list *t)
* @net: the applicable net namespace
* @b: ptr to bearer issuing requests
* @dest: destination address for request messages
- * @dest_domain: network domain to which links can be established
+ * @skb: pointer to created frame
*
* Returns 0 if successful, otherwise -errno.
*/
@@ -393,7 +393,6 @@ void tipc_disc_delete(struct tipc_discoverer *d)
* tipc_disc_reset - reset object to send periodic link setup requests
* @net: the applicable net namespace
* @b: ptr to bearer issuing requests
- * @dest_domain: network domain to which links can be established
*/
void tipc_disc_reset(struct net *net, struct tipc_bearer *b)
{
diff --git a/net/tipc/link.c b/net/tipc/link.c
index 1c579357ccdf..6aca0ebb391a 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -445,7 +445,7 @@ u32 tipc_link_state(struct tipc_link *l)
/**
* tipc_link_create - create a new link
- * @n: pointer to associated node
+ * @net: pointer to associated network namespace
* @if_name: associated interface name
* @bearer_id: id (index) of associated bearer
* @tolerance: link tolerance to be used by link
@@ -530,7 +530,7 @@ bool tipc_link_create(struct net *net, char *if_name, int bearer_id,
/**
* tipc_link_bc_create - create new link to be used for broadcast
- * @n: pointer to associated node
+ * @net: pointer to associated network namespace
* @mtu: mtu to be used initially if no peers
* @window: send window to be used
* @inputq: queue to put messages ready for delivery
@@ -974,7 +974,7 @@ void tipc_link_reset(struct tipc_link *l)
/**
* tipc_link_xmit(): enqueue buffer list according to queue situation
- * @link: link to use
+ * @l: link to use
* @list: chain of buffers containing message
* @xmitq: returned list of packets to be sent by caller
*
diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index 01b64869a173..848fae674532 100644
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -202,7 +202,7 @@ int tipc_buf_append(struct sk_buff **headbuf, struct sk_buff **buf)
/**
* tipc_msg_append(): Append data to tail of an existing buffer queue
- * @hdr: header to be used
+ * @_hdr: header to be used
* @m: the data to be appended
* @mss: max allowable size of buffer
* @dlen: size of data to be appended
diff --git a/net/tipc/node.c b/net/tipc/node.c
index 030a51c4d1fa..4edcee3088da 100644
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -1515,7 +1515,7 @@ static void node_lost_contact(struct tipc_node *n,
* tipc_node_get_linkname - get the name of a link
*
* @bearer_id: id of the bearer
- * @node: peer node address
+ * @addr: peer node address
* @linkname: link name output buffer
*
* Returns 0 on success
@@ -2022,7 +2022,7 @@ static bool tipc_node_check_state(struct tipc_node *n, struct sk_buff *skb,
* tipc_rcv - process TIPC packets/messages arriving from off-node
* @net: the applicable net namespace
* @skb: TIPC packet
- * @bearer: pointer to bearer message arrived on
+ * @b: pointer to bearer message arrived on
*
* Invoked with no locks held. Bearer pointer must point to a valid bearer
* structure (i.e. cannot be NULL), but bearer can be inactive.
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index a94f38333698..fc388cef6471 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -711,7 +711,6 @@ static int tipc_bind(struct socket *sock, struct sockaddr *uaddr,
* tipc_getname - get port ID of socket or peer socket
* @sock: socket structure
* @uaddr: area for returned socket address
- * @uaddr_len: area for returned length of socket address
* @peer: 0 = own ID, 1 = current peer ID, 2 = current/former peer ID
*
* Returns 0 on success, errno otherwise
@@ -1053,7 +1052,7 @@ static int tipc_send_group_anycast(struct socket *sock, struct msghdr *m,
/**
* tipc_send_group_bcast - send message to all members in communication group
- * @sk: socket structure
+ * @sock: socket structure
* @m: message to send
* @dlen: total length of message data
* @timeout: timeout to wait for wakeup
@@ -1673,7 +1672,7 @@ static void tipc_sk_finish_conn(struct tipc_sock *tsk, u32 peer_port,
/**
* tipc_sk_set_orig_addr - capture sender's address for received message
* @m: descriptor for message info
- * @hdr: received message header
+ * @skb: received message
*
* Note: Address is not captured if not requested by receiver.
*/
@@ -2095,7 +2094,6 @@ static void tipc_write_space(struct sock *sk)
/**
* tipc_data_ready - wake up threads to indicate messages have been received
* @sk: socket
- * @len: the length of messages
*/
static void tipc_data_ready(struct sock *sk)
{
@@ -2677,7 +2675,7 @@ static int tipc_wait_for_accept(struct socket *sock, long timeo)
/**
* tipc_accept - wait for connection request
* @sock: listening socket
- * @newsock: new socket that is to be connected
+ * @new_sock: new socket that is to be connected
* @flags: file-related flags associated with socket
*
* Returns 0 on success, errno otherwise
diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c
index 28a283f26a8d..d91b7c543e39 100644
--- a/net/tipc/udp_media.c
+++ b/net/tipc/udp_media.c
@@ -565,7 +565,7 @@ int tipc_udp_nl_add_bearer_data(struct tipc_nl_msg *msg, struct tipc_bearer *b)
/**
* tipc_parse_udp_addr - build udp media address from netlink data
- * @nlattr: netlink attribute containing sockaddr storage aligned address
+ * @nla: netlink attribute containing sockaddr storage aligned address
* @addr: tipc media address to fill with address, port and protocol type
* @scope_id: IPv6 scope id pointer, not NULL indicates it's required
*/
--
2.27.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH net-next 18/20] net: tipc: kerneldoc fixes
2020-07-12 23:15 ` [PATCH net-next 18/20] net: tipc: " Andrew Lunn
@ 2020-07-13 14:10 ` Jon Maloy
0 siblings, 0 replies; 26+ messages in thread
From: Jon Maloy @ 2020-07-13 14:10 UTC (permalink / raw)
To: Andrew Lunn, David Miller; +Cc: netdev, Ying Xue
On 7/12/20 7:15 PM, Andrew Lunn wrote:
> Simple fixes which require no deep knowledge of the code.
>
> Cc: Jon Maloy <jmaloy@redhat.com>
> Cc: Ying Xue <ying.xue@windriver.com>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> ---
> net/tipc/bearer.c | 2 +-
> net/tipc/discover.c | 5 ++---
> net/tipc/link.c | 6 +++---
> net/tipc/msg.c | 2 +-
> net/tipc/node.c | 4 ++--
> net/tipc/socket.c | 8 +++-----
> net/tipc/udp_media.c | 2 +-
> 7 files changed, 13 insertions(+), 16 deletions(-)
>
> diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
> index e366ec9a7e4d..808b147df7d5 100644
> --- a/net/tipc/bearer.c
> +++ b/net/tipc/bearer.c
> @@ -595,7 +595,7 @@ void tipc_bearer_bc_xmit(struct net *net, u32 bearer_id,
>
> /**
> * tipc_l2_rcv_msg - handle incoming TIPC message from an interface
> - * @buf: the received packet
> + * @skb: the received message
> * @dev: the net device that the packet was received on
> * @pt: the packet_type structure which was used to register this handler
> * @orig_dev: the original receive net device in case the device is a bond
> diff --git a/net/tipc/discover.c b/net/tipc/discover.c
> index bfe43da127c0..d4ecacddb40c 100644
> --- a/net/tipc/discover.c
> +++ b/net/tipc/discover.c
> @@ -74,7 +74,7 @@ struct tipc_discoverer {
> /**
> * tipc_disc_init_msg - initialize a link setup message
> * @net: the applicable net namespace
> - * @type: message type (request or response)
> + * @mtyp: message type (request or response)
> * @b: ptr to bearer issuing message
> */
> static void tipc_disc_init_msg(struct net *net, struct sk_buff *skb,
> @@ -339,7 +339,7 @@ static void tipc_disc_timeout(struct timer_list *t)
> * @net: the applicable net namespace
> * @b: ptr to bearer issuing requests
> * @dest: destination address for request messages
> - * @dest_domain: network domain to which links can be established
> + * @skb: pointer to created frame
> *
> * Returns 0 if successful, otherwise -errno.
> */
> @@ -393,7 +393,6 @@ void tipc_disc_delete(struct tipc_discoverer *d)
> * tipc_disc_reset - reset object to send periodic link setup requests
> * @net: the applicable net namespace
> * @b: ptr to bearer issuing requests
> - * @dest_domain: network domain to which links can be established
> */
> void tipc_disc_reset(struct net *net, struct tipc_bearer *b)
> {
> diff --git a/net/tipc/link.c b/net/tipc/link.c
> index 1c579357ccdf..6aca0ebb391a 100644
> --- a/net/tipc/link.c
> +++ b/net/tipc/link.c
> @@ -445,7 +445,7 @@ u32 tipc_link_state(struct tipc_link *l)
>
> /**
> * tipc_link_create - create a new link
> - * @n: pointer to associated node
> + * @net: pointer to associated network namespace
> * @if_name: associated interface name
> * @bearer_id: id (index) of associated bearer
> * @tolerance: link tolerance to be used by link
> @@ -530,7 +530,7 @@ bool tipc_link_create(struct net *net, char *if_name, int bearer_id,
>
> /**
> * tipc_link_bc_create - create new link to be used for broadcast
> - * @n: pointer to associated node
> + * @net: pointer to associated network namespace
> * @mtu: mtu to be used initially if no peers
> * @window: send window to be used
> * @inputq: queue to put messages ready for delivery
> @@ -974,7 +974,7 @@ void tipc_link_reset(struct tipc_link *l)
>
> /**
> * tipc_link_xmit(): enqueue buffer list according to queue situation
> - * @link: link to use
> + * @l: link to use
> * @list: chain of buffers containing message
> * @xmitq: returned list of packets to be sent by caller
> *
> diff --git a/net/tipc/msg.c b/net/tipc/msg.c
> index 01b64869a173..848fae674532 100644
> --- a/net/tipc/msg.c
> +++ b/net/tipc/msg.c
> @@ -202,7 +202,7 @@ int tipc_buf_append(struct sk_buff **headbuf, struct sk_buff **buf)
>
> /**
> * tipc_msg_append(): Append data to tail of an existing buffer queue
> - * @hdr: header to be used
> + * @_hdr: header to be used
> * @m: the data to be appended
> * @mss: max allowable size of buffer
> * @dlen: size of data to be appended
> diff --git a/net/tipc/node.c b/net/tipc/node.c
> index 030a51c4d1fa..4edcee3088da 100644
> --- a/net/tipc/node.c
> +++ b/net/tipc/node.c
> @@ -1515,7 +1515,7 @@ static void node_lost_contact(struct tipc_node *n,
> * tipc_node_get_linkname - get the name of a link
> *
> * @bearer_id: id of the bearer
> - * @node: peer node address
> + * @addr: peer node address
> * @linkname: link name output buffer
> *
> * Returns 0 on success
> @@ -2022,7 +2022,7 @@ static bool tipc_node_check_state(struct tipc_node *n, struct sk_buff *skb,
> * tipc_rcv - process TIPC packets/messages arriving from off-node
> * @net: the applicable net namespace
> * @skb: TIPC packet
> - * @bearer: pointer to bearer message arrived on
> + * @b: pointer to bearer message arrived on
> *
> * Invoked with no locks held. Bearer pointer must point to a valid bearer
> * structure (i.e. cannot be NULL), but bearer can be inactive.
> diff --git a/net/tipc/socket.c b/net/tipc/socket.c
> index a94f38333698..fc388cef6471 100644
> --- a/net/tipc/socket.c
> +++ b/net/tipc/socket.c
> @@ -711,7 +711,6 @@ static int tipc_bind(struct socket *sock, struct sockaddr *uaddr,
> * tipc_getname - get port ID of socket or peer socket
> * @sock: socket structure
> * @uaddr: area for returned socket address
> - * @uaddr_len: area for returned length of socket address
> * @peer: 0 = own ID, 1 = current peer ID, 2 = current/former peer ID
> *
> * Returns 0 on success, errno otherwise
> @@ -1053,7 +1052,7 @@ static int tipc_send_group_anycast(struct socket *sock, struct msghdr *m,
>
> /**
> * tipc_send_group_bcast - send message to all members in communication group
> - * @sk: socket structure
> + * @sock: socket structure
> * @m: message to send
> * @dlen: total length of message data
> * @timeout: timeout to wait for wakeup
> @@ -1673,7 +1672,7 @@ static void tipc_sk_finish_conn(struct tipc_sock *tsk, u32 peer_port,
> /**
> * tipc_sk_set_orig_addr - capture sender's address for received message
> * @m: descriptor for message info
> - * @hdr: received message header
> + * @skb: received message
> *
> * Note: Address is not captured if not requested by receiver.
> */
> @@ -2095,7 +2094,6 @@ static void tipc_write_space(struct sock *sk)
> /**
> * tipc_data_ready - wake up threads to indicate messages have been received
> * @sk: socket
> - * @len: the length of messages
> */
> static void tipc_data_ready(struct sock *sk)
> {
> @@ -2677,7 +2675,7 @@ static int tipc_wait_for_accept(struct socket *sock, long timeo)
> /**
> * tipc_accept - wait for connection request
> * @sock: listening socket
> - * @newsock: new socket that is to be connected
> + * @new_sock: new socket that is to be connected
> * @flags: file-related flags associated with socket
> *
> * Returns 0 on success, errno otherwise
> diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c
> index 28a283f26a8d..d91b7c543e39 100644
> --- a/net/tipc/udp_media.c
> +++ b/net/tipc/udp_media.c
> @@ -565,7 +565,7 @@ int tipc_udp_nl_add_bearer_data(struct tipc_nl_msg *msg, struct tipc_bearer *b)
>
> /**
> * tipc_parse_udp_addr - build udp media address from netlink data
> - * @nlattr: netlink attribute containing sockaddr storage aligned address
> + * @nla: netlink attribute containing sockaddr storage aligned address
> * @addr: tipc media address to fill with address, port and protocol type
> * @scope_id: IPv6 scope id pointer, not NULL indicates it's required
> */
Thanks, Andrew
Acked-by: Jon Maloy <jmaloy@redhat.com>
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH net-next 19/20] net: wireless: kerneldoc fixes
2020-07-12 23:14 [PATCH net-next 00/20] net simple kerneldoc fixes Andrew Lunn
` (17 preceding siblings ...)
2020-07-12 23:15 ` [PATCH net-next 18/20] net: tipc: " Andrew Lunn
@ 2020-07-12 23:15 ` Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 20/20] net: x25: " Andrew Lunn
2020-07-14 0:20 ` [PATCH net-next 00/20] net simple " David Miller
20 siblings, 0 replies; 26+ messages in thread
From: Andrew Lunn @ 2020-07-12 23:15 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Andrew Lunn, Johannes Berg
Simple fixes which require no deep knowledge of the code.
Cc: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
net/wireless/reg.c | 4 +++-
net/wireless/wext-compat.c | 1 -
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 0d74a31ef0ab..35b8847a2f6d 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2384,7 +2384,7 @@ static void reg_set_request_processed(void)
/**
* reg_process_hint_core - process core regulatory requests
- * @pending_request: a pending core regulatory request
+ * @core_request: a pending core regulatory request
*
* The wireless subsystem can use this function to process
* a regulatory request issued by the regulatory core.
@@ -2493,6 +2493,7 @@ __reg_process_hint_driver(struct regulatory_request *driver_request)
/**
* reg_process_hint_driver - process driver regulatory requests
+ * @wiphy: the wireless device for the regulatory request
* @driver_request: a pending driver regulatory request
*
* The wireless subsystem can use this function to process
@@ -2593,6 +2594,7 @@ __reg_process_hint_country_ie(struct wiphy *wiphy,
/**
* reg_process_hint_country_ie - process regulatory requests from country IEs
+ * @wiphy: the wireless device for the regulatory request
* @country_ie_request: a regulatory request from a country IE
*
* The wireless subsystem can use this function to process
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index cac9e28d852b..aa918d7ff6bd 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -220,7 +220,6 @@ EXPORT_WEXT_HANDLER(cfg80211_wext_giwrange);
/**
* cfg80211_wext_freq - get wext frequency for non-"auto"
- * @dev: the net device
* @freq: the wext freq encoding
*
* Returns a frequency, or a negative error code, or 0 for auto.
--
2.27.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next 20/20] net: x25: kerneldoc fixes
2020-07-12 23:14 [PATCH net-next 00/20] net simple kerneldoc fixes Andrew Lunn
` (18 preceding siblings ...)
2020-07-12 23:15 ` [PATCH net-next 19/20] net: wireless: " Andrew Lunn
@ 2020-07-12 23:15 ` Andrew Lunn
2020-07-14 0:20 ` [PATCH net-next 00/20] net simple " David Miller
20 siblings, 0 replies; 26+ messages in thread
From: Andrew Lunn @ 2020-07-12 23:15 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Andrew Lunn, Andrew Hendry
Simple fixes which require no deep knowledge of the code.
Cc: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
net/x25/x25_link.c | 2 +-
net/x25/x25_route.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/x25/x25_link.c b/net/x25/x25_link.c
index 7d02532aad0d..fdae054b7dc1 100644
--- a/net/x25/x25_link.c
+++ b/net/x25/x25_link.c
@@ -270,7 +270,7 @@ void x25_link_device_up(struct net_device *dev)
/**
* __x25_remove_neigh - remove neighbour from x25_neigh_list
- * @nb - neigh to remove
+ * @nb: - neigh to remove
*
* Remove neighbour from x25_neigh_list. If it was there.
* Caller must hold x25_neigh_list_lock.
diff --git a/net/x25/x25_route.c b/net/x25/x25_route.c
index b8e94d58d0f1..00e46c9a5280 100644
--- a/net/x25/x25_route.c
+++ b/net/x25/x25_route.c
@@ -142,7 +142,7 @@ struct net_device *x25_dev_get(char *devname)
/**
* x25_get_route - Find a route given an X.25 address.
- * @addr - address to find a route for
+ * @addr: - address to find a route for
*
* Find a route given an X.25 address.
*/
--
2.27.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH net-next 00/20] net simple kerneldoc fixes
2020-07-12 23:14 [PATCH net-next 00/20] net simple kerneldoc fixes Andrew Lunn
` (19 preceding siblings ...)
2020-07-12 23:15 ` [PATCH net-next 20/20] net: x25: " Andrew Lunn
@ 2020-07-14 0:20 ` David Miller
20 siblings, 0 replies; 26+ messages in thread
From: David Miller @ 2020-07-14 0:20 UTC (permalink / raw)
To: andrew; +Cc: netdev
From: Andrew Lunn <andrew@lunn.ch>
Date: Mon, 13 Jul 2020 01:14:56 +0200
> This is a collection of simple kerneldoc fixes. They are all low
> hanging fruit, were not real understanding of the code was needed.
Series applied, thanks Andrew.
^ permalink raw reply [flat|nested] 26+ messages in thread