Commit 5adc1c54 authored Oct 31, 2018 by Marc Kleine-Budde Committed by Greg Kroah-Hartman Dec 01, 2018

can: dev: __can_get_echo_skb(): replace struct can_frame by canfd_frame to access frame length



commit 200f5c49f7a2cd694436bfc6cb0662b794c96736 upstream.

This patch replaces the use of "struct can_frame::can_dlc" by "struct
canfd_frame::len" to access the frame's length. As it is ensured that
both structures have a compatible memory layout for this member this is
no functional change. Futher, this compatibility is documented in a
comment.

Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 8bcd10db

drivers/net/can/dev.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -460,11 +460,14 @@ struct sk_buff __can_get_echo_skb(struct net_device dev, unsigned int idx, u8
		BUG_ON(idx >= priv->echo_skb_max);

		if (priv->echo_skb[idx]) {
		/* Using "struct canfd_frame::len" for the frame
		* length is supported on both CAN and CANFD frames.
		*/
		struct sk_buff *skb = priv->echo_skb[idx];
		struct can_frame cf = (struct can_frame )skb->data;
		u8 dlc = cf->can_dlc;
		struct canfd_frame cf = (struct canfd_frame )skb->data;
		u8 len = cf->len;

		*len_ptr = dlc;
		*len_ptr = len;
		priv->echo_skb[idx] = NULL;

		return skb;