From 2e06ab25f6e6160516ef1ff80262591649600290 Mon Sep 17 00:00:00 2001
From: allan <allan@asix.com.tw>
Date: Thu, 22 Dec 2011 20:38:51 +0000
Subject: [PATCH] --- yaml --- r: 279051 b: refs/heads/master c:
 f87ce5b254d4eb5b5ec2bfcc78d714fa0e249288 h: refs/heads/master i:   279049:
 e4f7a8aa2287bf17ee7c12d60fb0e71da118de0c   279047:
 341372890d903523a0c13a0888053242f157e3f6 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/net/usb/asix.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2477315412e8..3fe916390cb2 100644
--- 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
index e6fed4d4cb77..6c543b19fdb1 100644
--- 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