mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-07 22:08:33 -04:00
net: stmmac: delete software timer before disabling LPI
Delete the software timer to ensure that the timer doesn't fire while we are modifying the LPI register state, potentially re-enabling LPI. Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Link: https://patch.msgid.link/E1tffd3-003ZHV-6C@rmk-PC.armlinux.org.uk Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
committed by
Jakub Kicinski
parent
be258f654a
commit
a923378ab0
@@ -447,8 +447,8 @@ static void stmmac_try_to_start_sw_lpi(struct stmmac_priv *priv)
|
||||
*/
|
||||
static void stmmac_stop_sw_lpi(struct stmmac_priv *priv)
|
||||
{
|
||||
stmmac_reset_eee_mode(priv, priv->hw);
|
||||
del_timer_sync(&priv->eee_ctrl_timer);
|
||||
stmmac_reset_eee_mode(priv, priv->hw);
|
||||
priv->tx_path_in_lpi_mode = false;
|
||||
}
|
||||
|
||||
@@ -492,8 +492,8 @@ static void stmmac_eee_init(struct stmmac_priv *priv, bool active)
|
||||
if (priv->eee_enabled) {
|
||||
netdev_dbg(priv->dev, "disable EEE\n");
|
||||
priv->eee_sw_timer_en = false;
|
||||
stmmac_disable_hw_lpi_timer(priv);
|
||||
del_timer_sync(&priv->eee_ctrl_timer);
|
||||
stmmac_disable_hw_lpi_timer(priv);
|
||||
stmmac_set_eee_timer(priv, priv->hw, 0,
|
||||
STMMAC_DEFAULT_TWT_LS);
|
||||
if (priv->hw->xpcs)
|
||||
|
||||
Reference in New Issue
Block a user