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

Commit 36c01245 authored by Oliver Hartkopp's avatar Oliver Hartkopp Committed by Marc Kleine-Budde
Browse files

can: fix loss of CAN frames in raw_rcv 

As reported by Manfred Schlaegl here

   http://marc.info/?l=linux-netdev&m=143482089824232&w=2



commit 514ac99c "can: fix multiple delivery of a single CAN frame for
overlapping CAN filters" requires the skb->tstamp to be set to check for
identical CAN skbs.

As net timestamping is influenced by several players (netstamp_needed and
netdev_tstamp_prequeue) Manfred missed a proper timestamp which leads to
CAN frame loss.

As skb timestamping became now mandatory for CAN related skbs this patch
makes sure that received CAN skbs always have a proper timestamp set.
Maybe there's a better solution in the future but this patch fixes the
CAN frame loss so far.

Reported-by: default avatarManfred Schlaegl <manfred.schlaegl@gmx.at>
Signed-off-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 7b48f457

drivers/net/can/dev.c

+5 −0
Original line number Diff line number Diff line
@@ -440,6 +440,9 @@ 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;
@@ -575,6 +578,7 @@ 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;
@@ -603,6 +607,7 @@ 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

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

+3 −0
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ 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

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