summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorallan <allan@asix.com.tw>2011-12-22 20:38:51 +0000
committerDavid S. Miller <davem@davemloft.net>2011-12-23 16:51:18 -0500
commitf87ce5b254d4eb5b5ec2bfcc78d714fa0e249288 (patch)
tree778187018922ac5e1841e8153d53d56b6e823698
parent30e7dfe76e3e9a3f2b72be38c48562317d7795ab (diff)
downloadlinux-f87ce5b254d4eb5b5ec2bfcc78d714fa0e249288.tar.bz2
drivers/net/usb/asix: fixed asix_get_wol reported wrong wol status issue
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>
-rw-r--r--drivers/net/usb/asix.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index e6fed4d4cb77..6c543b19fdb1 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -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