diff options
| author | Daniel Borkmann <dborkman@redhat.com> | 2013-04-14 08:08:13 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-14 15:41:49 -0400 |
| commit | bf84a01063eaab2f1a37d72d1b903445b3a25a4e (patch) | |
| tree | fea0862757422b93ee4f158bf2a6f855a605d5b9 /net/ipv4/udp.c | |
| parent | 9d9f163c82c678f1efe6e7d40d8691dca08c3eab (diff) | |
| download | linux-bf84a01063eaab2f1a37d72d1b903445b3a25a4e.tar.bz2 | |
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/ipv4/udp.c')
| -rw-r--r-- | net/ipv4/udp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 7117d1467b02..2722db024a0b 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -902,9 +902,9 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, ipc.addr = inet->inet_saddr; ipc.oif = sk->sk_bound_dev_if; - err = sock_tx_timestamp(sk, &ipc.tx_flags); - if (err) - return err; + + sock_tx_timestamp(sk, &ipc.tx_flags); + if (msg->msg_controllen) { err = ip_cmsg_send(sock_net(sk), msg, &ipc); if (err) |