diff mbox

[v2] drivers/net/usb/asix: fixed asix_get_wol reported wrong wol status issue

Message ID 005001ccc13d$8c9850e0$a5c8f2a0$@com.tw
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

ASIX_Allan [Office] Dec. 23, 2011, 6:38 a.m. UTC 
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>
---
This fix had been verified on x86 Linux kernel 3.0.0-12-generic system with AX88772A/AX88772/Belkin AX88178 USB dongles, and the wol function works fine (can be waked up by receiving the magic packets).




--
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

Comments

David Miller Dec. 23, 2011, 9:53 p.m. UTC | #1 
From: "allan" <allan@asix.com.tw>
Date: Fri, 23 Dec 2011 14:38:51 +0800

> 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>

Applied.
--
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 mbox

Patch

diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
--- a/drivers/net/usb/asix.c	2011-12-15 14:01:49.000000000 +0800
+++ b/drivers/net/usb/asix.c	2011-12-22 18:20:39.000000000 +0800
@@ -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, str
 	}
 	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