diff options
author | allan <allan@asix.com.tw> | 2011-12-22 15:38:51 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-23 16:51:18 -0500 |
commit | f87ce5b254d4eb5b5ec2bfcc78d714fa0e249288 (patch) | |
tree | 778187018922ac5e1841e8153d53d56b6e823698 /drivers/net/usb | |
parent | 30e7dfe76e3e9a3f2b72be38c48562317d7795ab (diff) |
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>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r-- | drivers/net/usb/asix.c | 6 |
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 @@ | |||
36 | #include <linux/usb/usbnet.h> | 36 | #include <linux/usb/usbnet.h> |
37 | #include <linux/slab.h> | 37 | #include <linux/slab.h> |
38 | 38 | ||
39 | #define DRIVER_VERSION "08-Nov-2011" | 39 | #define DRIVER_VERSION "22-Dec-2011" |
40 | #define DRIVER_NAME "asix" | 40 | #define DRIVER_NAME "asix" |
41 | 41 | ||
42 | /* ASIX AX8817X based USB 2.0 Ethernet Devices */ | 42 | /* ASIX AX8817X based USB 2.0 Ethernet Devices */ |
@@ -689,6 +689,10 @@ asix_get_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo) | |||
689 | } | 689 | } |
690 | wolinfo->supported = WAKE_PHY | WAKE_MAGIC; | 690 | wolinfo->supported = WAKE_PHY | WAKE_MAGIC; |
691 | wolinfo->wolopts = 0; | 691 | wolinfo->wolopts = 0; |
692 | if (opt & AX_MONITOR_LINK) | ||
693 | wolinfo->wolopts |= WAKE_PHY; | ||
694 | if (opt & AX_MONITOR_MAGIC) | ||
695 | wolinfo->wolopts |= WAKE_MAGIC; | ||
692 | } | 696 | } |
693 | 697 | ||
694 | static int | 698 | static int |