| From foo@baz Sat Aug 4 09:10:30 CEST 2018 |
| From: Florian Fainelli <f.fainelli@gmail.com> |
| Date: Tue, 31 Jul 2018 17:12:52 -0700 |
| Subject: net: dsa: Do not suspend/resume closed slave_dev |
| |
| From: Florian Fainelli <f.fainelli@gmail.com> |
| |
| [ Upstream commit a94c689e6c9e72e722f28339e12dff191ee5a265 ] |
| |
| If a DSA slave network device was previously disabled, there is no need |
| to suspend or resume it. |
| |
| Fixes: 2446254915a7 ("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> |
| --- |
| net/dsa/slave.c | 6 ++++++ |
| 1 file changed, 6 insertions(+) |
| |
| --- a/net/dsa/slave.c |
| +++ b/net/dsa/slave.c |
| @@ -1219,6 +1219,9 @@ int dsa_slave_suspend(struct net_device |
| { |
| struct dsa_slave_priv *p = netdev_priv(slave_dev); |
| |
| + if (!netif_running(slave_dev)) |
| + return 0; |
| + |
| netif_device_detach(slave_dev); |
| |
| if (p->phy) { |
| @@ -1236,6 +1239,9 @@ int dsa_slave_resume(struct net_device * |
| { |
| struct dsa_slave_priv *p = netdev_priv(slave_dev); |
| |
| + if (!netif_running(slave_dev)) |
| + return 0; |
| + |
| netif_device_attach(slave_dev); |
| |
| if (p->phy) { |
