diff options
author | Daniel Borkmann <dborkman@redhat.com> | 2013-04-14 04:08:13 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-04-14 15:41:49 -0400 |
commit | bf84a01063eaab2f1a37d72d1b903445b3a25a4e (patch) | |
tree | fea0862757422b93ee4f158bf2a6f855a605d5b9 /net/socket.c | |
parent | 9d9f163c82c678f1efe6e7d40d8691dca08c3eab (diff) |
net: sock: make sock_tx_timestamp void
Currently, sock_tx_timestamp() always returns 0. The comment that
describes the sock_tx_timestamp() function wrongly says that it
returns an error when an invalid argument is passed (from commit
20d4947353be, ``net: socket infrastructure for SO_TIMESTAMPING'').
Make the function void, so that we can also remove all the unneeded
if conditions that check for such a _non-existant_ error case in the
output path.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/socket.c')
-rw-r--r-- | net/socket.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/socket.c b/net/socket.c index 88f759adf3af..36883fea44f3 100644 --- a/net/socket.c +++ b/net/socket.c | |||
@@ -600,7 +600,7 @@ void sock_release(struct socket *sock) | |||
600 | } | 600 | } |
601 | EXPORT_SYMBOL(sock_release); | 601 | EXPORT_SYMBOL(sock_release); |
602 | 602 | ||
603 | int sock_tx_timestamp(struct sock *sk, __u8 *tx_flags) | 603 | void sock_tx_timestamp(struct sock *sk, __u8 *tx_flags) |
604 | { | 604 | { |
605 | *tx_flags = 0; | 605 | *tx_flags = 0; |
606 | if (sock_flag(sk, SOCK_TIMESTAMPING_TX_HARDWARE)) | 606 | if (sock_flag(sk, SOCK_TIMESTAMPING_TX_HARDWARE)) |
@@ -609,7 +609,6 @@ int sock_tx_timestamp(struct sock *sk, __u8 *tx_flags) | |||
609 | *tx_flags |= SKBTX_SW_TSTAMP; | 609 | *tx_flags |= SKBTX_SW_TSTAMP; |
610 | if (sock_flag(sk, SOCK_WIFI_STATUS)) | 610 | if (sock_flag(sk, SOCK_WIFI_STATUS)) |
611 | *tx_flags |= SKBTX_WIFI_STATUS; | 611 | *tx_flags |= SKBTX_WIFI_STATUS; |
612 | return 0; | ||
613 | } | 612 | } |
614 | EXPORT_SYMBOL(sock_tx_timestamp); | 613 | EXPORT_SYMBOL(sock_tx_timestamp); |
615 | 614 | ||