15 files changed, 379 insertions, 261 deletions

diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index 84d4608153c9..233576127934 100644
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -68,6 +68,7 @@ config USB_KAWETH
 
 config USB_PEGASUS
         tristate "USB Pegasus/Pegasus-II based ethernet device support"
+        select NET_CORE
         select MII
         ---help---
           Say Y here if you know you have Pegasus or Pegasus-II based adapter.
@@ -84,6 +85,7 @@ config USB_PEGASUS
 config USB_RTL8150
         tristate "USB RTL8150 based ethernet device support (EXPERIMENTAL)"
         depends on EXPERIMENTAL
+        select NET_CORE
         select MII
         help
           Say Y here if you have RTL8150 based usb-ethernet adapter.
@@ -95,6 +97,7 @@ config USB_RTL8150
 
 config USB_USBNET
         tristate "Multi-purpose USB Networking Framework"
+        select NET_CORE
         select MII
         ---help---
           This driver supports several kinds of network links over USB,
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index c5c4b4def7fb..e6fed4d4cb77 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -36,8 +36,8 @@
 #include <linux/usb/usbnet.h>
 #include <linux/slab.h>
 
-#define DRIVER_VERSION "14-Jun-2006"
-static const char driver_name [] = "asix";
+#define DRIVER_VERSION "08-Nov-2011"
+#define DRIVER_NAME "asix"
 
 /* ASIX AX8817X based USB 2.0 Ethernet Devices */
 
@@ -115,28 +115,27 @@ static const char driver_name [] = "asix";
 #define AX88178_MEDIUM_DEFAULT  \
         (AX_MEDIUM_PS | AX_MEDIUM_FD | AX_MEDIUM_AC | \
          AX_MEDIUM_RFC | AX_MEDIUM_TFC | AX_MEDIUM_JFE | \
-         AX_MEDIUM_RE )
+         AX_MEDIUM_RE)
 
 #define AX88772_MEDIUM_DEFAULT  \
         (AX_MEDIUM_FD | AX_MEDIUM_RFC | \
          AX_MEDIUM_TFC | AX_MEDIUM_PS | \
-         AX_MEDIUM_AC | AX_MEDIUM_RE )
+         AX_MEDIUM_AC | AX_MEDIUM_RE)
 
 /* AX88772 & AX88178 RX_CTL values */
-#define AX_RX_CTL_SO                    0x0080
-#define AX_RX_CTL_AP                    0x0020
-#define AX_RX_CTL_AM                    0x0010
-#define AX_RX_CTL_AB                    0x0008
-#define AX_RX_CTL_SEP                   0x0004
-#define AX_RX_CTL_AMALL                 0x0002
-#define AX_RX_CTL_PRO                   0x0001
-#define AX_RX_CTL_MFB_2048              0x0000
-#define AX_RX_CTL_MFB_4096              0x0100
-#define AX_RX_CTL_MFB_8192              0x0200
-#define AX_RX_CTL_MFB_16384             0x0300
-
-#define AX_DEFAULT_RX_CTL       \
-        (AX_RX_CTL_SO | AX_RX_CTL_AB )
+#define AX_RX_CTL_SO            0x0080
+#define AX_RX_CTL_AP            0x0020
+#define AX_RX_CTL_AM            0x0010
+#define AX_RX_CTL_AB            0x0008
+#define AX_RX_CTL_SEP           0x0004
+#define AX_RX_CTL_AMALL         0x0002
+#define AX_RX_CTL_PRO           0x0001
+#define AX_RX_CTL_MFB_2048      0x0000
+#define AX_RX_CTL_MFB_4096      0x0100
+#define AX_RX_CTL_MFB_8192      0x0200
+#define AX_RX_CTL_MFB_16384     0x0300
+
+#define AX_DEFAULT_RX_CTL       (AX_RX_CTL_SO | AX_RX_CTL_AB)
 
 /* GPIO 0 .. 2 toggles */
 #define AX_GPIO_GPO0EN          0x01    /* GPIO0 Output enable */
@@ -164,6 +163,8 @@ static const char driver_name [] = "asix";
 #define MARVELL_CTRL_TXDELAY    0x0002
 #define MARVELL_CTRL_RXDELAY    0x0080
 
+#define PHY_MODE_RTL8211CL      0x000C
+
 /* This structure cannot exceed sizeof(unsigned long [5]) AKA 20 bytes */
 struct asix_data {
         u8 multi_filter[AX_MCAST_FILTER_SIZE];
@@ -268,12 +269,15 @@ asix_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, u16 index,
 
         netdev_dbg(dev->net, "asix_write_cmd_async() cmd=0x%02x value=0x%04x index=0x%04x size=%d\n",
                    cmd, value, index, size);
-        if ((urb = usb_alloc_urb(0, GFP_ATOMIC)) == NULL) {
+
+        urb = usb_alloc_urb(0, GFP_ATOMIC);
+        if (!urb) {
                 netdev_err(dev->net, "Error allocating URB in write_cmd_async!\n");
                 return;
         }
 
-        if ((req = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC)) == NULL) {
+        req = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC);
+        if (!req) {
                 netdev_err(dev->net, "Failed to allocate memory for control request\n");
                 usb_free_urb(urb);
                 return;
@@ -290,7 +294,8 @@ asix_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, u16 index,
                              (void *)req, data, size,
                              asix_async_cmd_callback, req);
 
-        if((status = usb_submit_urb(urb, GFP_ATOMIC)) < 0) {
+        status = usb_submit_urb(urb, GFP_ATOMIC);
+        if (status < 0) {
                 netdev_err(dev->net, "Error submitting the control message: status=%d\n",
                            status);
                 kfree(req);
@@ -531,11 +536,11 @@ static u16 asix_read_medium_status(struct usbnet *dev)
         if (ret < 0) {
                 netdev_err(dev->net, "Error reading Medium Status register: %02x\n",
                            ret);
-                goto out;
+                return ret;     /* TODO: callers not checking for error ret */
         }
-        ret = le16_to_cpu(v);
-out:
-        return ret;
+
+        return le16_to_cpu(v);
+
 }
 
 static int asix_write_medium_mode(struct usbnet *dev, u16 mode)
@@ -647,9 +652,17 @@ static u32 asix_get_phyid(struct usbnet *dev)
 {
         int phy_reg;
         u32 phy_id;
+        int i;
 
-        phy_reg = asix_mdio_read(dev->net, dev->mii.phy_id, MII_PHYSID1);
-        if (phy_reg < 0)
+        /* Poll for the rare case the FW or phy isn't ready yet.  */
+        for (i = 0; i < 100; i++) {
+                phy_reg = asix_mdio_read(dev->net, dev->mii.phy_id, MII_PHYSID1);
+                if (phy_reg != 0 && phy_reg != 0xFFFF)
+                        break;
+                mdelay(1);
+        }
+
+        if (phy_reg <= 0 || phy_reg == 0xFFFF)
                 return 0;
 
         phy_id = (phy_reg & 0xffff) << 16;
@@ -676,12 +689,6 @@ asix_get_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
         }
         wolinfo->supported = WAKE_PHY | WAKE_MAGIC;
         wolinfo->wolopts = 0;
-        if (opt & AX_MONITOR_MODE) {
-                if (opt & AX_MONITOR_LINK)
-                        wolinfo->wolopts |= WAKE_PHY;
-                if (opt & AX_MONITOR_MAGIC)
-                        wolinfo->wolopts |= WAKE_MAGIC;
-        }
 }
 
 static int
@@ -694,8 +701,6 @@ asix_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
                 opt |= AX_MONITOR_LINK;
         if (wolinfo->wolopts & WAKE_MAGIC)
                 opt |= AX_MONITOR_MAGIC;
-        if (opt != 0)
-                opt |= AX_MONITOR_MODE;
 
         if (asix_write_cmd(dev, AX_CMD_WRITE_MONITOR_MODE,
                               opt, 0, 0, NULL) < 0)
@@ -744,7 +749,7 @@ static void asix_get_drvinfo (struct net_device *net,
 
         /* Inherit standard device info */
         usbnet_get_drvinfo(net, info);
-        strncpy (info->driver, driver_name, sizeof info->driver);
+        strncpy (info->driver, DRIVER_NAME, sizeof info->driver);
         strncpy (info->version, DRIVER_VERSION, sizeof info->version);
         info->eedump_len = data->eeprom_len;
 }
@@ -872,7 +877,7 @@ static const struct net_device_ops ax88172_netdev_ops = {
         .ndo_set_mac_address    = eth_mac_addr,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_do_ioctl           = asix_ioctl,
-        .ndo_set_multicast_list = ax88172_set_multicast,
+        .ndo_set_rx_mode        = ax88172_set_multicast,
 };
 
 static int ax88172_bind(struct usbnet *dev, struct usb_interface *intf)
@@ -889,19 +894,20 @@ static int ax88172_bind(struct usbnet *dev, struct usb_interface *intf)
 
         /* Toggle the GPIOs in a manufacturer/model specific way */
         for (i = 2; i >= 0; i--) {
-                if ((ret = asix_write_cmd(dev, AX_CMD_WRITE_GPIOS,
-                                        (gpio_bits >> (i * 8)) & 0xff, 0, 0,
-                                        NULL)) < 0)
+                ret = asix_write_cmd(dev, AX_CMD_WRITE_GPIOS,
+                                (gpio_bits >> (i * 8)) & 0xff, 0, 0, NULL);
+                if (ret < 0)
                         goto out;
                 msleep(5);
         }
 
-        if ((ret = asix_write_rx_ctl(dev, 0x80)) < 0)
+        ret = asix_write_rx_ctl(dev, 0x80);
+        if (ret < 0)
                 goto out;
 
         /* Get the MAC address */
-        if ((ret = asix_read_cmd(dev, AX88172_CMD_READ_NODE_ID,
-                                0, 0, ETH_ALEN, buf)) < 0) {
+        ret = asix_read_cmd(dev, AX88172_CMD_READ_NODE_ID, 0, 0, ETH_ALEN, buf);
+        if (ret < 0) {
                 dbg("read AX_CMD_READ_NODE_ID failed: %d", ret);
                 goto out;
         }
@@ -966,117 +972,88 @@ static int ax88772_link_reset(struct usbnet *dev)
         return 0;
 }
 
-static const struct net_device_ops ax88772_netdev_ops = {
-        .ndo_open               = usbnet_open,
-        .ndo_stop               = usbnet_stop,
-        .ndo_start_xmit         = usbnet_start_xmit,
-        .ndo_tx_timeout         = usbnet_tx_timeout,
-        .ndo_change_mtu         = usbnet_change_mtu,
-        .ndo_set_mac_address    = asix_set_mac_address,
-        .ndo_validate_addr      = eth_validate_addr,
-        .ndo_do_ioctl           = asix_ioctl,
-        .ndo_set_multicast_list = asix_set_multicast,
-};
-
-static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
+static int ax88772_reset(struct usbnet *dev)
 {
         int ret, embd_phy;
         u16 rx_ctl;
-        struct asix_data *data = (struct asix_data *)&dev->data;
-        u8 buf[ETH_ALEN];
-        u32 phyid;
-
-        data->eeprom_len = AX88772_EEPROM_LEN;
 
-        usbnet_get_endpoints(dev,intf);
-
-        if ((ret = asix_write_gpio(dev,
-                        AX_GPIO_RSE | AX_GPIO_GPO_2 | AX_GPIO_GPO2EN, 5)) < 0)
+        ret = asix_write_gpio(dev,
+                        AX_GPIO_RSE | AX_GPIO_GPO_2 | AX_GPIO_GPO2EN, 5);
+        if (ret < 0)
                 goto out;
 
-        /* 0x10 is the phy id of the embedded 10/100 ethernet phy */
         embd_phy = ((asix_get_phy_addr(dev) & 0x1f) == 0x10 ? 1 : 0);
-        if ((ret = asix_write_cmd(dev, AX_CMD_SW_PHY_SELECT,
-                                embd_phy, 0, 0, NULL)) < 0) {
+
+        ret = asix_write_cmd(dev, AX_CMD_SW_PHY_SELECT, embd_phy, 0, 0, NULL);
+        if (ret < 0) {
                 dbg("Select PHY #1 failed: %d", ret);
                 goto out;
         }
 
-        if ((ret = asix_sw_reset(dev, AX_SWRESET_IPPD | AX_SWRESET_PRL)) < 0)
+        ret = asix_sw_reset(dev, AX_SWRESET_IPPD | AX_SWRESET_PRL);
+        if (ret < 0)
                 goto out;
 
         msleep(150);
-        if ((ret = asix_sw_reset(dev, AX_SWRESET_CLEAR)) < 0)
+
+        ret = asix_sw_reset(dev, AX_SWRESET_CLEAR);
+        if (ret < 0)
                 goto out;
 
         msleep(150);
+
         if (embd_phy) {
-                if ((ret = asix_sw_reset(dev, AX_SWRESET_IPRL)) < 0)
+                ret = asix_sw_reset(dev, AX_SWRESET_IPRL);
+                if (ret < 0)
                         goto out;
-        }
-        else {
-                if ((ret = asix_sw_reset(dev, AX_SWRESET_PRTE)) < 0)
+        } else {
+                ret = asix_sw_reset(dev, AX_SWRESET_PRTE);
+                if (ret < 0)
                         goto out;
         }
 
         msleep(150);
         rx_ctl = asix_read_rx_ctl(dev);
         dbg("RX_CTL is 0x%04x after software reset", rx_ctl);
-        if ((ret = asix_write_rx_ctl(dev, 0x0000)) < 0)
+        ret = asix_write_rx_ctl(dev, 0x0000);
+        if (ret < 0)
                 goto out;
 
         rx_ctl = asix_read_rx_ctl(dev);
         dbg("RX_CTL is 0x%04x setting to 0x0000", rx_ctl);
 
-        /* Get the MAC address */
-        if ((ret = asix_read_cmd(dev, AX_CMD_READ_NODE_ID,
-                                0, 0, ETH_ALEN, buf)) < 0) {
-                dbg("Failed to read MAC address: %d", ret);
-                goto out;
-        }
-        memcpy(dev->net->dev_addr, buf, ETH_ALEN);
-
-        /* Initialize MII structure */
-        dev->mii.dev = dev->net;
-        dev->mii.mdio_read = asix_mdio_read;
-        dev->mii.mdio_write = asix_mdio_write;
-        dev->mii.phy_id_mask = 0x1f;
-        dev->mii.reg_num_mask = 0x1f;
-        dev->mii.phy_id = asix_get_phy_addr(dev);
-
-        phyid = asix_get_phyid(dev);
-        dbg("PHYID=0x%08x", phyid);
-
-        if ((ret = asix_sw_reset(dev, AX_SWRESET_PRL)) < 0)
+        ret = asix_sw_reset(dev, AX_SWRESET_PRL);
+        if (ret < 0)
                 goto out;
 
         msleep(150);
 
-        if ((ret = asix_sw_reset(dev, AX_SWRESET_IPRL | AX_SWRESET_PRL)) < 0)
+        ret = asix_sw_reset(dev, AX_SWRESET_IPRL | AX_SWRESET_PRL);
+        if (ret < 0)
                 goto out;
 
         msleep(150);
 
-        dev->net->netdev_ops = &ax88772_netdev_ops;
-        dev->net->ethtool_ops = &ax88772_ethtool_ops;
-
         asix_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
         asix_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
                         ADVERTISE_ALL | ADVERTISE_CSMA);
         mii_nway_restart(&dev->mii);
 
-        if ((ret = asix_write_medium_mode(dev, AX88772_MEDIUM_DEFAULT)) < 0)
+        ret = asix_write_medium_mode(dev, AX88772_MEDIUM_DEFAULT);
+        if (ret < 0)
                 goto out;
 
-        if ((ret = asix_write_cmd(dev, AX_CMD_WRITE_IPG0,
+        ret = asix_write_cmd(dev, AX_CMD_WRITE_IPG0,
                                 AX88772_IPG0_DEFAULT | AX88772_IPG1_DEFAULT,
-                                AX88772_IPG2_DEFAULT, 0, NULL)) < 0) {
+                                AX88772_IPG2_DEFAULT, 0, NULL);
+        if (ret < 0) {
                 dbg("Write IPG,IPG1,IPG2 failed: %d", ret);
                 goto out;
         }
 
         /* Set RX_CTL to default values with 2k buffer, and enable cactus */
-        if ((ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL)) < 0)
+        ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL);
+        if (ret < 0)
                 goto out;
 
         rx_ctl = asix_read_rx_ctl(dev);
@@ -1085,16 +1062,90 @@ static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
         rx_ctl = asix_read_medium_status(dev);
         dbg("Medium Status is 0x%04x after all initializations", rx_ctl);
 
+        return 0;
+
+out:
+        return ret;
+
+}
+
+static const struct net_device_ops ax88772_netdev_ops = {
+        .ndo_open               = usbnet_open,
+        .ndo_stop               = usbnet_stop,
+        .ndo_start_xmit         = usbnet_start_xmit,
+        .ndo_tx_timeout         = usbnet_tx_timeout,
+        .ndo_change_mtu         = usbnet_change_mtu,
+        .ndo_set_mac_address    = asix_set_mac_address,
+        .ndo_validate_addr      = eth_validate_addr,
+        .ndo_do_ioctl           = asix_ioctl,
+        .ndo_set_rx_mode        = asix_set_multicast,
+};
+
+static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
+{
+        int ret, embd_phy;
+        struct asix_data *data = (struct asix_data *)&dev->data;
+        u8 buf[ETH_ALEN];
+        u32 phyid;
+
+        data->eeprom_len = AX88772_EEPROM_LEN;
+
+        usbnet_get_endpoints(dev,intf);
+
+        /* Get the MAC address */
+        ret = asix_read_cmd(dev, AX_CMD_READ_NODE_ID, 0, 0, ETH_ALEN, buf);
+        if (ret < 0) {
+                dbg("Failed to read MAC address: %d", ret);
+                return ret;
+        }
+        memcpy(dev->net->dev_addr, buf, ETH_ALEN);
+
+        /* Initialize MII structure */
+        dev->mii.dev = dev->net;
+        dev->mii.mdio_read = asix_mdio_read;
+        dev->mii.mdio_write = asix_mdio_write;
+        dev->mii.phy_id_mask = 0x1f;
+        dev->mii.reg_num_mask = 0x1f;
+        dev->mii.phy_id = asix_get_phy_addr(dev);
+
+        dev->net->netdev_ops = &ax88772_netdev_ops;
+        dev->net->ethtool_ops = &ax88772_ethtool_ops;
+
+        embd_phy = ((dev->mii.phy_id & 0x1f) == 0x10 ? 1 : 0);
+
+        /* Reset the PHY to normal operation mode */
+        ret = asix_write_cmd(dev, AX_CMD_SW_PHY_SELECT, embd_phy, 0, 0, NULL);
+        if (ret < 0) {
+                dbg("Select PHY #1 failed: %d", ret);
+                return ret;
+        }
+
+        ret = asix_sw_reset(dev, AX_SWRESET_IPPD | AX_SWRESET_PRL);
+        if (ret < 0)
+                return ret;
+
+        msleep(150);
+
+        ret = asix_sw_reset(dev, AX_SWRESET_CLEAR);
+        if (ret < 0)
+                return ret;
+
+        msleep(150);
+
+        ret = asix_sw_reset(dev, embd_phy ? AX_SWRESET_IPRL : AX_SWRESET_PRTE);
+
+        /* Read PHYID register *AFTER* the PHY was reset properly */
+        phyid = asix_get_phyid(dev);
+        dbg("PHYID=0x%08x", phyid);
+
         /* Asix framing packs multiple eth frames into a 2K usb bulk transfer */
         if (dev->driver_info->flags & FLAG_FRAMING_AX) {
                 /* hard_mtu  is still the default - the device does not support
                    jumbo eth frames */
                 dev->rx_urb_size = 2048;
         }
-        return 0;
 
-out:
-        return ret;
+        return 0;
 }
 
 static struct ethtool_ops ax88178_ethtool_ops = {
@@ -1143,6 +1194,27 @@ static int marvell_phy_init(struct usbnet *dev)
         return 0;
 }
 
+static int rtl8211cl_phy_init(struct usbnet *dev)
+{
+        struct asix_data *data = (struct asix_data *)&dev->data;
+
+        netdev_dbg(dev->net, "rtl8211cl_phy_init()\n");
+
+        asix_mdio_write (dev->net, dev->mii.phy_id, 0x1f, 0x0005);
+        asix_mdio_write (dev->net, dev->mii.phy_id, 0x0c, 0);
+        asix_mdio_write (dev->net, dev->mii.phy_id, 0x01,
+                asix_mdio_read (dev->net, dev->mii.phy_id, 0x01) | 0x0080);
+        asix_mdio_write (dev->net, dev->mii.phy_id, 0x1f, 0);
+
+        if (data->ledmode == 12) {
+                asix_mdio_write (dev->net, dev->mii.phy_id, 0x1f, 0x0002);
+                asix_mdio_write (dev->net, dev->mii.phy_id, 0x1a, 0x00cb);
+                asix_mdio_write (dev->net, dev->mii.phy_id, 0x1f, 0);
+        }
+
+        return 0;
+}
+
 static int marvell_led_status(struct usbnet *dev, u16 speed)
 {
         u16 reg = asix_mdio_read(dev->net, dev->mii.phy_id, MARVELL_LED_MANUAL);
@@ -1169,6 +1241,88 @@ static int marvell_led_status(struct usbnet *dev, u16 speed)
         return 0;
 }
 
+static int ax88178_reset(struct usbnet *dev)
+{
+        struct asix_data *data = (struct asix_data *)&dev->data;
+        int ret;
+        __le16 eeprom;
+        u8 status;
+        int gpio0 = 0;
+        u32 phyid;
+
+        asix_read_cmd(dev, AX_CMD_READ_GPIOS, 0, 0, 1, &status);
+        dbg("GPIO Status: 0x%04x", status);
+
+        asix_write_cmd(dev, AX_CMD_WRITE_ENABLE, 0, 0, 0, NULL);
+        asix_read_cmd(dev, AX_CMD_READ_EEPROM, 0x0017, 0, 2, &eeprom);
+        asix_write_cmd(dev, AX_CMD_WRITE_DISABLE, 0, 0, 0, NULL);
+
+        dbg("EEPROM index 0x17 is 0x%04x", eeprom);
+
+        if (eeprom == cpu_to_le16(0xffff)) {
+                data->phymode = PHY_MODE_MARVELL;
+                data->ledmode = 0;
+                gpio0 = 1;
+        } else {
+                data->phymode = le16_to_cpu(eeprom) & 0x7F;
+                data->ledmode = le16_to_cpu(eeprom) >> 8;
+                gpio0 = (le16_to_cpu(eeprom) & 0x80) ? 0 : 1;
+        }
+        dbg("GPIO0: %d, PhyMode: %d", gpio0, data->phymode);
+
+        /* Power up external GigaPHY through AX88178 GPIO pin */
+        asix_write_gpio(dev, AX_GPIO_RSE | AX_GPIO_GPO_1 | AX_GPIO_GPO1EN, 40);
+        if ((le16_to_cpu(eeprom) >> 8) != 1) {
+                asix_write_gpio(dev, 0x003c, 30);
+                asix_write_gpio(dev, 0x001c, 300);
+                asix_write_gpio(dev, 0x003c, 30);
+        } else {
+                dbg("gpio phymode == 1 path");
+                asix_write_gpio(dev, AX_GPIO_GPO1EN, 30);
+                asix_write_gpio(dev, AX_GPIO_GPO1EN | AX_GPIO_GPO_1, 30);
+        }
+
+        /* Read PHYID register *AFTER* powering up PHY */
+        phyid = asix_get_phyid(dev);
+        dbg("PHYID=0x%08x", phyid);
+
+        /* Set AX88178 to enable MII/GMII/RGMII interface for external PHY */
+        asix_write_cmd(dev, AX_CMD_SW_PHY_SELECT, 0, 0, 0, NULL);
+
+        asix_sw_reset(dev, 0);
+        msleep(150);
+
+        asix_sw_reset(dev, AX_SWRESET_PRL | AX_SWRESET_IPPD);
+        msleep(150);
+
+        asix_write_rx_ctl(dev, 0);
+
+        if (data->phymode == PHY_MODE_MARVELL) {
+                marvell_phy_init(dev);
+                msleep(60);
+        } else if (data->phymode == PHY_MODE_RTL8211CL)
+                rtl8211cl_phy_init(dev);
+
+        asix_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR,
+                        BMCR_RESET | BMCR_ANENABLE);
+        asix_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
+                        ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
+        asix_mdio_write(dev->net, dev->mii.phy_id, MII_CTRL1000,
+                        ADVERTISE_1000FULL);
+
+        mii_nway_restart(&dev->mii);
+
+        ret = asix_write_medium_mode(dev, AX88178_MEDIUM_DEFAULT);
+        if (ret < 0)
+                return ret;
+
+        ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
 static int ax88178_link_reset(struct usbnet *dev)
 {
         u16 mode;
@@ -1270,67 +1424,26 @@ static const struct net_device_ops ax88178_netdev_ops = {
         .ndo_tx_timeout         = usbnet_tx_timeout,
         .ndo_set_mac_address    = asix_set_mac_address,
         .ndo_validate_addr      = eth_validate_addr,
-        .ndo_set_multicast_list = asix_set_multicast,
+        .ndo_set_rx_mode        = asix_set_multicast,
         .ndo_do_ioctl           = asix_ioctl,
         .ndo_change_mtu         = ax88178_change_mtu,
 };
 
 static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf)
 {
-        struct asix_data *data = (struct asix_data *)&dev->data;
         int ret;
         u8 buf[ETH_ALEN];
-        __le16 eeprom;
-        u8 status;
-        int gpio0 = 0;
-        u32 phyid;
-
-        usbnet_get_endpoints(dev,intf);
-
-        asix_read_cmd(dev, AX_CMD_READ_GPIOS, 0, 0, 1, &status);
-        dbg("GPIO Status: 0x%04x", status);
-
-        asix_write_cmd(dev, AX_CMD_WRITE_ENABLE, 0, 0, 0, NULL);
-        asix_read_cmd(dev, AX_CMD_READ_EEPROM, 0x0017, 0, 2, &eeprom);
-        asix_write_cmd(dev, AX_CMD_WRITE_DISABLE, 0, 0, 0, NULL);
-
-        dbg("EEPROM index 0x17 is 0x%04x", eeprom);
-
-        if (eeprom == cpu_to_le16(0xffff)) {
-                data->phymode = PHY_MODE_MARVELL;
-                data->ledmode = 0;
-                gpio0 = 1;
-        } else {
-                data->phymode = le16_to_cpu(eeprom) & 7;
-                data->ledmode = le16_to_cpu(eeprom) >> 8;
-                gpio0 = (le16_to_cpu(eeprom) & 0x80) ? 0 : 1;
-        }
-        dbg("GPIO0: %d, PhyMode: %d", gpio0, data->phymode);
-
-        asix_write_gpio(dev, AX_GPIO_RSE | AX_GPIO_GPO_1 | AX_GPIO_GPO1EN, 40);
-        if ((le16_to_cpu(eeprom) >> 8) != 1) {
-                asix_write_gpio(dev, 0x003c, 30);
-                asix_write_gpio(dev, 0x001c, 300);
-                asix_write_gpio(dev, 0x003c, 30);
-        } else {
-                dbg("gpio phymode == 1 path");
-                asix_write_gpio(dev, AX_GPIO_GPO1EN, 30);
-                asix_write_gpio(dev, AX_GPIO_GPO1EN | AX_GPIO_GPO_1, 30);
-        }
-
-        asix_sw_reset(dev, 0);
-        msleep(150);
+        struct asix_data *data = (struct asix_data *)&dev->data;
 
-        asix_sw_reset(dev, AX_SWRESET_PRL | AX_SWRESET_IPPD);
-        msleep(150);
+        data->eeprom_len = AX88772_EEPROM_LEN;
 
-        asix_write_rx_ctl(dev, 0);
+        usbnet_get_endpoints(dev,intf);
 
         /* Get the MAC address */
-        if ((ret = asix_read_cmd(dev, AX_CMD_READ_NODE_ID,
-                                0, 0, ETH_ALEN, buf)) < 0) {
+        ret = asix_read_cmd(dev, AX_CMD_READ_NODE_ID, 0, 0, ETH_ALEN, buf);
+        if (ret < 0) {
                 dbg("Failed to read MAC address: %d", ret);
-                goto out;
+                return ret;
         }
         memcpy(dev->net->dev_addr, buf, ETH_ALEN);
 
@@ -1346,28 +1459,12 @@ static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf)
         dev->net->netdev_ops = &ax88178_netdev_ops;
         dev->net->ethtool_ops = &ax88178_ethtool_ops;
 
-        phyid = asix_get_phyid(dev);
-        dbg("PHYID=0x%08x", phyid);
-
-        if (data->phymode == PHY_MODE_MARVELL) {
-                marvell_phy_init(dev);
-                msleep(60);
-        }
-
-        asix_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR,
-                        BMCR_RESET | BMCR_ANENABLE);
-        asix_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
-                        ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
-        asix_mdio_write(dev->net, dev->mii.phy_id, MII_CTRL1000,
-                        ADVERTISE_1000FULL);
-
-        mii_nway_restart(&dev->mii);
-
-        if ((ret = asix_write_medium_mode(dev, AX88178_MEDIUM_DEFAULT)) < 0)
-                goto out;
+        /* Blink LEDS so users know driver saw dongle */
+        asix_sw_reset(dev, 0);
+        msleep(150);
 
-        if ((ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL)) < 0)
-                goto out;
+        asix_sw_reset(dev, AX_SWRESET_PRL | AX_SWRESET_IPPD);
+        msleep(150);
 
         /* Asix framing packs multiple eth frames into a 2K usb bulk transfer */
         if (dev->driver_info->flags & FLAG_FRAMING_AX) {
@@ -1375,10 +1472,8 @@ static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf)
                    jumbo eth frames */
                 dev->rx_urb_size = 2048;
         }
-        return 0;
 
-out:
-        return ret;
+        return 0;
 }
 
 static const struct driver_info ax8817x_info = {
@@ -1426,7 +1521,7 @@ static const struct driver_info ax88772_info = {
         .bind = ax88772_bind,
         .status = asix_status,
         .link_reset = ax88772_link_reset,
-        .reset = ax88772_link_reset,
+        .reset = ax88772_reset,
         .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR,
         .rx_fixup = asix_rx_fixup,
         .tx_fixup = asix_tx_fixup,
@@ -1437,7 +1532,7 @@ static const struct driver_info ax88178_info = {
         .bind = ax88178_bind,
         .status = asix_status,
         .link_reset = ax88178_link_reset,
-        .reset = ax88178_link_reset,
+        .reset = ax88178_reset,
         .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR,
         .rx_fixup = asix_rx_fixup,
         .tx_fixup = asix_tx_fixup,
@@ -1566,7 +1661,7 @@ static const struct usb_device_id	products [] = {
 MODULE_DEVICE_TABLE(usb, products);
 
 static struct usb_driver asix_driver = {
-        .name =         "asix",
+        .name =         DRIVER_NAME,
         .id_table =     products,
         .probe =        usbnet_probe,
         .suspend =      usbnet_suspend,
@@ -1588,6 +1683,7 @@ static void __exit asix_exit(void)
 module_exit(asix_exit);
 
 MODULE_AUTHOR("David Hollis");
+MODULE_VERSION(DRIVER_VERSION);
 MODULE_DESCRIPTION("ASIX AX8817X based USB 2.0 Ethernet Devices");
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c
index 8056f8a27c6a..a68272c93381 100644
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
@@ -749,7 +749,7 @@ static const struct net_device_ops catc_netdev_ops = {
         .ndo_start_xmit         = catc_start_xmit,
 
         .ndo_tx_timeout         = catc_tx_timeout,
-        .ndo_set_multicast_list = catc_set_multicast_list,
+        .ndo_set_rx_mode        = catc_set_multicast_list,
         .ndo_change_mtu         = eth_change_mtu,
         .ndo_set_mac_address    = eth_mac_addr,
         .ndo_validate_addr      = eth_validate_addr,
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index c924ea2bce07..99ed6eb4dfaf 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -567,7 +567,7 @@ static const struct usb_device_id	products [] = {
 {
         USB_DEVICE_AND_INTERFACE_INFO(0x1004, 0x61aa, USB_CLASS_COMM,
                         USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
-        .driver_info = (unsigned long)&wwan_info,
+        .driver_info = 0,
 },
 
 /*
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
index 1d93133e9b74..fbc0e4def767 100644
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -428,7 +428,7 @@ static const struct net_device_ops dm9601_netdev_ops = {
         .ndo_change_mtu         = usbnet_change_mtu,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_do_ioctl           = dm9601_ioctl,
-        .ndo_set_multicast_list = dm9601_set_multicast,
+        .ndo_set_rx_mode        = dm9601_set_multicast,
         .ndo_set_mac_address    = dm9601_set_mac_address,
 };
 
diff --git a/drivers/net/usb/int51x1.c b/drivers/net/usb/int51x1.c
index be02a25da71a..131ac6c172f6 100644
--- a/drivers/net/usb/int51x1.c
+++ b/drivers/net/usb/int51x1.c
@@ -193,7 +193,7 @@ static const struct net_device_ops int51x1_netdev_ops = {
         .ndo_change_mtu         = usbnet_change_mtu,
         .ndo_set_mac_address    = eth_mac_addr,
         .ndo_validate_addr      = eth_validate_addr,
-        .ndo_set_multicast_list = int51x1_set_multicast,
+        .ndo_set_rx_mode        = int51x1_set_multicast,
 };
 
 static int int51x1_bind(struct usbnet *dev, struct usb_interface *intf)
diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c
index 15772b1b6a91..13c1f044b40d 100644
--- a/drivers/net/usb/ipheth.c
+++ b/drivers/net/usb/ipheth.c
@@ -59,6 +59,7 @@
 #define USB_PRODUCT_IPHONE_3G   0x1292
 #define USB_PRODUCT_IPHONE_3GS  0x1294
 #define USB_PRODUCT_IPHONE_4    0x1297
+#define USB_PRODUCT_IPHONE_4_VZW 0x129c
 
 #define IPHETH_USBINTF_CLASS    255
 #define IPHETH_USBINTF_SUBCLASS 253
@@ -98,6 +99,10 @@ static struct usb_device_id ipheth_table[] = {
                 USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4,
                 IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
                 IPHETH_USBINTF_PROTO) },
+        { USB_DEVICE_AND_INTERFACE_INFO(
+                USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4_VZW,
+                IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
+                IPHETH_USBINTF_PROTO) },
         { }
 };
 MODULE_DEVICE_TABLE(usb, ipheth_table);
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index ad0298f9b5f9..582ca2dfa5f9 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -985,7 +985,7 @@ static const struct net_device_ops kaweth_netdev_ops = {
         .ndo_stop =                     kaweth_close,
         .ndo_start_xmit =               kaweth_start_xmit,
         .ndo_tx_timeout =               kaweth_tx_timeout,
-        .ndo_set_multicast_list =       kaweth_set_rx_mode,
+        .ndo_set_rx_mode =              kaweth_set_rx_mode,
         .ndo_get_stats =                kaweth_netdev_stats,
         .ndo_change_mtu =               eth_change_mtu,
         .ndo_set_mac_address =          eth_mac_addr,
diff --git a/drivers/net/usb/lg-vl600.c b/drivers/net/usb/lg-vl600.c
index 1d83ccfd7277..9c26c6390d69 100644
--- a/drivers/net/usb/lg-vl600.c
+++ b/drivers/net/usb/lg-vl600.c
@@ -27,6 +27,7 @@
 #include <linux/if_ether.h>
 #include <linux/if_arp.h>
 #include <linux/inetdevice.h>
+#include <linux/module.h>
 
 /*
  * The device has a CDC ACM port for modem control (it claims to be
@@ -89,6 +90,8 @@ static int vl600_bind(struct usbnet *dev, struct usb_interface *intf)
          * addresses have no meaning, the destination and the source of every
          * packet depend only on whether it is on the IN or OUT endpoint.  */
         dev->net->flags |= IFF_NOARP;
+        /* IPv6 NDP relies on multicast.  Enable it by default. */
+        dev->net->flags |= IFF_MULTICAST;
 
         return ret;
 }
@@ -141,10 +144,11 @@ static int vl600_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
         }
 
         frame = (struct vl600_frame_hdr *) buf->data;
-        /* NOTE: Should check that frame->magic == 0x53544448?
-         * Otherwise if we receive garbage at the beginning of the frame
-         * we may end up allocating a huge buffer and saving all the
-         * future incoming data into it.  */
+        /* Yes, check that frame->magic == 0x53544448 (or 0x44544d48),
+         * otherwise we may run out of memory w/a bad packet */
+        if (ntohl(frame->magic) != 0x53544448 &&
+                        ntohl(frame->magic) != 0x44544d48)
+                goto error;
 
         if (buf->len < sizeof(*frame) ||
                         buf->len != le32_to_cpup(&frame->len)) {
@@ -200,6 +204,14 @@ static int vl600_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
                 } else {
                         memset(ethhdr->h_source, 0, ETH_ALEN);
                         memcpy(ethhdr->h_dest, dev->net->dev_addr, ETH_ALEN);
+
+                        /* Inbound IPv6 packets have an IPv4 ethertype (0x800)
+                         * for some reason.  Peek at the L3 header to check
+                         * for IPv6 packets, and set the ethertype to IPv6
+                         * (0x86dd) so Linux can understand it.
+                         */
+                        if ((buf->data[sizeof(*ethhdr)] & 0xf0) == 0x60)
+                                ethhdr->h_proto = __constant_htons(ETH_P_IPV6);
                 }
 
                 if (count) {
@@ -285,6 +297,11 @@ encapsulate:
          * overwrite the remaining fields.
          */
         packet = (struct vl600_pkt_hdr *) skb->data;
+        /* The VL600 wants IPv6 packets to have an IPv4 ethertype
+         * Since this modem only supports IPv4 and IPv6, just set all
+         * frames to 0x0800 (ETH_P_IP)
+         */
+        packet->h_proto = htons(ETH_P_IP);
         memset(&packet->dummy, 0, sizeof(packet->dummy));
         packet->len = cpu_to_le32(orig_len);
 
@@ -302,7 +319,7 @@ encapsulate:
 
 static const struct driver_info vl600_info = {
         .description    = "LG VL600 modem",
-        .flags          = FLAG_ETHER | FLAG_RX_ASSEMBLE,
+        .flags          = FLAG_RX_ASSEMBLE | FLAG_WWAN,
         .bind           = vl600_bind,
         .unbind         = vl600_unbind,
         .status         = usbnet_cdc_status,
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
index 2b791392e788..db2cb74bf854 100644
--- a/drivers/net/usb/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
@@ -553,7 +553,7 @@ static const struct net_device_ops mcs7830_netdev_ops = {
         .ndo_change_mtu         = usbnet_change_mtu,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_do_ioctl           = mcs7830_ioctl,
-        .ndo_set_multicast_list = mcs7830_set_multicast,
+        .ndo_set_rx_mode        = mcs7830_set_multicast,
         .ndo_set_mac_address    = mcs7830_set_mac_address,
 };
 
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index ef3667690b12..769f5090bda1 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -1476,7 +1476,7 @@ static const struct net_device_ops pegasus_netdev_ops = {
         .ndo_stop =                     pegasus_close,
         .ndo_do_ioctl =                 pegasus_ioctl,
         .ndo_start_xmit =               pegasus_start_xmit,
-        .ndo_set_multicast_list =       pegasus_set_multicast,
+        .ndo_set_rx_mode =              pegasus_set_multicast,
         .ndo_get_stats =                pegasus_netdev_stats,
         .ndo_tx_timeout =               pegasus_tx_timeout,
         .ndo_change_mtu =               eth_change_mtu,
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index ef3b236b5145..bf8c84d0adf2 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -169,26 +169,8 @@ struct rtl8150 {
 
 typedef struct rtl8150 rtl8150_t;
 
-static void fill_skb_pool(rtl8150_t *);
-static void free_skb_pool(rtl8150_t *);
-static inline struct sk_buff *pull_skb(rtl8150_t *);
-static void rtl8150_disconnect(struct usb_interface *intf);
-static int rtl8150_probe(struct usb_interface *intf,
-                           const struct usb_device_id *id);
-static int rtl8150_suspend(struct usb_interface *intf, pm_message_t message);
-static int rtl8150_resume(struct usb_interface *intf);
-
 static const char driver_name [] = "rtl8150";
 
-static struct usb_driver rtl8150_driver = {
-        .name =         driver_name,
-        .probe =        rtl8150_probe,
-        .disconnect =   rtl8150_disconnect,
-        .id_table =     rtl8150_table,
-        .suspend =      rtl8150_suspend,
-        .resume =       rtl8150_resume
-};
-
 /*
 **
 **      device related part of the code
@@ -333,7 +315,7 @@ static int rtl8150_set_mac_address(struct net_device *netdev, void *p)
         /* Write the MAC address into eeprom. Eeprom writes must be word-sized,
            so we need to split them up. */
         for (i = 0; i * 2 < netdev->addr_len; i++) {
-                set_registers(dev, IDR_EEPROM + (i * 2), 2, 
+                set_registers(dev, IDR_EEPROM + (i * 2), 2,
                 netdev->dev_addr + (i * 2));
         }
         /* Clear the WEPROM bit (preventing accidental eeprom writes). */
@@ -490,44 +472,6 @@ resched:
         tasklet_schedule(&dev->tl);
 }
 
-static void rx_fixup(unsigned long data)
-{
-        rtl8150_t *dev;
-        struct sk_buff *skb;
-        int status;
-
-        dev = (rtl8150_t *)data;
-
-        spin_lock_irq(&dev->rx_pool_lock);
-        fill_skb_pool(dev);
-        spin_unlock_irq(&dev->rx_pool_lock);
-        if (test_bit(RX_URB_FAIL, &dev->flags))
-                if (dev->rx_skb)
-                        goto try_again;
-        spin_lock_irq(&dev->rx_pool_lock);
-        skb = pull_skb(dev);
-        spin_unlock_irq(&dev->rx_pool_lock);
-        if (skb == NULL)
-                goto tlsched;
-        dev->rx_skb = skb;
-        usb_fill_bulk_urb(dev->rx_urb, dev->udev, usb_rcvbulkpipe(dev->udev, 1),
-                      dev->rx_skb->data, RTL8150_MTU, read_bulk_callback, dev);
-try_again:
-        status = usb_submit_urb(dev->rx_urb, GFP_ATOMIC);
-        if (status == -ENODEV) {
-                netif_device_detach(dev->netdev);
-        } else if (status) {
-                set_bit(RX_URB_FAIL, &dev->flags);
-                goto tlsched;
-        } else {
-                clear_bit(RX_URB_FAIL, &dev->flags);
-        }
-
-        return;
-tlsched:
-        tasklet_schedule(&dev->tl);
-}
-
 static void write_bulk_callback(struct urb *urb)
 {
         rtl8150_t *dev;
@@ -665,6 +609,42 @@ static void free_skb_pool(rtl8150_t *dev)
                         dev_kfree_skb(dev->rx_skb_pool[i]);
 }
 
+static void rx_fixup(unsigned long data)
+{
+        struct rtl8150 *dev = (struct rtl8150 *)data;
+        struct sk_buff *skb;
+        int status;
+
+        spin_lock_irq(&dev->rx_pool_lock);
+        fill_skb_pool(dev);
+        spin_unlock_irq(&dev->rx_pool_lock);
+        if (test_bit(RX_URB_FAIL, &dev->flags))
+                if (dev->rx_skb)
+                        goto try_again;
+        spin_lock_irq(&dev->rx_pool_lock);
+        skb = pull_skb(dev);
+        spin_unlock_irq(&dev->rx_pool_lock);
+        if (skb == NULL)
+                goto tlsched;
+        dev->rx_skb = skb;
+        usb_fill_bulk_urb(dev->rx_urb, dev->udev, usb_rcvbulkpipe(dev->udev, 1),
+                      dev->rx_skb->data, RTL8150_MTU, read_bulk_callback, dev);
+try_again:
+        status = usb_submit_urb(dev->rx_urb, GFP_ATOMIC);
+        if (status == -ENODEV) {
+                netif_device_detach(dev->netdev);
+        } else if (status) {
+                set_bit(RX_URB_FAIL, &dev->flags);
+                goto tlsched;
+        } else {
+                clear_bit(RX_URB_FAIL, &dev->flags);
+        }
+
+        return;
+tlsched:
+        tasklet_schedule(&dev->tl);
+}
+
 static int enable_net_traffic(rtl8150_t * dev)
 {
         u8 cr, tcr, rcr, msr;
@@ -778,7 +758,7 @@ static int rtl8150_open(struct net_device *netdev)
                 return -ENOMEM;
 
         set_registers(dev, IDR, 6, netdev->dev_addr);
-        
+
         usb_fill_bulk_urb(dev->rx_urb, dev->udev, usb_rcvbulkpipe(dev->udev, 1),
                       dev->rx_skb->data, RTL8150_MTU, read_bulk_callback, dev);
         if ((res = usb_submit_urb(dev->rx_urb, GFP_KERNEL))) {
@@ -898,8 +878,8 @@ static const struct net_device_ops rtl8150_netdev_ops = {
         .ndo_stop               = rtl8150_close,
         .ndo_do_ioctl           = rtl8150_ioctl,
         .ndo_start_xmit         = rtl8150_start_xmit,
-        .ndo_tx_timeout         = rtl8150_tx_timeout,
-        .ndo_set_multicast_list = rtl8150_set_multicast,
+        .ndo_tx_timeout         = rtl8150_tx_timeout,
+        .ndo_set_rx_mode        = rtl8150_set_multicast,
         .ndo_set_mac_address    = rtl8150_set_mac_address,
 
         .ndo_change_mtu         = eth_change_mtu,
@@ -929,7 +909,7 @@ static int rtl8150_probe(struct usb_interface *intf,
 
         tasklet_init(&dev->tl, rx_fixup, (unsigned long)dev);
         spin_lock_init(&dev->rx_pool_lock);
-        
+
         dev->udev = udev;
         dev->netdev = netdev;
         netdev->netdev_ops = &rtl8150_netdev_ops;
@@ -947,7 +927,7 @@ static int rtl8150_probe(struct usb_interface *intf,
         }
         fill_skb_pool(dev);
         set_ethernet_addr(dev);
-        
+
         usb_set_intfdata(intf, dev);
         SET_NETDEV_DEV(netdev, &intf->dev);
         if (register_netdev(netdev) != 0) {
@@ -989,6 +969,15 @@ static void rtl8150_disconnect(struct usb_interface *intf)
         }
 }
 
+static struct usb_driver rtl8150_driver = {
+        .name           = driver_name,
+        .probe          = rtl8150_probe,
+        .disconnect     = rtl8150_disconnect,
+        .id_table       = rtl8150_table,
+        .suspend        = rtl8150_suspend,
+        .resume         = rtl8150_resume
+};
+
 static int __init usb_rtl8150_init(void)
 {
         printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c
index 15b3d6888ae9..a5b9b12ef268 100644
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
@@ -51,6 +51,7 @@
 #define USB_VENDOR_ID_SMSC              (0x0424)
 #define USB_PRODUCT_ID_LAN7500          (0x7500)
 #define USB_PRODUCT_ID_LAN7505          (0x7505)
+#define RXW_PADDING                     2
 
 #define check_warn(ret, fmt, args...) \
         ({ if (ret < 0) netdev_warn(dev->net, fmt, ##args); })
@@ -1000,7 +1001,7 @@ static const struct net_device_ops smsc75xx_netdev_ops = {
         .ndo_set_mac_address    = eth_mac_addr,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_do_ioctl           = smsc75xx_ioctl,
-        .ndo_set_multicast_list = smsc75xx_set_multicast,
+        .ndo_set_rx_mode        = smsc75xx_set_multicast,
         .ndo_set_features       = smsc75xx_set_features,
 };
 
@@ -1088,13 +1089,13 @@ static int smsc75xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
 
                 memcpy(&rx_cmd_b, skb->data, sizeof(rx_cmd_b));
                 le32_to_cpus(&rx_cmd_b);
-                skb_pull(skb, 4 + NET_IP_ALIGN);
+                skb_pull(skb, 4 + RXW_PADDING);
 
                 packet = skb->data;
 
                 /* get the packet length */
-                size = (rx_cmd_a & RX_CMD_A_LEN) - NET_IP_ALIGN;
-                align_count = (4 - ((size + NET_IP_ALIGN) % 4)) % 4;
+                size = (rx_cmd_a & RX_CMD_A_LEN) - RXW_PADDING;
+                align_count = (4 - ((size + RXW_PADDING) % 4)) % 4;
 
                 if (unlikely(rx_cmd_a & RX_CMD_A_RED)) {
                         netif_dbg(dev, rx_err, dev->net,
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index f74f3ce71526..eff67678c5a6 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -972,7 +972,7 @@ static const struct net_device_ops smsc95xx_netdev_ops = {
         .ndo_set_mac_address    = eth_mac_addr,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_do_ioctl           = smsc95xx_ioctl,
-        .ndo_set_multicast_list = smsc95xx_set_multicast,
+        .ndo_set_rx_mode        = smsc95xx_set_multicast,
         .ndo_set_features       = smsc95xx_set_features,
 };
 
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index ce395fe5de26..fae0fbd8bc88 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -238,6 +238,10 @@ void usbnet_skb_return (struct usbnet *dev, struct sk_buff *skb)
         netif_dbg(dev, rx_status, dev->net, "< rx, len %zu, type 0x%x\n",
                   skb->len + sizeof (struct ethhdr), skb->protocol);
         memset (skb->cb, 0, sizeof (struct skb_data));
+
+        if (skb_defer_rx_timestamp(skb))
+                return;
+
         status = netif_rx (skb);
         if (status != NET_RX_SUCCESS)
                 netif_dbg(dev, rx_err, dev->net,
@@ -1053,6 +1057,9 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
         unsigned long           flags;
         int retval;
 
+        if (skb)
+                skb_tx_timestamp(skb);
+
         // some devices want funky USB-level framing, for
         // win32 driver (usually) and/or hardware quirks
         if (info->tx_fixup) {
@@ -1470,7 +1477,7 @@ int usbnet_suspend (struct usb_interface *intf, pm_message_t message)
         if (!dev->suspend_count++) {
                 spin_lock_irq(&dev->txq.lock);
                 /* don't autosuspend while transmitting */
-                if (dev->txq.qlen && (message.event & PM_EVENT_AUTO)) {
+                if (dev->txq.qlen && PMSG_IS_AUTO(message)) {
                         spin_unlock_irq(&dev->txq.lock);
                         return -EBUSY;
                 } else {