]> git.baikalelectronics.ru Git - kernel.git/commitdiff
usbnet: pegasus: set wakeup enable in set_wol
authorMing Lei <ming.lei@canonical.com>
Sat, 19 Jan 2013 01:32:01 +0000 (01:32 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 21 Jan 2013 04:11:57 +0000 (23:11 -0500)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/pegasus.c

index 3c02f950a3d2018b50a90b32991a32e018c1e0eb..8ee5ab0db12788523f52ee8d3137799c2547b1ac 100644 (file)
@@ -1097,6 +1097,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;
@@ -1111,7 +1112,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)