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

stm-at-esd · gregkh · commit 4d56587c28d4 · 2017-10-27T10:23:16.000+02:00
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: 96d8e90 ("can: Add driver for esd CAN-USB/2 device") Signed-off-by: Stefan Mätje <stefan.maetje@esd.eu> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ static void esd_usb2_rx_can_msg(struct esd_usb2_net_priv *priv,`
`333`	`333`	`}`
`334`	`334`
`335`	`335`	`cf->can_id = id & ESD_IDMASK;`
`336`		`- cf->can_dlc = get_can_dlc(msg->msg.rx.dlc);`
	`336`	`+ cf->can_dlc = get_can_dlc(msg->msg.rx.dlc & ~ESD_RTR);`
`337`	`337`
`338`	`338`	`if (id & ESD_EXTID)`
`339`	`339`	`cf->can_id \|= CAN_EFF_FLAG;`