[PATCH net] atl1c: fix tx timeout after link flap on Mikrotik 10/25G NIC

Subsystems: atlx ethernet drivers, networking drivers, the rest

STALE1691d LANDED

Landed in mainline as bf8e59fd315f on 2022-02-11.

2 messages, 2 authors, 2022-02-11 · open the first message on its own page

[PATCH net] atl1c: fix tx timeout after link flap on Mikrotik 10/25G NIC

From: Gatis Peisenieks <hidden>
Date: 2022-02-11 06:52:28

If NIC had packets in tx queue at the moment link down event
happened, it could result in tx timeout when link got back up.

Since device has more than one tx queue we need to reset them
accordingly.

Fixes: 057f4af2b171 ("atl1c: add 4 RX/TX queue support for Mikrotik 10/25G NIC")
Signed-off-by: Gatis Peisenieks <redacted>
---
 drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index da595242bc13..f50604f3e541 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -900,7 +900,7 @@ static void atl1c_clean_tx_ring(struct atl1c_adapter *adapter,
 		atl1c_clean_buffer(pdev, buffer_info);
 	}
 
-	netdev_reset_queue(adapter->netdev);
+	netdev_tx_reset_queue(netdev_get_tx_queue(adapter->netdev, queue));
 
 	/* Zero out Tx-buffers */
 	memset(tpd_ring->desc, 0, sizeof(struct atl1c_tpd_desc) *
-- 
2.31.1

Re: [PATCH net] atl1c: fix tx timeout after link flap on Mikrotik 10/25G NIC

From: patchwork-bot+netdevbpf@kernel.org
Date: 2022-02-11 22:50:15

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski [off-list ref]:

On Fri, 11 Feb 2022 08:51:23 +0200 you wrote:
If NIC had packets in tx queue at the moment link down event
happened, it could result in tx timeout when link got back up.

Since device has more than one tx queue we need to reset them
accordingly.

Fixes: 057f4af2b171 ("atl1c: add 4 RX/TX queue support for Mikrotik 10/25G NIC")
Signed-off-by: Gatis Peisenieks <redacted>

[...]
Here is the summary with links:
  - [net] atl1c: fix tx timeout after link flap on Mikrotik 10/25G NIC
    https://git.kernel.org/netdev/net/c/bf8e59fd315f

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help