diff options
| author | Raju Rangoju <Raju.Rangoju@amd.com> | 2022-01-27 11:32:22 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-02-08 18:23:12 +0100 |
| commit | 6b90b8ff90d212da14d1fd0e58d96f677ecae0fe (patch) | |
| tree | c40814811f18843e91c52365e74eea4c06ac1b65 /drivers/net | |
| parent | 0ea863e2c9459ce62608a9ff28f8fec1380cfb6e (diff) | |
| download | linux-stable-6b90b8ff90d212da14d1fd0e58d96f677ecae0fe.tar.gz linux-stable-6b90b8ff90d212da14d1fd0e58d96f677ecae0fe.tar.bz2 linux-stable-6b90b8ff90d212da14d1fd0e58d96f677ecae0fe.zip | |
net: amd-xgbe: ensure to reset the tx_timer_active flag
commit 7674b7b559b683478c3832527c59bceb169e701d upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c index 80cf6af822f7..5949d30ee9a5 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c @@ -722,7 +722,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; } } |