summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Vorontsov <avorontsov@ru.mvista.com>2009-01-29 17:31:13 -0800
committerDavid S. Miller <davem@davemloft.net>2009-01-29 17:31:13 -0800
commite5664bb2a7fd8ae1bee1281c2e44653c471af9ca (patch)
tree6e68cc3e7bf7f757b7b80a7933f297bd1e357afb
parentf307dbd88d82c4ccab7aec49613c366023b89cde (diff)
downloadlinux-3.10-e5664bb2a7fd8ae1bee1281c2e44653c471af9ca.tar.gz
linux-3.10-e5664bb2a7fd8ae1bee1281c2e44653c471af9ca.tar.bz2
linux-3.10-e5664bb2a7fd8ae1bee1281c2e44653c471af9ca.zip
gianfar: Fix Wake-on-LAN support
commit 0f0ca340e57bd7446855fefd07a64249acf81223 ("phy: power management support") caused a regression in the gianfar driver. Now phylib turns off PHY power during suspend, and thus WOL doesn't work anymore. This patch workarounds the issue by enabling wakeup in the MDIO device, i.e. just restores the old behaviour for the gianfar driver. Note that this way all PHYs on a given MDIO bus won't be turned off during suspend, which isn't good from the power saving point of view. A proper, per netdevice wakeup management support will need a bit reworked phylib suspend/resume logic. Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/gianfar_mii.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/gianfar_mii.c b/drivers/net/gianfar_mii.c
index f3706e415b4..f49a426ad68 100644
--- a/drivers/net/gianfar_mii.c
+++ b/drivers/net/gianfar_mii.c
@@ -234,6 +234,8 @@ static int gfar_mdio_probe(struct of_device *ofdev,
if (NULL == new_bus)
return -ENOMEM;
+ device_init_wakeup(&ofdev->dev, 1);
+
new_bus->name = "Gianfar MII Bus",
new_bus->read = &gfar_mdio_read,
new_bus->write = &gfar_mdio_write,