Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07b8a7cf authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-doc-fixes' 



Stephen Hemminger says:

====================
minor net kernel-doc fixes

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 57fe1479 d3f6cd9e

include/net/sock.h

+3 −0
Original line number Diff line number Diff line
@@ -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

net/core/datagram.c

+3 −3
Original line number Diff line number Diff line
@@ -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.

 */