Skip to content

Commit

Permalink
gianfar: Implement proper, per netdevice wakeup management
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Anton Vorontsov authored and David S. Miller committed Feb 1, 2009
1 parent 09640e6 commit 2884e5c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
5 changes: 5 additions & 0 deletions drivers/net/gianfar.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}

Expand Down
1 change: 1 addition & 0 deletions drivers/net/gianfar_ethtool.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 2884e5c

Please sign in to comment.