---

yaml --- r: 279051 b: refs/heads/master c: f87ce5b h: refs/heads/master i: 279049: e4f7a8a 279047: 3413728 v: v3
git-mirror · Dec 23, 2011 · 2e06ab2 · 2e06ab2
1 parent 59c8cc4
commit 2e06ab2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30e7dfe76e3e9a3f2b72be38c48562317d7795ab
+refs/heads/master: f87ce5b254d4eb5b5ec2bfcc78d714fa0e249288
diff --git a/trunk/drivers/net/usb/asix.c b/trunk/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