Skip to content

Commit 4c64b83

Browse files
grygoriySdavem330
authored andcommitted
net: ethernet: ti: cpsw: fix ASSERT_RTNL() warning during suspend
vlan_for_each() are required to be called with rtnl_lock taken, otherwise ASSERT_RTNL() warning will be triggered - which happens now during System resume from suspend: cpsw_suspend() |- cpsw_ndo_stop() |- __hw_addr_ref_unsync_dev() |- cpsw_purge_all_mc() |- vlan_for_each() |- ASSERT_RTNL(); Hence, fix it by surrounding cpsw_ndo_stop() by rtnl_lock/unlock() calls. Fixes: 15180ec ("net: ethernet: ti: cpsw: fix vlan mcast") Signed-off-by: Grygorii Strashko <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 0ddfee1 commit 4c64b83

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/net/ethernet/ti/cpsw.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1753,11 +1753,15 @@ static int cpsw_suspend(struct device *dev)
17531753
struct cpsw_common *cpsw = dev_get_drvdata(dev);
17541754
int i;
17551755

1756+
rtnl_lock();
1757+
17561758
for (i = 0; i < cpsw->data.slaves; i++)
17571759
if (cpsw->slaves[i].ndev)
17581760
if (netif_running(cpsw->slaves[i].ndev))
17591761
cpsw_ndo_stop(cpsw->slaves[i].ndev);
17601762

1763+
rtnl_unlock();
1764+
17611765
/* Select sleep pin state */
17621766
pinctrl_pm_select_sleep_state(dev);
17631767

0 commit comments

Comments
 (0)