6 files changed, 25 insertions, 17 deletions

diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index e6fed4d4cb7..dbdca225b84 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
@@ -1655,6 +1659,10 @@ static const struct usb_device_id	products [] = {
         // ASIX 88772a
         USB_DEVICE(0x0db0, 0xa877),
         .driver_info = (unsigned long) &ax88772_info,
+}, {
+        // Asus USB Ethernet Adapter
+        USB_DEVICE (0x0b95, 0x7e2b),
+        .driver_info = (unsigned long) &ax88772_info,
 },
         { },            // END
 };
diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c
index a60d0069cc4..331e44056f5 100644
--- a/drivers/net/usb/cdc-phonet.c
+++ b/drivers/net/usb/cdc-phonet.c
@@ -130,7 +130,7 @@ static int rx_submit(struct usbpn_dev *pnd, struct urb *req, gfp_t gfp_flags)
         struct page *page;
         int err;
 
-        page = __netdev_alloc_page(dev, gfp_flags);
+        page = alloc_page(gfp_flags);
         if (!page)
                 return -ENOMEM;
 
@@ -140,7 +140,7 @@ static int rx_submit(struct usbpn_dev *pnd, struct urb *req, gfp_t gfp_flags)
         err = usb_submit_urb(req, gfp_flags);
         if (unlikely(err)) {
                 dev_dbg(&dev->dev, "RX submit error (%d)\n", err);
-                netdev_free_page(dev, page);
+                put_page(page);
         }
         return err;
 }
@@ -208,9 +208,9 @@ static void rx_complete(struct urb *req)
         dev->stats.rx_errors++;
 resubmit:
         if (page)
-                netdev_free_page(dev, page);
+                put_page(page);
         if (req)
-                rx_submit(pnd, req, GFP_ATOMIC);
+                rx_submit(pnd, req, GFP_ATOMIC | __GFP_COLD);
 }
 
 static int usbpn_close(struct net_device *dev);
@@ -229,7 +229,7 @@ static int usbpn_open(struct net_device *dev)
         for (i = 0; i < rxq_size; i++) {
                 struct urb *req = usb_alloc_urb(0, GFP_KERNEL);
 
-                if (!req || rx_submit(pnd, req, GFP_KERNEL)) {
+                if (!req || rx_submit(pnd, req, GFP_KERNEL | __GFP_COLD)) {
                         usbpn_close(dev);
                         return -ENOMEM;
                 }
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index f06fb78383a..009dd0f1853 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -465,12 +465,10 @@ static int cdc_ncm_bind(struct usbnet *dev, struct usb_interface *intf)
         int temp;
         u8 iface_no;
 
-        ctx = kmalloc(sizeof(*ctx), GFP_KERNEL);
+        ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
         if (ctx == NULL)
                 return -ENODEV;
 
-        memset(ctx, 0, sizeof(*ctx));
-
         init_timer(&ctx->tx_timer);
         spin_lock_init(&ctx->mtx);
         ctx->netdev = dev->net;
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 769f5090bda..5d99b8cacd7 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -55,8 +55,8 @@ static const char driver_name[] = "pegasus";
 #define BMSR_MEDIA      (BMSR_10HALF | BMSR_10FULL | BMSR_100HALF | \
                         BMSR_100FULL | BMSR_ANEGCAPABLE)
 
-static int loopback;
-static int mii_mode;
+static bool loopback;
+static bool mii_mode;
 static char *devid;
 
 static struct usb_eth_dev usb_dev_id[] = {
@@ -517,7 +517,7 @@ static inline int reset_mac(pegasus_t *pegasus)
         for (i = 0; i < REG_TIMEOUT; i++) {
                 get_registers(pegasus, EthCtrl1, 1, &data);
                 if (~data & 0x08) {
-                        if (loopback & 1)
+                        if (loopback)
                                 break;
                         if (mii_mode && (pegasus->features & HAS_HOME_PNA))
                                 set_register(pegasus, Gpio1, 0x34);
@@ -561,7 +561,7 @@ static int enable_net_traffic(struct net_device *dev, struct usb_device *usb)
                 data[1] |= 0x10;        /* set 100 Mbps */
         if (mii_mode)
                 data[1] = 0;
-        data[2] = (loopback & 1) ? 0x09 : 0x01;
+        data[2] = loopback ? 0x09 : 0x01;
 
         memcpy(pegasus->eth_regs, data, sizeof(data));
         ret = set_registers(pegasus, EthCtrl0, 3, data);
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c
index a5b9b12ef26..0d5da82f0ff 100644
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
@@ -76,7 +76,7 @@ struct usb_context {
         struct usbnet *dev;
 };
 
-static int turbo_mode = true;
+static bool turbo_mode = true;
 module_param(turbo_mode, bool, 0644);
 MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
 
@@ -728,7 +728,8 @@ static int smsc75xx_change_mtu(struct net_device *netdev, int new_mtu)
 }
 
 /* Enable or disable Rx checksum offload engine */
-static int smsc75xx_set_features(struct net_device *netdev, u32 features)
+static int smsc75xx_set_features(struct net_device *netdev,
+        netdev_features_t features)
 {
         struct usbnet *dev = netdev_priv(netdev);
         struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index eff67678c5a..db217ad66f2 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -59,7 +59,7 @@ struct usb_context {
         struct usbnet *dev;
 };
 
-static int turbo_mode = true;
+static bool turbo_mode = true;
 module_param(turbo_mode, bool, 0644);
 MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
 
@@ -516,7 +516,8 @@ static void smsc95xx_status(struct usbnet *dev, struct urb *urb)
 }
 
 /* Enable or disable Tx & Rx checksum offload engines */
-static int smsc95xx_set_features(struct net_device *netdev, u32 features)
+static int smsc95xx_set_features(struct net_device *netdev,
+        netdev_features_t features)
 {
         struct usbnet *dev = netdev_priv(netdev);
         u32 read_buf;