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

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

[Gatis Peisenieks]

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.

Signed-off-by: Gatis Peisenieks <gatis@mikrotik.com>
---
 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

[Jakub Kicinski]

On Thu, 10 Feb 2022 10:12:01 +0200 Gatis Peisenieks 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.
> 
> Signed-off-by: Gatis Peisenieks <gatis@mikrotik.com>

Fixes: 057f4af2b171 ("atl1c: add 4 RX/TX queue support for Mikrotik 10/25G NIC")

?

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

[Gatis Peisenieks]

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 <gatis@mikrotik.com>
---
 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

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <kuba@kernel.org>:

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 <gatis@mikrotik.com>
> 
> [...]

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