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 /include/net/sock.h | |
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 'include/net/sock.h')
-rw-r--r-- | include/net/sock.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 08f05f964737..5c97b0fc5623 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -2159,10 +2159,9 @@ static inline void sock_recv_ts_and_drops(struct msghdr *msg, struct sock *sk, | |||
2159 | * @sk: socket sending this packet | 2159 | * @sk: socket sending this packet |
2160 | * @tx_flags: filled with instructions for time stamping | 2160 | * @tx_flags: filled with instructions for time stamping |
2161 | * | 2161 | * |
2162 | * Currently only depends on SOCK_TIMESTAMPING* flags. Returns error code if | 2162 | * Currently only depends on SOCK_TIMESTAMPING* flags. |
2163 | * parameters are invalid. | ||
2164 | */ | 2163 | */ |
2165 | extern int sock_tx_timestamp(struct sock *sk, __u8 *tx_flags); | 2164 | extern void sock_tx_timestamp(struct sock *sk, __u8 *tx_flags); |
2166 | 2165 | ||
2167 | /** | 2166 | /** |
2168 | * sk_eat_skb - Release a skb if it is no longer needed | 2167 | * sk_eat_skb - Release a skb if it is no longer needed |