Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-block.git] / net / can / af_can.c

diff --git a/net/can/af_can.c b/net/can/af_can.c
index d4d404bdfc9a5d142ab18fa685aa62829d5e56c5..7933e62a7318915327c7f0a9a8ead8beada40a2e 100644 (file)
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -310,8 +310,12 @@ int can_send(struct sk_buff *skb, int loop)
                return err;
        }
 
-       if (newskb)
+       if (newskb) {
+               if (!(newskb->tstamp.tv64))
+                       __net_timestamp(newskb);
+
                netif_rx_ni(newskb);
+       }
 
        /* update statistics */
        can_stats.tx_frames++;