diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-06-02 10:55:39 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-06-02 10:55:39 +1000 |
| commit | 8b6675c6f15fa62911dd3518fc6e8ba8acca3062 (patch) | |
| tree | 90f9b2d9226f75a31fcd48c3b67cb6079f3abf74 /include/net | |
| parent | 489fb4113f89b1e9c75a2296aa9a74aa3314d016 (diff) | |
| parent | 6312811be26f4a97fb36f53ffffafa5086833a28 (diff) | |
Merge remote-tracking branch 'jc_docs/docs-next'
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/sock.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index f33e3d134e0b..f97da141d920 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1953,11 +1953,10 @@ static inline bool sk_has_allocations(const struct sock *sk) * The purpose of the skwq_has_sleeper and sock_poll_wait is to wrap the memory * barrier call. They were added due to the race found within the tcp code. * - * Consider following tcp code paths: + * Consider following tcp code paths:: * - * CPU1 CPU2 - * - * sys_select receive packet + * CPU1 CPU2 + * sys_select receive packet * ... ... * __add_wait_queue update tp->rcv_nxt * ... ... @@ -2264,7 +2263,7 @@ void __sock_tx_timestamp(__u16 tsflags, __u8 *tx_flags); * @tsflags: timestamping flags to use * @tx_flags: completed with instructions for time stamping * - * Note : callers should take care of initial *tx_flags value (usually 0) + * Note: callers should take care of initial ``*tx_flags`` value (usually 0) */ static inline void sock_tx_timestamp(const struct sock *sk, __u16 tsflags, __u8 *tx_flags) |