diff options
| author | David S. Miller <davem@davemloft.net> | 2015-07-12 22:24:01 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-12 22:24:01 -0700 |
| commit | cee9f6d0186a586c8023bc91c8a4cf8a088855e5 (patch) | |
| tree | 70847d330cb2c34515f5fa0b7128a2af6b188783 /drivers/net/can/vcan.c | |
| parent | 76b63da9666fb3fa786ff76a50d29abbe3d706b8 (diff) | |
| parent | d3b58c47d330de8c29898fe9746f7530408f8a59 (diff) | |
Merge tag 'linux-can-fixes-for-4.2-20150712' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2015-07-12
this is a pull request of 8 patchs for net/master.
Sergei Shtylyov contributes 5 patches for the rcar_can driver, fixing the IRQ
check and several info and error messages. There are two patches by J.D.
Schroeder and Roger Quadros for the c_can driver and dra7x-evm device tree,
which precent a glitch in the DCAN1 pinmux. Oliver Hartkopp provides a better
approach to make the CAN skbs unique, the timestamp is replaced by a counter.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/vcan.c')
| -rw-r--r-- | drivers/net/can/vcan.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c index 0ce868de855d..674f367087c5 100644 --- a/drivers/net/can/vcan.c +++ b/drivers/net/can/vcan.c @@ -78,9 +78,6 @@ static void vcan_rx(struct sk_buff *skb, struct net_device *dev) skb->dev = dev; skb->ip_summed = CHECKSUM_UNNECESSARY; - if (!(skb->tstamp.tv64)) - __net_timestamp(skb); - netif_rx_ni(skb); } |