Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79e215ad authored by Sasha Levin's avatar Sasha Levin
Browse files

Revert "can: fix loss of CAN frames in raw_rcv" 



This reverts commit c215cf25.

Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 22a6cbf9

drivers/net/can/dev.c

+0 −5
Original line number Diff line number Diff line
@@ -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;

drivers/net/can/slcan.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/can/vcan.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

}

net/can/af_can.c

+1 −5
Original line number Diff line number Diff line
@@ -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++;