Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / net / can / raw.c

diff --git a/net/can/raw.c b/net/can/raw.c
index 0703cba..6aa154e 100644 (file)
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -646,6 +646,9 @@ static int raw_sendmsg(struct kiocb *iocb, struct socket *sock,
                goto put_dev;
 
        err = memcpy_fromiovec(skb_put(skb, size), msg->msg_iov, size);
+       if (err < 0)
+               goto free_skb;
+       err = sock_tx_timestamp(msg, sk, skb_tx(skb));
        if (err < 0)
                goto free_skb;
        skb->dev = dev;