diff options
| author | Daniel Borkmann <dborkman@redhat.com> | 2013-04-14 12:08:13 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-14 23:41:49 +0400 |
| commit | bf84a01063eaab2f1a37d72d1b903445b3a25a4e (patch) | |
| tree | fea0862757422b93ee4f158bf2a6f855a605d5b9 /net/can/raw.c | |
| parent | 9d9f163c82c678f1efe6e7d40d8691dca08c3eab (diff) | |
| download | linux-bf84a01063eaab2f1a37d72d1b903445b3a25a4e.tar.xz | |
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/can/raw.c')
| -rw-r--r-- | net/can/raw.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/can/raw.c b/net/can/raw.c index c1764e41ddaf..1085e65f848e 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -711,9 +711,8 @@ static int raw_sendmsg(struct kiocb *iocb, struct socket *sock, err = memcpy_fromiovec(skb_put(skb, size), msg->msg_iov, size); if (err < 0) goto free_skb; - err = sock_tx_timestamp(sk, &skb_shinfo(skb)->tx_flags); - if (err < 0) - goto free_skb; + + sock_tx_timestamp(sk, &skb_shinfo(skb)->tx_flags); skb->dev = dev; skb->sk = sk; |