Commit 1aa222b3 authored Jul 31, 2018 by Florian Fainelli Committed by Greg Kroah-Hartman Aug 09, 2018

net: dsa: Do not suspend/resume closed slave_dev



[ Upstream commit a94c689e6c9e72e722f28339e12dff191ee5a265 ]

If a DSA slave network device was previously disabled, there is no need
to suspend or resume it.

Fixes: 24462549 ("net: dsa: allow switch drivers to implement suspend/resume hooks")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 95478b56

net/dsa/slave.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -503,6 +503,9 @@ int dsa_slave_suspend(struct net_device *slave_dev)
		{
		struct dsa_slave_priv *p = netdev_priv(slave_dev);

		if (!netif_running(slave_dev))
		return 0;

		netif_device_detach(slave_dev);

		if (p->phy) {
		@@ -520,6 +523,9 @@ int dsa_slave_resume(struct net_device *slave_dev)
		{
		struct dsa_slave_priv *p = netdev_priv(slave_dev);

		if (!netif_running(slave_dev))
		return 0;

		netif_device_attach(slave_dev);

		if (p->phy) {