]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: amd-xgbe: ensure to reset the tx_timer_active flag
authorRaju Rangoju <Raju.Rangoju@amd.com>
Thu, 27 Jan 2022 06:02:22 +0000 (11:32 +0530)
committerJakub Kicinski <kuba@kernel.org>
Fri, 28 Jan 2022 03:15:10 +0000 (19:15 -0800)
Ensure to reset the tx_timer_active flag in xgbe_stop(),
otherwise a port restart may result in tx timeout due to
uncleared flag.

Fixes: c635eaacbf77 ("amd-xgbe: Remove Tx coalescing")
Co-developed-by: Sudheesh Mavila <sudheesh.mavila@amd.com>
Signed-off-by: Sudheesh Mavila <sudheesh.mavila@amd.com>
Signed-off-by: Raju Rangoju <Raju.Rangoju@amd.com>
Acked-by: Tom Lendacky <thomas.lendacky@amd.com>
Link: https://lore.kernel.org/r/20220127060222.453371-1-Raju.Rangoju@amd.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/amd/xgbe/xgbe-drv.c

index ec3b287e3a718703508ef01565d886e22620c6e0..a3593290886f8cc61a0cc7c0f22da9be59402fe9 100644 (file)
@@ -721,7 +721,9 @@ static void xgbe_stop_timers(struct xgbe_prv_data *pdata)
                if (!channel->tx_ring)
                        break;
 
+               /* Deactivate the Tx timer */
                del_timer_sync(&channel->tx_timer);
+               channel->tx_timer_active = 0;
        }
 }