diff options
| author | Sasha Levin <sasha.levin@oracle.com> | 2015-08-04 13:32:39 -0400 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-08-04 13:32:39 -0400 |
| commit | 79e215ad098a57b3bc1e82b6891d999ddfc77f73 (patch) | |
| tree | 356a3a6a28a32ef5f49ec45a852a2ee39f869dde /drivers/net/can | |
| parent | 22a6cbf9f36ee3ae2878efcbdde33e6ca00b9c4b (diff) | |
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 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/dev.c | 5 | ||||
| -rw-r--r-- | drivers/net/can/slcan.c | 1 | ||||
| -rw-r--r-- | drivers/net/can/vcan.c | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index bb686e15102c..573b53b38af4 100644 --- a/drivers/net/can/dev.c +++ b/drivers/net/can/dev.c @@ -360,9 +360,6 @@ unsigned int can_get_echo_skb(struct net_device *dev, unsigned int idx) struct can_frame *cf = (struct can_frame *)skb->data; u8 dlc = cf->can_dlc; - if (!(skb->tstamp.tv64)) - __net_timestamp(skb); - netif_rx(priv->echo_skb[idx]); priv->echo_skb[idx] = NULL; @@ -499,7 +496,6 @@ struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf) if (unlikely(!skb)) return NULL; - __net_timestamp(skb); skb->protocol = htons(ETH_P_CAN); skb->pkt_type = PACKET_BROADCAST; skb->ip_summed = CHECKSUM_UNNECESSARY; @@ -528,7 +524,6 @@ struct sk_buff *alloc_canfd_skb(struct net_device *dev, if (unlikely(!skb)) return NULL; - __net_timestamp(skb); skb->protocol = htons(ETH_P_CANFD); skb->pkt_type = PACKET_BROADCAST; skb->ip_summed = CHECKSUM_UNNECESSARY; diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c index cb6b4723af4a..acb5b92ace92 100644 --- a/drivers/net/can/slcan.c +++ b/drivers/net/can/slcan.c @@ -210,7 +210,6 @@ static void slc_bump(struct slcan *sl) if (!skb) return; - __net_timestamp(skb); skb->dev = sl->dev; skb->protocol = htons(ETH_P_CAN); skb->pkt_type = PACKET_BROADCAST; diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c index 30e4627a0c01..4e94057ef5cf 100644 --- a/drivers/net/can/vcan.c +++ b/drivers/net/can/vcan.c @@ -81,9 +81,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); } |