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

Commit 5b3f87db authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-fixes-for-4.1-20150621' of... 

Merge tag 'linux-can-fixes-for-4.1-20150621' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can



Marc Kleine-Budde says:

====================
Oliver Hartkopp fixed a bug in the generic CAN frame handling code, which may
lead to loss of CAN frames. It was introduced during v4.1 development.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
 gpg: Signature made Sun 21 Jun 2015 09:59:36 AM PDT using RSA key ID C9B5CFC7
parents 26c0a14f 36c01245

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++;