diff options
author | Sasha Levin <sasha.levin@oracle.com> | 2015-08-04 20:32:39 +0300 |
---|---|---|
committer | Sasha Levin <sasha.levin@oracle.com> | 2015-08-04 20:32:39 +0300 |
commit | 79e215ad098a57b3bc1e82b6891d999ddfc77f73 (patch) | |
tree | 356a3a6a28a32ef5f49ec45a852a2ee39f869dde /net | |
parent | 22a6cbf9f36ee3ae2878efcbdde33e6ca00b9c4b (diff) | |
download | linux-79e215ad098a57b3bc1e82b6891d999ddfc77f73.tar.xz |
Revert "can: fix loss of CAN frames in raw_rcv"
This reverts commit c215cf258214858a5a6c3e63cd7ee78b92d210b2.
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/can/af_can.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c index 9a3244941a5c..d6030d6949df 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -313,12 +313,8 @@ int can_send(struct sk_buff *skb, int loop) return err; } - if (newskb) { - if (!(newskb->tstamp.tv64)) - __net_timestamp(newskb); - + if (newskb) netif_rx_ni(newskb); - } /* update statistics */ can_stats.tx_frames++; |