| Message ID | 1358595121-14373-1-git-send-email-ming.lei@canonical.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Ming Lei <ming.lei@canonical.com> Date: Sat, 19 Jan 2013 19:32:01 +0800 > This patch calls device_set_wakeup_enable() inside set_wol > callback, so that turning on WOL from user mode utility > can make the 'wakeup' of pegasus device to be enabled, then > remote wakeup may be enabled before putting into sleep. > > Cc: Sarah Sharp <sarah.a.sharp@linux.intel.com> > Cc: Petko Manolov <petkan@users.sourceforge.net> > Signed-off-by: Ming Lei <ming.lei@canonical.com> Applied to net-next, thanks Ming. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index a0b5807..44f46fd 100644 --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c @@ -1096,6 +1096,7 @@ pegasus_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) { pegasus_t *pegasus = netdev_priv(dev); u8 reg78 = 0x04; + int ret; if (wol->wolopts & ~WOL_SUPPORTED) return -EINVAL; @@ -1110,7 +1111,12 @@ pegasus_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) else pegasus->eth_regs[0] &= ~0x10; pegasus->wolopts = wol->wolopts; - return set_register(pegasus, WakeupControl, reg78); + + ret = set_register(pegasus, WakeupControl, reg78); + if (!ret) + ret = device_set_wakeup_enable(&pegasus->usb->dev, + wol->wolopts); + return ret; } static inline void pegasus_reset_wol(struct net_device *dev)
This patch calls device_set_wakeup_enable() inside set_wol callback, so that turning on WOL from user mode utility can make the 'wakeup' of pegasus device to be enabled, then remote wakeup may be enabled before putting into sleep. Cc: Sarah Sharp <sarah.a.sharp@linux.intel.com> Cc: Petko Manolov <petkan@users.sourceforge.net> Signed-off-by: Ming Lei <ming.lei@canonical.com> --- drivers/net/usb/pegasus.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)