summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-06-23 06:42:12 -0700
committerDavid S. Miller <davem@davemloft.net>2015-06-23 06:42:12 -0700
commit5b3f87dbc7faecbf4c97b4abbdf4cdc5bf070fd8 (patch)
tree997815cb0610d5af63978e7190084986af6482b9 /net
parent26c0a14f34fdcdcc82ac278a511fd86597e608e3 (diff)
parent36c01245eb8046c16eee6431e7dbfbb302635fa8 (diff)
downloadlinux-5b3f87dbc7faecbf4c97b4abbdf4cdc5bf070fd8.tar.gz
linux-5b3f87dbc7faecbf4c97b4abbdf4cdc5bf070fd8.tar.bz2
linux-5b3f87dbc7faecbf4c97b4abbdf4cdc5bf070fd8.zip
Merge tag 'linux-can-fixes-for-4.1-20150621' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says: ==================== Oliver Hartkopp fixed a bug in the generic CAN frame handling code, which may lead to loss of CAN frames. It was introduced during v4.1 development. ==================== Signed-off-by: David S. Miller <davem@davemloft.net> gpg: Signature made Sun 21 Jun 2015 09:59:36 AM PDT using RSA key ID C9B5CFC7
Diffstat (limited to 'net')
-rw-r--r--net/can/af_can.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c
index 32d710eaf1fc..689c818ed007 100644
--- 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++;