gianfar: Implement proper, per netdevice wakeup management

This patch implements wakeup management for the gianfar driver.

The driver should set wakeup enable if WOL is enabled, so that
phylib won't power off an attached PHY.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Anton Vorontsov 2009-02-01 00:52:34 -08:00 committed by David S. Miller
parent 09640e6365
commit 2884e5cc92
2 changed files with 6 additions and 0 deletions

View file

@ -463,6 +463,9 @@ static int gfar_probe(struct of_device *ofdev,
goto register_fail;
}
device_init_wakeup(&dev->dev,
priv->device_flags & FSL_GIANFAR_DEV_HAS_MAGIC_PACKET);
/* fill out IRQ number and name fields */
len_devname = strlen(dev->name);
strncpy(&priv->int_name_tx[0], dev->name, len_devname);
@ -1200,6 +1203,8 @@ static int gfar_enet_open(struct net_device *dev)
netif_start_queue(dev);
device_set_wakeup_enable(&dev->dev, priv->wol_en);
return err;
}

View file

@ -600,6 +600,7 @@ static int gfar_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
spin_lock_irqsave(&priv->bflock, flags);
priv->wol_en = wol->wolopts & WAKE_MAGIC ? 1 : 0;
device_set_wakeup_enable(&dev->dev, priv->wol_en);
spin_unlock_irqrestore(&priv->bflock, flags);
return 0;