diff options
| author | Daniel Borkmann | 2013-04-14 10:08:13 +0200 |
|---|---|---|
| committer | David S. Miller | 2013-04-14 21:41:49 +0200 |
| commit | bf84a01063eaab2f1a37d72d1b903445b3a25a4e (patch) | |
| tree | fea0862757422b93ee4f158bf2a6f855a605d5b9 /include/net | |
| parent | vxlan: use htonl when snooping for loopback address (diff) | |
| download | kernel-qcow2-linux-bf84a01063eaab2f1a37d72d1b903445b3a25a4e.tar.gz kernel-qcow2-linux-bf84a01063eaab2f1a37d72d1b903445b3a25a4e.tar.xz kernel-qcow2-linux-bf84a01063eaab2f1a37d72d1b903445b3a25a4e.zip | |
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')
| -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, * @sk: socket sending this packet * @tx_flags: filled with instructions for time stamping * - * Currently only depends on SOCK_TIMESTAMPING* flags. Returns error code if - * parameters are invalid. + * Currently only depends on SOCK_TIMESTAMPING* flags. */ -extern int sock_tx_timestamp(struct sock *sk, __u8 *tx_flags); +extern void sock_tx_timestamp(struct sock *sk, __u8 *tx_flags); /** * sk_eat_skb - Release a skb if it is no longer needed |