* pull-request: can 2021-08-26
@ 2021-08-26 6:44 Marc Kleine-Budde
2021-08-26 6:44 ` [PATCH net] can: usb: esd_usb2: esd_usb2_rx_event(): fix the interchange of the CAN RX and TX error counters Marc Kleine-Budde
2021-08-26 8:50 ` pull-request: can 2021-08-26 patchwork-bot+netdevbpf
0 siblings, 2 replies; 4+ messages in thread
From: Marc Kleine-Budde @ 2021-08-26 6:44 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, linux-can, kernel
Hello Jakub, hello David,
this is a pull request of a single patch for net/master.
Stefan Mätje's patch fixes the interchange of RX and TX error counters
inthe esd_usb2 CAN driver.
regards,
Marc
---
The following changes since commit ec92e524ee91c98e6ee06807c7d69d9e2fd141bc:
net: usb: asix: ax88772: fix boolconv.cocci warnings (2021-08-25 16:35:51 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git tags/linux-can-fixes-for-5.14-20210826
for you to fetch changes up to 044012b52029204900af9e4230263418427f4ba4:
can: usb: esd_usb2: esd_usb2_rx_event(): fix the interchange of the CAN RX and TX error counters (2021-08-26 08:37:13 +0200)
----------------------------------------------------------------
linux-can-fixes-for-5.14-20210826
----------------------------------------------------------------
Stefan Mätje (1):
can: usb: esd_usb2: esd_usb2_rx_event(): fix the interchange of the CAN RX and TX error counters
drivers/net/can/usb/esd_usb2.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH net] can: usb: esd_usb2: esd_usb2_rx_event(): fix the interchange of the CAN RX and TX error counters
2021-08-26 6:44 pull-request: can 2021-08-26 Marc Kleine-Budde
@ 2021-08-26 6:44 ` Marc Kleine-Budde
2021-08-26 8:50 ` patchwork-bot+netdevbpf
2021-08-26 8:50 ` pull-request: can 2021-08-26 patchwork-bot+netdevbpf
1 sibling, 1 reply; 4+ messages in thread
From: Marc Kleine-Budde @ 2021-08-26 6:44 UTC (permalink / raw)
To: netdev
Cc: davem, kuba, linux-can, kernel, Stefan Mätje, stable,
Marc Kleine-Budde
From: Stefan Mätje <stefan.maetje@esd.eu>
This patch fixes the interchanged fetch of the CAN RX and TX error
counters from the ESD_EV_CAN_ERROR_EXT message. The RX error counter
is really in struct rx_msg::data[2] and the TX error counter is in
struct rx_msg::data[3].
Fixes: 96d8e90382dc ("can: Add driver for esd CAN-USB/2 device")
Link: https://lore.kernel.org/r/20210825215227.4947-2-stefan.maetje@esd.eu
Cc: stable@vger.kernel.org
Signed-off-by: Stefan Mätje <stefan.maetje@esd.eu>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/usb/esd_usb2.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c
index 66fa8b07c2e6..95ae740fc311 100644
--- a/drivers/net/can/usb/esd_usb2.c
+++ b/drivers/net/can/usb/esd_usb2.c
@@ -224,8 +224,8 @@ static void esd_usb2_rx_event(struct esd_usb2_net_priv *priv,
if (id == ESD_EV_CAN_ERROR_EXT) {
u8 state = msg->msg.rx.data[0];
u8 ecc = msg->msg.rx.data[1];
- u8 txerr = msg->msg.rx.data[2];
- u8 rxerr = msg->msg.rx.data[3];
+ u8 rxerr = msg->msg.rx.data[2];
+ u8 txerr = msg->msg.rx.data[3];
skb = alloc_can_err_skb(priv->netdev, &cf);
if (skb == NULL) {
base-commit: ec92e524ee91c98e6ee06807c7d69d9e2fd141bc
--
2.32.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net] can: usb: esd_usb2: esd_usb2_rx_event(): fix the interchange of the CAN RX and TX error counters
2021-08-26 6:44 ` [PATCH net] can: usb: esd_usb2: esd_usb2_rx_event(): fix the interchange of the CAN RX and TX error counters Marc Kleine-Budde
@ 2021-08-26 8:50 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-08-26 8:50 UTC (permalink / raw)
To: Marc Kleine-Budde
Cc: netdev, davem, kuba, linux-can, kernel, stefan.maetje, stable
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
On Thu, 26 Aug 2021 08:44:56 +0200 you wrote:
> From: Stefan Mätje <stefan.maetje@esd.eu>
>
> This patch fixes the interchanged fetch of the CAN RX and TX error
> counters from the ESD_EV_CAN_ERROR_EXT message. The RX error counter
> is really in struct rx_msg::data[2] and the TX error counter is in
> struct rx_msg::data[3].
>
> [...]
Here is the summary with links:
- [net] can: usb: esd_usb2: esd_usb2_rx_event(): fix the interchange of the CAN RX and TX error counters
https://git.kernel.org/netdev/net/c/044012b52029
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: pull-request: can 2021-08-26
2021-08-26 6:44 pull-request: can 2021-08-26 Marc Kleine-Budde
2021-08-26 6:44 ` [PATCH net] can: usb: esd_usb2: esd_usb2_rx_event(): fix the interchange of the CAN RX and TX error counters Marc Kleine-Budde
@ 2021-08-26 8:50 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-08-26 8:50 UTC (permalink / raw)
To: Marc Kleine-Budde; +Cc: netdev, davem, kuba, linux-can, kernel
Hello:
This pull request was applied to netdev/net.git (refs/heads/master):
On Thu, 26 Aug 2021 08:44:55 +0200 you wrote:
> Hello Jakub, hello David,
>
> this is a pull request of a single patch for net/master.
>
> Stefan Mätje's patch fixes the interchange of RX and TX error counters
> inthe esd_usb2 CAN driver.
>
> [...]
Here is the summary with links:
- pull-request: can 2021-08-26
https://git.kernel.org/netdev/net/c/92ea47fe09b5
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-08-26 8:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-26 6:44 pull-request: can 2021-08-26 Marc Kleine-Budde
2021-08-26 6:44 ` [PATCH net] can: usb: esd_usb2: esd_usb2_rx_event(): fix the interchange of the CAN RX and TX error counters Marc Kleine-Budde
2021-08-26 8:50 ` patchwork-bot+netdevbpf
2021-08-26 8:50 ` pull-request: can 2021-08-26 patchwork-bot+netdevbpf
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).