diff options
author | Andrew Lutomirski <luto@amacapital.net> | 2014-03-05 02:24:10 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-03-06 22:18:01 +0100 |
commit | adca4767821e54c72d4a2f467af77923f2c87e07 (patch) | |
tree | 3e7991d42d84176a64aa1f42b1fe674f64eb560d /include | |
parent | phy: fix compiler array bounds warning on settings[] (diff) | |
download | linux-adca4767821e54c72d4a2f467af77923f2c87e07.tar.xz linux-adca4767821e54c72d4a2f467af77923f2c87e07.zip |
net: Improve SO_TIMESTAMPING documentation and fix a minor code bug
The original documentation was very unclear.
The code fix is presumably related to the formerly unclear
documentation: SOCK_TIMESTAMPING_RX_SOFTWARE has no effect on
__sock_recv_timestamp's behavior, so calling __sock_recv_ts_and_drops
from sock_recv_ts_and_drops if only SOCK_TIMESTAMPING_RX_SOFTWARE is
set is pointless. This should have no user-observable effect.
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/net/sock.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 5c3f7c3624aa..7c4167bc8266 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -2186,7 +2186,6 @@ static inline void sock_recv_ts_and_drops(struct msghdr *msg, struct sock *sk, { #define FLAGS_TS_OR_DROPS ((1UL << SOCK_RXQ_OVFL) | \ (1UL << SOCK_RCVTSTAMP) | \ - (1UL << SOCK_TIMESTAMPING_RX_SOFTWARE) | \ (1UL << SOCK_TIMESTAMPING_SOFTWARE) | \ (1UL << SOCK_TIMESTAMPING_RAW_HARDWARE) | \ (1UL << SOCK_TIMESTAMPING_SYS_HARDWARE)) |