From: Stefan Mätje Date: Wed, 18 Oct 2017 11:25:17 +0000 (+0200) Subject: can: esd_usb2: Fix can_dlc value for received RTR, frames X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=72d92e865d1560723e1957ee3f393688c49ca5bf;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git can: esd_usb2: Fix can_dlc value for received RTR, frames 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: 96d8e90382dc ("can: Add driver for esd CAN-USB/2 device") Signed-off-by: Stefan Mätje Cc: linux-stable Signed-off-by: Marc Kleine-Budde --- diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c index be928ce62d32..9fdb0f0bfa06 100644 --- a/drivers/net/can/usb/esd_usb2.c +++ b/drivers/net/can/usb/esd_usb2.c @@ -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;