drivers/net/usb/asix: fixed asix_get_wol reported wrong wol status issue
authorallan <allan@asix.com.tw>
Thu, 22 Dec 2011 20:38:51 +0000 (20:38 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 23 Dec 2011 21:51:18 +0000 (16:51 -0500)
Fixed the asix_get_wol() routine reported wrong wol status issue.

Signed-off-by: Allan Chou <allan@asix.com.tw>
Tested-by: Eugene <elubarsky@gmail.com>; Allan Chou <allan@asix.com.tw>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/asix.c

index e6fed4d4cb77f70c8c6d62af16d53a57ed31c99c..6c543b19fdb1fab9692f92e4e3068396aaf294b4 100644 (file)
@@ -36,7 +36,7 @@
 #include <linux/usb/usbnet.h>
 #include <linux/slab.h>
 
-#define DRIVER_VERSION "08-Nov-2011"
+#define DRIVER_VERSION "22-Dec-2011"
 #define DRIVER_NAME "asix"
 
 /* ASIX AX8817X based USB 2.0 Ethernet Devices */
@@ -689,6 +689,10 @@ asix_get_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
        }
        wolinfo->supported = WAKE_PHY | WAKE_MAGIC;
        wolinfo->wolopts = 0;
+       if (opt & AX_MONITOR_LINK)
+               wolinfo->wolopts |= WAKE_PHY;
+       if (opt & AX_MONITOR_MAGIC)
+               wolinfo->wolopts |= WAKE_MAGIC;
 }
 
 static int