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

Commit 587d7faf authored by Stefan Mätje's avatar Stefan Mätje Committed by Greg Kroah-Hartman
Browse files

can: esd_usb2: Fix can_dlc value for received RTR, frames 



commit 72d92e865d1560723e1957ee3f393688c49ca5bf upstream.

The dlc member of the struct rx_msg contains also the ESD_RTR flag to
mark received RTR frames. Without the fix the can_dlc value for received
RTR frames would always be set to 8 by get_can_dlc() instead of the
received value.

Fixes: 96d8e903 ("can: Add driver for esd CAN-USB/2 device")
Signed-off-by: default avatarStefan Mätje <stefan.maetje@esd.eu>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dc1858a8

drivers/net/can/usb/esd_usb2.c

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ static void esd_usb2_rx_can_msg(struct esd_usb2_net_priv *priv, 
		}



		cf->can_id = id & ESD_IDMASK;

		cf->can_dlc = get_can_dlc(msg->msg.rx.dlc);

		cf->can_dlc = get_can_dlc(msg->msg.rx.dlc & ~ESD_RTR);



		if (id & ESD_EXTID)

			cf->can_id |= CAN_EFF_FLAG;