diff options
| author |   Florian Fainelli <f.fainelli@gmail.com> | 2017-03-15 12:57:21 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-03-15 15:35:30 -0700 |
| commit | 5371bbf4b295eea334ed453efa286afa2c3ccff3 (patch) | |
| tree | 0f2189e0832d6db9d4b89096c0655f1ff6196edd /drivers | |
| parent | MAINTAINERS: remove MACVLAN and VLAN entries (diff) | |
| download | linux-dev-5371bbf4b295eea334ed453efa286afa2c3ccff3.tar.xz linux-dev-5371bbf4b295eea334ed453efa286afa2c3ccff3.zip | |
net: bcmgenet: Do not suspend PHY if Wake-on-LAN is enabled
Suspending the PHY would be putting it in a low power state where it
may no longer allow us to do Wake-on-LAN.
Fixes: cc013fb48898 ("net: bcmgenet: correctly suspend and resume PHY device")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/broadcom/genet/bcmgenet.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 69015fa50f20..365895ed3c3e 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -3481,7 +3481,8 @@ static int bcmgenet_suspend(struct device *d) bcmgenet_netif_stop(dev); - phy_suspend(priv->phydev); + if (!device_may_wakeup(d)) + phy_suspend(priv->phydev); netif_device_detach(dev); @@ -3578,7 +3579,8 @@ static int bcmgenet_resume(struct device *d) netif_device_attach(dev); - phy_resume(priv->phydev); + if (!device_may_wakeup(d)) + phy_resume(priv->phydev); if (priv->eee.eee_enabled) bcmgenet_eee_enable_set(dev, true); |