]> www.infradead.org Git - users/hch/misc.git/commitdiff
net: stmmac: check priv->eee_sw_timer_en in suspend path
authorRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Mon, 13 Jan 2025 11:45:55 +0000 (11:45 +0000)
committerJakub Kicinski <kuba@kernel.org>
Wed, 15 Jan 2025 02:22:04 +0000 (18:22 -0800)
The suspend path uses priv->eee_enabled when cleaning up the software
timed LPI mode. Use priv->eee_sw_timer_en instead so we're consistently
using a single control for software-based timer handling.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1tXItH-000MBC-8i@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

index e8667848e0ee6315f465d63864fb686dd325a544..26ff1ded4e3dbfbedd16764cf9ca3e932c053c48 100644 (file)
@@ -7719,7 +7719,7 @@ int stmmac_suspend(struct device *dev)
        for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)
                hrtimer_cancel(&priv->dma_conf.tx_queue[chan].txtimer);
 
-       if (priv->eee_enabled) {
+       if (priv->eee_sw_timer_en) {
                priv->tx_path_in_lpi_mode = false;
                del_timer_sync(&priv->eee_ctrl_timer);
        }