Skip to content

Commit a94c689

Browse files
ffainellidavem330
authored andcommitted
net: dsa: Do not suspend/resume closed slave_dev
If a DSA slave network device was previously disabled, there is no need to suspend or resume it. Fixes: 2446254 ("net: dsa: allow switch drivers to implement suspend/resume hooks") Signed-off-by: Florian Fainelli <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent bc5b6c0 commit a94c689

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

net/dsa/slave.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,6 +1248,9 @@ int dsa_slave_suspend(struct net_device *slave_dev)
12481248
{
12491249
struct dsa_port *dp = dsa_slave_to_port(slave_dev);
12501250

1251+
if (!netif_running(slave_dev))
1252+
return 0;
1253+
12511254
netif_device_detach(slave_dev);
12521255

12531256
rtnl_lock();
@@ -1261,6 +1264,9 @@ int dsa_slave_resume(struct net_device *slave_dev)
12611264
{
12621265
struct dsa_port *dp = dsa_slave_to_port(slave_dev);
12631266

1267+
if (!netif_running(slave_dev))
1268+
return 0;
1269+
12641270
netif_device_attach(slave_dev);
12651271

12661272
rtnl_lock();

0 commit comments

Comments
 (0)