From: Marc Kleine-Budde <mkl@pengutronix.de>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, linux-can@vger.kernel.org,
kernel@pengutronix.de, "Stefan Mätje" <Stefan.Maetje@esd.eu>,
"Stefan Mätje" <stefan.maetje@esd.eu>,
linux-stable <stable@vger.kernel.org>,
"Marc Kleine-Budde" <mkl@pengutronix.de>
Subject: [PATCH 10/11] can: esd_usb2: Fix can_dlc value for received RTR, frames
Date: Thu, 19 Oct 2017 13:19:44 +0200 [thread overview]
Message-ID: <20171019111945.13580-11-mkl@pengutronix.de> (raw)
In-Reply-To: <20171019111945.13580-1-mkl@pengutronix.de>
From: Stefan Mätje <Stefan.Maetje@esd.eu>
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 <stefan.maetje@esd.eu>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/usb/esd_usb2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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;
--
2.14.2
next prev parent reply other threads:[~2017-10-19 11:19 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-19 11:19 pull-request: can 2017-10-19 Marc Kleine-Budde
2017-10-19 11:19 ` [PATCH 01/11] can: flexcan: fix state transition regression Marc Kleine-Budde
2017-10-19 11:19 ` [PATCH 02/11] can: flexcan: rename legacy error state quirk Marc Kleine-Budde
2017-10-19 11:19 ` [PATCH 03/11] can: flexcan: implement error passive " Marc Kleine-Budde
2017-10-19 11:19 ` [PATCH 04/11] can: flexcan: fix i.MX6 state transition issue Marc Kleine-Budde
2017-10-19 11:19 ` [PATCH 05/11] can: flexcan: fix i.MX28 " Marc Kleine-Budde
2017-10-19 11:19 ` [PATCH 06/11] can: flexcan: fix p1010 " Marc Kleine-Budde
2017-10-19 11:19 ` [PATCH 07/11] can: bcm: check for null sk before deferencing it via the call to sock_net Marc Kleine-Budde
2017-10-19 11:19 ` [PATCH 08/11] can: af_can: do not access proto_tab directly use rcu_access_pointer instead Marc Kleine-Budde
2017-10-19 11:19 ` [PATCH 09/11] can: af_can: can_pernet_init(): add missing error handling for kzalloc returning NULL Marc Kleine-Budde
2017-10-19 11:19 ` Marc Kleine-Budde [this message]
2017-10-19 11:19 ` [PATCH 11/11] can: gs_usb: fix busy loop if no more TX context is available Marc Kleine-Budde
2017-10-21 1:30 ` pull-request: can 2017-10-19 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171019111945.13580-11-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=Stefan.Maetje@esd.eu \
--cc=davem@davemloft.net \
--cc=kernel@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).