[PATCH] net: stmmac: Fix ASSERT_RTNL() warning on suspend/resume

From: Loys Ollivier
Date: Tue Sep 17 2019 - 06:02:52 EST


rtnl_lock needs to be taken before calling phylink_start/stop to lock the
network stack.
Fix ASSERT_RTNL() warnings by protecting such calls with lock/unlock.

Fixes: 74371272f97f ("net: stmmac: Convert to phylink and remove phylib logic")
Signed-off-by: Loys Ollivier <lollivier@xxxxxxxxxxxx>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index fd54c7c87485..485f33f57b43 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -4451,7 +4451,9 @@ int stmmac_suspend(struct device *dev)
if (!ndev || !netif_running(ndev))
return 0;

+ rtnl_lock();
phylink_stop(priv->phylink);
+ rtnl_unlock();

mutex_lock(&priv->lock);

@@ -4560,7 +4562,9 @@ int stmmac_resume(struct device *dev)

mutex_unlock(&priv->lock);

+ rtnl_lock();
phylink_start(priv->phylink);
+ rtnl_unlock();

return 0;
}
--
2.7.4