Skip to content

Commit 07b8a7c

Browse files
committed
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: David S. Miller <[email protected]>
2 parents 57fe147 + d3f6cd9 commit 07b8a7c

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

include/net/sock.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ struct sock_common {
246246
* @sk_policy: flow policy
247247
* @sk_receive_queue: incoming packets
248248
* @sk_wmem_alloc: transmit queue bytes committed
249+
* @sk_tsq_flags: TCP Small Queues flags
249250
* @sk_write_queue: Packet sending queue
250251
* @sk_omem_alloc: "o" is "option" or "other"
251252
* @sk_wmem_queued: persistent queue size
@@ -257,6 +258,7 @@ struct sock_common {
257258
* @sk_pacing_status: Pacing status (requested, handled by sch_fq)
258259
* @sk_max_pacing_rate: Maximum pacing rate (%SO_MAX_PACING_RATE)
259260
* @sk_sndbuf: size of send buffer in bytes
261+
* @__sk_flags_offset: empty field used to determine location of bitfield
260262
* @sk_padding: unused element for alignment
261263
* @sk_no_check_tx: %SO_NO_CHECK setting, set checksum in TX packets
262264
* @sk_no_check_rx: allow zero checksum in RX packets
@@ -277,6 +279,7 @@ struct sock_common {
277279
* @sk_drops: raw/udp drops counter
278280
* @sk_ack_backlog: current listen backlog
279281
* @sk_max_ack_backlog: listen backlog set in listen()
282+
* @sk_uid: user id of owner
280283
* @sk_priority: %SO_PRIORITY setting
281284
* @sk_type: socket type (%SOCK_STREAM, etc)
282285
* @sk_protocol: which protocol this socket belongs in this network family

net/core/datagram.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ struct sk_buff *__skb_try_recv_from_queue(struct sock *sk,
203203
/**
204204
* __skb_try_recv_datagram - Receive a datagram skbuff
205205
* @sk: socket
206-
* @flags: MSG_ flags
206+
* @flags: MSG\_ flags
207207
* @destructor: invoked under the receive lock on successful dequeue
208208
* @peeked: returns non-zero if this packet has been seen before
209209
* @off: an offset in bytes to peek skb from. Returns an offset
@@ -375,7 +375,7 @@ EXPORT_SYMBOL(__sk_queue_drop_skb);
375375
* skb_kill_datagram - Free a datagram skbuff forcibly
376376
* @sk: socket
377377
* @skb: datagram skbuff
378-
* @flags: MSG_ flags
378+
* @flags: MSG\_ flags
379379
*
380380
* This function frees a datagram skbuff that was received by
381381
* skb_recv_datagram. The flags argument must match the one
@@ -809,7 +809,7 @@ EXPORT_SYMBOL(skb_copy_and_csum_datagram_msg);
809809
* sequenced packet sockets providing the socket receive queue
810810
* is only ever holding data ready to receive.
811811
*
812-
* Note: when you _don't_ use this routine for this protocol,
812+
* Note: when you *don't* use this routine for this protocol,
813813
* and you use a different write policy from sock_writeable()
814814
* then please supply your own write_space callback.
815815
*/

0 commit comments

Comments
 (0)