netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net 0/2] minor net kernel-doc fixes
@ 2017-07-12 16:29 Stephen Hemminger
  2017-07-12 16:29 ` [PATCH net 1/2] socket: add documentation for missing elements Stephen Hemminger
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Stephen Hemminger @ 2017-07-12 16:29 UTC (permalink / raw)
  To: davem; +Cc: netdev, linux-doc, Stephen Hemminger

Fix a couple of small errors in kernel-doc for networking

Stephen Hemminger (2):
  socket: add documentation for missing elements
  datagram: fix kernel-doc comments

 include/net/sock.h  | 3 +++
 net/core/datagram.c | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

-- 
2.11.0


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH net 1/2] socket: add documentation for missing elements
  2017-07-12 16:29 [PATCH net 0/2] minor net kernel-doc fixes Stephen Hemminger
@ 2017-07-12 16:29 ` Stephen Hemminger
  2017-07-12 16:29 ` [PATCH net 2/2] datagram: fix kernel-doc comments Stephen Hemminger
  2017-07-12 21:40 ` [PATCH net 0/2] minor net kernel-doc fixes David Miller
  2 siblings, 0 replies; 4+ messages in thread
From: Stephen Hemminger @ 2017-07-12 16:29 UTC (permalink / raw)
  To: davem; +Cc: netdev, linux-doc, Stephen Hemminger

Fill in missing kernel-doc for missing elements in struct sock.

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
 include/net/sock.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/net/sock.h b/include/net/sock.h
index 8c85791fc196..f69c8c2782df 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -246,6 +246,7 @@ struct sock_common {
   *	@sk_policy: flow policy
   *	@sk_receive_queue: incoming packets
   *	@sk_wmem_alloc: transmit queue bytes committed
+  *	@sk_tsq_flags: TCP Small Queues flags
   *	@sk_write_queue: Packet sending queue
   *	@sk_omem_alloc: "o" is "option" or "other"
   *	@sk_wmem_queued: persistent queue size
@@ -257,6 +258,7 @@ struct sock_common {
   *	@sk_pacing_status: Pacing status (requested, handled by sch_fq)
   *	@sk_max_pacing_rate: Maximum pacing rate (%SO_MAX_PACING_RATE)
   *	@sk_sndbuf: size of send buffer in bytes
+  *	@__sk_flags_offset: empty field used to determine location of bitfield
   *	@sk_padding: unused element for alignment
   *	@sk_no_check_tx: %SO_NO_CHECK setting, set checksum in TX packets
   *	@sk_no_check_rx: allow zero checksum in RX packets
@@ -277,6 +279,7 @@ struct sock_common {
   *	@sk_drops: raw/udp drops counter
   *	@sk_ack_backlog: current listen backlog
   *	@sk_max_ack_backlog: listen backlog set in listen()
+  *	@sk_uid: user id of owner
   *	@sk_priority: %SO_PRIORITY setting
   *	@sk_type: socket type (%SOCK_STREAM, etc)
   *	@sk_protocol: which protocol this socket belongs in this network family
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH net 2/2] datagram: fix kernel-doc comments
  2017-07-12 16:29 [PATCH net 0/2] minor net kernel-doc fixes Stephen Hemminger
  2017-07-12 16:29 ` [PATCH net 1/2] socket: add documentation for missing elements Stephen Hemminger
@ 2017-07-12 16:29 ` Stephen Hemminger
  2017-07-12 21:40 ` [PATCH net 0/2] minor net kernel-doc fixes David Miller
  2 siblings, 0 replies; 4+ messages in thread
From: Stephen Hemminger @ 2017-07-12 16:29 UTC (permalink / raw)
  To: davem; +Cc: netdev, linux-doc, Stephen Hemminger

An underscore in the kernel-doc comment section has special meaning
and mis-use generates an errors.

./net/core/datagram.c:207: ERROR: Unknown target name: "msg".
./net/core/datagram.c:379: ERROR: Unknown target name: "msg".
./net/core/datagram.c:816: ERROR: Unknown target name: "t".

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
 net/core/datagram.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/core/datagram.c b/net/core/datagram.c
index 6877c43cc92d..ee5647bd91b3 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -203,7 +203,7 @@ struct sk_buff *__skb_try_recv_from_queue(struct sock *sk,
 /**
  *	__skb_try_recv_datagram - Receive a datagram skbuff
  *	@sk: socket
- *	@flags: MSG_ flags
+ *	@flags: MSG\_ flags
  *	@destructor: invoked under the receive lock on successful dequeue
  *	@peeked: returns non-zero if this packet has been seen before
  *	@off: an offset in bytes to peek skb from. Returns an offset
@@ -375,7 +375,7 @@ EXPORT_SYMBOL(__sk_queue_drop_skb);
  *	skb_kill_datagram - Free a datagram skbuff forcibly
  *	@sk: socket
  *	@skb: datagram skbuff
- *	@flags: MSG_ flags
+ *	@flags: MSG\_ flags
  *
  *	This function frees a datagram skbuff that was received by
  *	skb_recv_datagram.  The flags argument must match the one
@@ -809,7 +809,7 @@ EXPORT_SYMBOL(skb_copy_and_csum_datagram_msg);
  *	sequenced packet sockets providing the socket receive queue
  *	is only ever holding data ready to receive.
  *
- *	Note: when you _don't_ use this routine for this protocol,
+ *	Note: when you *don't* use this routine for this protocol,
  *	and you use a different write policy from sock_writeable()
  *	then please supply your own write_space callback.
  */
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH net 0/2] minor net kernel-doc fixes
  2017-07-12 16:29 [PATCH net 0/2] minor net kernel-doc fixes Stephen Hemminger
  2017-07-12 16:29 ` [PATCH net 1/2] socket: add documentation for missing elements Stephen Hemminger
  2017-07-12 16:29 ` [PATCH net 2/2] datagram: fix kernel-doc comments Stephen Hemminger
@ 2017-07-12 21:40 ` David Miller
  2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2017-07-12 21:40 UTC (permalink / raw)
  To: stephen; +Cc: netdev, linux-doc, sthemmin

From: Stephen Hemminger <stephen@networkplumber.org>
Date: Wed, 12 Jul 2017 09:29:05 -0700

> Fix a couple of small errors in kernel-doc for networking

Series applied, thanks Stephen.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-07-12 21:40 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-12 16:29 [PATCH net 0/2] minor net kernel-doc fixes Stephen Hemminger
2017-07-12 16:29 ` [PATCH net 1/2] socket: add documentation for missing elements Stephen Hemminger
2017-07-12 16:29 ` [PATCH net 2/2] datagram: fix kernel-doc comments Stephen Hemminger
2017-07-12 21:40 ` [PATCH net 0/2] minor net kernel-doc fixes David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).