Commit f172f4b8 authored by Randy Dunlap's avatar Randy Dunlap Committed by Jakub Kicinski

net/tipc: fix socket.c kernel-doc

Fix socket.c kernel-doc warnings in preparation for adding to the
networking docbook.

Also, for rcvbuf_limit(), use bullet notation so that the lines do
not run together.

../net/tipc/socket.c:130: warning: Function parameter or member 'cong_links' not described in 'tipc_sock'
../net/tipc/socket.c:130: warning: Function parameter or member 'probe_unacked' not described in 'tipc_sock'
../net/tipc/socket.c:130: warning: Function parameter or member 'snd_win' not described in 'tipc_sock'
../net/tipc/socket.c:130: warning: Function parameter or member 'peer_caps' not described in 'tipc_sock'
../net/tipc/socket.c:130: warning: Function parameter or member 'rcv_win' not described in 'tipc_sock'
../net/tipc/socket.c:130: warning: Function parameter or member 'group' not described in 'tipc_sock'
../net/tipc/socket.c:130: warning: Function parameter or member 'oneway' not described in 'tipc_sock'
../net/tipc/socket.c:130: warning: Function parameter or member 'nagle_start' not described in 'tipc_sock'
../net/tipc/socket.c:130: warning: Function parameter or member 'snd_backlog' not described in 'tipc_sock'
../net/tipc/socket.c:130: warning: Function parameter or member 'msg_acc' not described in 'tipc_sock'
../net/tipc/socket.c:130: warning: Function parameter or member 'pkt_cnt' not described in 'tipc_sock'
../net/tipc/socket.c:130: warning: Function parameter or member 'expect_ack' not described in 'tipc_sock'
../net/tipc/socket.c:130: warning: Function parameter or member 'nodelay' not described in 'tipc_sock'
../net/tipc/socket.c:130: warning: Function parameter or member 'group_is_open' not described in 'tipc_sock'
../net/tipc/socket.c:267: warning: Function parameter or member 'sk' not described in 'tsk_advance_rx_queue'
../net/tipc/socket.c:295: warning: Function parameter or member 'sk' not described in 'tsk_rej_rx_queue'
../net/tipc/socket.c:295: warning: Function parameter or member 'error' not described in 'tsk_rej_rx_queue'
../net/tipc/socket.c:894: warning: Function parameter or member 'tsk' not described in 'tipc_send_group_msg'
../net/tipc/socket.c:1187: warning: Function parameter or member 'net' not described in 'tipc_sk_mcast_rcv'
../net/tipc/socket.c:1323: warning: Function parameter or member 'inputq' not described in 'tipc_sk_conn_proto_rcv'
../net/tipc/socket.c:1323: warning: Function parameter or member 'xmitq' not described in 'tipc_sk_conn_proto_rcv'
../net/tipc/socket.c:1885: warning: Function parameter or member 'sock' not described in 'tipc_recvmsg'
../net/tipc/socket.c:1993: warning: Function parameter or member 'sock' not described in 'tipc_recvstream'
../net/tipc/socket.c:2313: warning: Function parameter or member 'xmitq' not described in 'tipc_sk_filter_rcv'
../net/tipc/socket.c:2404: warning: Function parameter or member 'xmitq' not described in 'tipc_sk_enqueue'
../net/tipc/socket.c:2456: warning: Function parameter or member 'net' not described in 'tipc_sk_rcv'
../net/tipc/socket.c:2693: warning: Function parameter or member 'kern' not described in 'tipc_accept'
../net/tipc/socket.c:3816: warning: Excess function parameter 'sysctl_tipc_sk_filter' description in 'tipc_sk_filtering'
Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 4476441e
...@@ -80,19 +80,32 @@ struct sockaddr_pair { ...@@ -80,19 +80,32 @@ struct sockaddr_pair {
* @maxnagle: maximum size of msg which can be subject to nagle * @maxnagle: maximum size of msg which can be subject to nagle
* @portid: unique port identity in TIPC socket hash table * @portid: unique port identity in TIPC socket hash table
* @phdr: preformatted message header used when sending messages * @phdr: preformatted message header used when sending messages
* #cong_links: list of congested links * @cong_links: list of congested links
* @publications: list of publications for port * @publications: list of publications for port
* @blocking_link: address of the congested link we are currently sleeping on * @blocking_link: address of the congested link we are currently sleeping on
* @pub_count: total # of publications port has made during its lifetime * @pub_count: total # of publications port has made during its lifetime
* @conn_timeout: the time we can wait for an unresponded setup request * @conn_timeout: the time we can wait for an unresponded setup request
* @probe_unacked: probe has not received ack yet
* @dupl_rcvcnt: number of bytes counted twice, in both backlog and rcv queue * @dupl_rcvcnt: number of bytes counted twice, in both backlog and rcv queue
* @cong_link_cnt: number of congested links * @cong_link_cnt: number of congested links
* @snt_unacked: # messages sent by socket, and not yet acked by peer * @snt_unacked: # messages sent by socket, and not yet acked by peer
* @snd_win: send window size
* @peer_caps: peer capabilities mask
* @rcv_unacked: # messages read by user, but not yet acked back to peer * @rcv_unacked: # messages read by user, but not yet acked back to peer
* @rcv_win: receive window size
* @peer: 'connected' peer for dgram/rdm * @peer: 'connected' peer for dgram/rdm
* @node: hash table node * @node: hash table node
* @mc_method: cookie for use between socket and broadcast layer * @mc_method: cookie for use between socket and broadcast layer
* @rcu: rcu struct for tipc_sock * @rcu: rcu struct for tipc_sock
* @group: TIPC communications group
* @oneway: message count in one direction (FIXME)
* @nagle_start: current nagle value
* @snd_backlog: send backlog count
* @msg_acc: messages accepted; used in managing backlog and nagle
* @pkt_cnt: TIPC socket packet count
* @expect_ack: whether this TIPC socket is expecting an ack
* @nodelay: setsockopt() TIPC_NODELAY setting
* @group_is_open: TIPC socket group is fully open (FIXME)
*/ */
struct tipc_sock { struct tipc_sock {
struct sock sk; struct sock sk;
...@@ -261,6 +274,7 @@ static void tsk_set_nagle(struct tipc_sock *tsk) ...@@ -261,6 +274,7 @@ static void tsk_set_nagle(struct tipc_sock *tsk)
/** /**
* tsk_advance_rx_queue - discard first buffer in socket receive queue * tsk_advance_rx_queue - discard first buffer in socket receive queue
* @sk: network socket
* *
* Caller must hold socket lock * Caller must hold socket lock
*/ */
...@@ -289,6 +303,8 @@ static void tipc_sk_respond(struct sock *sk, struct sk_buff *skb, int err) ...@@ -289,6 +303,8 @@ static void tipc_sk_respond(struct sock *sk, struct sk_buff *skb, int err)
/** /**
* tsk_rej_rx_queue - reject all buffers in socket receive queue * tsk_rej_rx_queue - reject all buffers in socket receive queue
* @sk: network socket
* @error: response error code
* *
* Caller must hold socket lock * Caller must hold socket lock
*/ */
...@@ -876,6 +892,7 @@ static int tipc_sendmcast(struct socket *sock, struct tipc_service_range *seq, ...@@ -876,6 +892,7 @@ static int tipc_sendmcast(struct socket *sock, struct tipc_service_range *seq,
/** /**
* tipc_send_group_msg - send a message to a member in the group * tipc_send_group_msg - send a message to a member in the group
* @net: network namespace * @net: network namespace
* @tsk: tipc socket
* @m: message to send * @m: message to send
* @mb: group member * @mb: group member
* @dnode: destination node * @dnode: destination node
...@@ -1171,6 +1188,7 @@ static int tipc_send_group_mcast(struct socket *sock, struct msghdr *m, ...@@ -1171,6 +1188,7 @@ static int tipc_send_group_mcast(struct socket *sock, struct msghdr *m,
/** /**
* tipc_sk_mcast_rcv - Deliver multicast messages to all destination sockets * tipc_sk_mcast_rcv - Deliver multicast messages to all destination sockets
* @net: the associated network namespace
* @arrvq: queue with arriving messages, to be cloned after destination lookup * @arrvq: queue with arriving messages, to be cloned after destination lookup
* @inputq: queue with cloned messages, delivered to socket after dest lookup * @inputq: queue with cloned messages, delivered to socket after dest lookup
* *
...@@ -1310,6 +1328,8 @@ static void tipc_sk_push_backlog(struct tipc_sock *tsk, bool nagle_ack) ...@@ -1310,6 +1328,8 @@ static void tipc_sk_push_backlog(struct tipc_sock *tsk, bool nagle_ack)
* tipc_sk_conn_proto_rcv - receive a connection mng protocol message * tipc_sk_conn_proto_rcv - receive a connection mng protocol message
* @tsk: receiving socket * @tsk: receiving socket
* @skb: pointer to message buffer. * @skb: pointer to message buffer.
* @inputq: buffer list containing the buffers
* @xmitq: output message area
*/ */
static void tipc_sk_conn_proto_rcv(struct tipc_sock *tsk, struct sk_buff *skb, static void tipc_sk_conn_proto_rcv(struct tipc_sock *tsk, struct sk_buff *skb,
struct sk_buff_head *inputq, struct sk_buff_head *inputq,
...@@ -1865,6 +1885,7 @@ static int tipc_wait_for_rcvmsg(struct socket *sock, long *timeop) ...@@ -1865,6 +1885,7 @@ static int tipc_wait_for_rcvmsg(struct socket *sock, long *timeop)
/** /**
* tipc_recvmsg - receive packet-oriented message * tipc_recvmsg - receive packet-oriented message
* @sock: network socket
* @m: descriptor for message info * @m: descriptor for message info
* @buflen: length of user buffer area * @buflen: length of user buffer area
* @flags: receive flags * @flags: receive flags
...@@ -1973,6 +1994,7 @@ static int tipc_recvmsg(struct socket *sock, struct msghdr *m, ...@@ -1973,6 +1994,7 @@ static int tipc_recvmsg(struct socket *sock, struct msghdr *m,
/** /**
* tipc_recvstream - receive stream-oriented data * tipc_recvstream - receive stream-oriented data
* @sock: network socket
* @m: descriptor for message info * @m: descriptor for message info
* @buflen: total size of user buffer area * @buflen: total size of user buffer area
* @flags: receive flags * @flags: receive flags
...@@ -2295,6 +2317,7 @@ static unsigned int rcvbuf_limit(struct sock *sk, struct sk_buff *skb) ...@@ -2295,6 +2317,7 @@ static unsigned int rcvbuf_limit(struct sock *sk, struct sk_buff *skb)
* tipc_sk_filter_rcv - validate incoming message * tipc_sk_filter_rcv - validate incoming message
* @sk: socket * @sk: socket
* @skb: pointer to message. * @skb: pointer to message.
* @xmitq: output message area (FIXME)
* *
* Enqueues message on receive queue if acceptable; optionally handles * Enqueues message on receive queue if acceptable; optionally handles
* disconnect indication for a connected socket. * disconnect indication for a connected socket.
...@@ -2390,6 +2413,7 @@ static int tipc_sk_backlog_rcv(struct sock *sk, struct sk_buff *skb) ...@@ -2390,6 +2413,7 @@ static int tipc_sk_backlog_rcv(struct sock *sk, struct sk_buff *skb)
* @inputq: list of incoming buffers with potentially different destinations * @inputq: list of incoming buffers with potentially different destinations
* @sk: socket where the buffers should be enqueued * @sk: socket where the buffers should be enqueued
* @dport: port number for the socket * @dport: port number for the socket
* @xmitq: output queue
* *
* Caller must hold socket lock * Caller must hold socket lock
*/ */
...@@ -2442,6 +2466,7 @@ static void tipc_sk_enqueue(struct sk_buff_head *inputq, struct sock *sk, ...@@ -2442,6 +2466,7 @@ static void tipc_sk_enqueue(struct sk_buff_head *inputq, struct sock *sk,
/** /**
* tipc_sk_rcv - handle a chain of incoming buffers * tipc_sk_rcv - handle a chain of incoming buffers
* @net: the associated network namespace
* @inputq: buffer list containing the buffers * @inputq: buffer list containing the buffers
* Consumes all buffers in list until inputq is empty * Consumes all buffers in list until inputq is empty
* Note: may be called in multiple threads referring to the same queue * Note: may be called in multiple threads referring to the same queue
...@@ -2679,6 +2704,7 @@ static int tipc_wait_for_accept(struct socket *sock, long timeo) ...@@ -2679,6 +2704,7 @@ static int tipc_wait_for_accept(struct socket *sock, long timeo)
* @sock: listening socket * @sock: listening socket
* @new_sock: new socket that is to be connected * @new_sock: new socket that is to be connected
* @flags: file-related flags associated with socket * @flags: file-related flags associated with socket
* @kern: caused by kernel or by userspace?
* *
* Returns 0 on success, errno otherwise * Returns 0 on success, errno otherwise
*/ */
...@@ -3799,7 +3825,8 @@ int tipc_nl_publ_dump(struct sk_buff *skb, struct netlink_callback *cb) ...@@ -3799,7 +3825,8 @@ int tipc_nl_publ_dump(struct sk_buff *skb, struct netlink_callback *cb)
/** /**
* tipc_sk_filtering - check if a socket should be traced * tipc_sk_filtering - check if a socket should be traced
* @sk: the socket to be examined * @sk: the socket to be examined
* @sysctl_tipc_sk_filter: the socket tuple for filtering: *
* @sysctl_tipc_sk_filter is used as the socket tuple for filtering:
* (portid, sock type, name type, name lower, name upper) * (portid, sock type, name type, name lower, name upper)
* *
* Returns true if the socket meets the socket tuple data * Returns true if the socket meets the socket tuple data
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment