9 files changed, 80 insertions, 272 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 6fae5f3ec7f6..d688a8af432c 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -398,7 +398,7 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb,
                      sizeof(qdisc_skb_cb(skb)->slave_dev_queue_mapping));
         skb->queue_mapping = qdisc_skb_cb(skb)->slave_dev_queue_mapping;
 
-        if (unlikely(netpoll_tx_running(slave_dev)))
+        if (unlikely(netpoll_tx_running(bond->dev)))
                 bond_netpoll_send_skb(bond_get_slave_by_dev(bond, slave_dev), skb);
         else
                 dev_queue_xmit(skb);
@@ -1235,12 +1235,12 @@ static inline int slave_enable_netpoll(struct slave *slave)
         struct netpoll *np;
         int err = 0;
 
-        np = kzalloc(sizeof(*np), GFP_KERNEL);
+        np = kzalloc(sizeof(*np), GFP_ATOMIC);
         err = -ENOMEM;
         if (!np)
                 goto out;
 
-        err = __netpoll_setup(np, slave->dev);
+        err = __netpoll_setup(np, slave->dev, GFP_ATOMIC);
         if (err) {
                 kfree(np);
                 goto out;
@@ -1257,9 +1257,7 @@ static inline void slave_disable_netpoll(struct slave *slave)
                 return;
 
         slave->np = NULL;
-        synchronize_rcu_bh();
-        __netpoll_cleanup(np);
-        kfree(np);
+        __netpoll_free_rcu(np);
 }
 static inline bool slave_dev_support_netpoll(struct net_device *slave_dev)
 {
@@ -1292,7 +1290,7 @@ static void bond_netpoll_cleanup(struct net_device *bond_dev)
         read_unlock(&bond->lock);
 }
 
-static int bond_netpoll_setup(struct net_device *dev, struct netpoll_info *ni)
+static int bond_netpoll_setup(struct net_device *dev, struct netpoll_info *ni, gfp_t gfp)
 {
         struct bonding *bond = netdev_priv(dev);
         struct slave *slave;
diff --git a/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c b/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
index 0f2d1a710909..151453309401 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
@@ -174,8 +174,10 @@ static int __devinit fs_enet_mdio_probe(struct platform_device *ofdev)
 
         new_bus->phy_mask = ~0;
         new_bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
-        if (!new_bus->irq)
+        if (!new_bus->irq) {
+                ret = -ENOMEM;
                 goto out_unmap_regs;
+        }
 
         new_bus->parent = &ofdev->dev;
         dev_set_drvdata(&ofdev->dev, new_bus);
diff --git a/drivers/net/ethernet/freescale/fs_enet/mii-fec.c b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
index 55bb867258e6..cdf702a59485 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
@@ -137,8 +137,10 @@ static int __devinit fs_enet_mdio_probe(struct platform_device *ofdev)
         snprintf(new_bus->id, MII_BUS_ID_SIZE, "%x", res.start);
 
         fec->fecp = ioremap(res.start, resource_size(&res));
-        if (!fec->fecp)
+        if (!fec->fecp) {
+                ret = -ENOMEM;
                 goto out_fec;
+        }
 
         if (get_bus_freq) {
                 clock = get_bus_freq(ofdev->dev.of_node);
@@ -172,8 +174,10 @@ static int __devinit fs_enet_mdio_probe(struct platform_device *ofdev)
 
         new_bus->phy_mask = ~0;
         new_bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
-        if (!new_bus->irq)
+        if (!new_bus->irq) {
+                ret = -ENOMEM;
                 goto out_unmap_regs;
+        }
 
         new_bus->parent = &ofdev->dev;
         dev_set_drvdata(&ofdev->dev, new_bus);
diff --git a/drivers/net/ethernet/mellanox/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c
index 4ec3835e1bc2..a018ea2a43de 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mcg.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c
@@ -432,8 +432,10 @@ static int add_promisc_qp(struct mlx4_dev *dev, u8 port,
                         if ((be32_to_cpu(mgm->qp[i]) & MGM_QPN_MASK) == qpn) {
                                 /* Entry already exists, add to duplicates */
                                 dqp = kmalloc(sizeof *dqp, GFP_KERNEL);
-                                if (!dqp)
+                                if (!dqp) {
+                                        err = -ENOMEM;
                                         goto out_mailbox;
+                                }
                                 dqp->qpn = qpn;
                                 list_add_tail(&dqp->list, &entry->duplicates);
                                 found = true;
diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c
index 3b5c4571b55e..d15c888e9df8 100644
--- a/drivers/net/ethernet/ti/davinci_cpdma.c
+++ b/drivers/net/ethernet/ti/davinci_cpdma.c
@@ -538,11 +538,12 @@ EXPORT_SYMBOL_GPL(cpdma_chan_create);
 
 int cpdma_chan_destroy(struct cpdma_chan *chan)
 {
-        struct cpdma_ctlr *ctlr = chan->ctlr;
+        struct cpdma_ctlr *ctlr;
         unsigned long flags;
 
         if (!chan)
                 return -EINVAL;
+        ctlr = chan->ctlr;
 
         spin_lock_irqsave(&ctlr->lock, flags);
         if (chan->state != CPDMA_STATE_IDLE)
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index f9347ea3d381..f0ad56c13933 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -640,12 +640,7 @@ static int netconsole_netdev_event(struct notifier_block *this,
                                  * rtnl_lock already held
                                  */
                                 if (nt->np.dev) {
-                                        spin_unlock_irqrestore(
-                                                              &target_list_lock,
-                                                              flags);
                                         __netpoll_cleanup(&nt->np);
-                                        spin_lock_irqsave(&target_list_lock,
-                                                          flags);
                                         dev_put(nt->np.dev);
                                         nt->np.dev = NULL;
                                         netconsole_target_put(nt);
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 87707ab39430..341b65dbbcd3 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -795,16 +795,17 @@ static void team_port_leave(struct team *team, struct team_port *port)
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
-static int team_port_enable_netpoll(struct team *team, struct team_port *port)
+static int team_port_enable_netpoll(struct team *team, struct team_port *port,
+                                    gfp_t gfp)
 {
         struct netpoll *np;
         int err;
 
-        np = kzalloc(sizeof(*np), GFP_KERNEL);
+        np = kzalloc(sizeof(*np), gfp);
         if (!np)
                 return -ENOMEM;
 
-        err = __netpoll_setup(np, port->dev);
+        err = __netpoll_setup(np, port->dev, gfp);
         if (err) {
                 kfree(np);
                 return err;
@@ -833,7 +834,8 @@ static struct netpoll_info *team_netpoll_info(struct team *team)
 }
 
 #else
-static int team_port_enable_netpoll(struct team *team, struct team_port *port)
+static int team_port_enable_netpoll(struct team *team, struct team_port *port,
+                                    gfp_t gfp)
 {
         return 0;
 }
@@ -913,7 +915,7 @@ static int team_port_add(struct team *team, struct net_device *port_dev)
         }
 
         if (team_netpoll_info(team)) {
-                err = team_port_enable_netpoll(team, port);
+                err = team_port_enable_netpoll(team, port, GFP_KERNEL);
                 if (err) {
                         netdev_err(dev, "Failed to enable netpoll on device %s\n",
                                    portname);
@@ -1443,7 +1445,7 @@ static void team_netpoll_cleanup(struct net_device *dev)
 }
 
 static int team_netpoll_setup(struct net_device *dev,
-                              struct netpoll_info *npifo)
+                              struct netpoll_info *npifo, gfp_t gfp)
 {
         struct team *team = netdev_priv(dev);
         struct team_port *port;
@@ -1451,7 +1453,7 @@ static int team_netpoll_setup(struct net_device *dev,
 
         mutex_lock(&team->lock);
         list_for_each_entry(port, &team->port_list, list) {
-                err = team_port_enable_netpoll(team, port);
+                err = team_port_enable_netpoll(team, port, gfp);
                 if (err) {
                         __team_netpoll_cleanup(team);
                         break;
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 2ea126a16d79..aaa061b7355d 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -247,30 +247,12 @@ err:
  */
 static int qmi_wwan_bind_shared(struct usbnet *dev, struct usb_interface *intf)
 {
-        int rv;
         struct qmi_wwan_state *info = (void *)&dev->data;
 
-        /* ZTE makes devices where the interface descriptors and endpoint
-         * configurations of two or more interfaces are identical, even
-         * though the functions are completely different.  If set, then
-         * driver_info->data is a bitmap of acceptable interface numbers
-         * allowing us to bind to one such interface without binding to
-         * all of them
-         */
-        if (dev->driver_info->data &&
-            !test_bit(intf->cur_altsetting->desc.bInterfaceNumber, &dev->driver_info->data)) {
-                dev_info(&intf->dev, "not on our whitelist - ignored");
-                rv = -ENODEV;
-                goto err;
-        }
-
         /*  control and data is shared */
         info->control = intf;
         info->data = intf;
-        rv = qmi_wwan_register_subdriver(dev);
-
-err:
-        return rv;
+        return qmi_wwan_register_subdriver(dev);
 }
 
 static void qmi_wwan_unbind(struct usbnet *dev, struct usb_interface *intf)
@@ -356,214 +338,59 @@ static const struct driver_info	qmi_wwan_shared = {
         .manage_power   = qmi_wwan_manage_power,
 };
 
-static const struct driver_info qmi_wwan_force_int0 = {
-        .description    = "Qualcomm WWAN/QMI device",
-        .flags          = FLAG_WWAN,
-        .bind           = qmi_wwan_bind_shared,
-        .unbind         = qmi_wwan_unbind,
-        .manage_power   = qmi_wwan_manage_power,
-        .data           = BIT(0), /* interface whitelist bitmap */
-};
-
-static const struct driver_info qmi_wwan_force_int1 = {
-        .description    = "Qualcomm WWAN/QMI device",
-        .flags          = FLAG_WWAN,
-        .bind           = qmi_wwan_bind_shared,
-        .unbind         = qmi_wwan_unbind,
-        .manage_power   = qmi_wwan_manage_power,
-        .data           = BIT(1), /* interface whitelist bitmap */
-};
-
-static const struct driver_info qmi_wwan_force_int2 = {
-        .description    = "Qualcomm WWAN/QMI device",
-        .flags          = FLAG_WWAN,
-        .bind           = qmi_wwan_bind_shared,
-        .unbind         = qmi_wwan_unbind,
-        .manage_power   = qmi_wwan_manage_power,
-        .data           = BIT(2), /* interface whitelist bitmap */
-};
-
-static const struct driver_info qmi_wwan_force_int3 = {
-        .description    = "Qualcomm WWAN/QMI device",
-        .flags          = FLAG_WWAN,
-        .bind           = qmi_wwan_bind_shared,
-        .unbind         = qmi_wwan_unbind,
-        .manage_power   = qmi_wwan_manage_power,
-        .data           = BIT(3), /* interface whitelist bitmap */
-};
-
-static const struct driver_info qmi_wwan_force_int4 = {
-        .description    = "Qualcomm WWAN/QMI device",
-        .flags          = FLAG_WWAN,
-        .bind           = qmi_wwan_bind_shared,
-        .unbind         = qmi_wwan_unbind,
-        .manage_power   = qmi_wwan_manage_power,
-        .data           = BIT(4), /* interface whitelist bitmap */
-};
-
-/* Sierra Wireless provide equally useless interface descriptors
- * Devices in QMI mode can be switched between two different
- * configurations:
- *   a) USB interface #8 is QMI/wwan
- *   b) USB interfaces #8, #19 and #20 are QMI/wwan
- *
- * Both configurations provide a number of other interfaces (serial++),
- * some of which have the same endpoint configuration as we expect, so
- * a whitelist or blacklist is necessary.
- *
- * FIXME: The below whitelist should include BIT(20).  It does not
- * because I cannot get it to work...
- */
-static const struct driver_info qmi_wwan_sierra = {
-        .description    = "Sierra Wireless wwan/QMI device",
-        .flags          = FLAG_WWAN,
-        .bind           = qmi_wwan_bind_shared,
-        .unbind         = qmi_wwan_unbind,
-        .manage_power   = qmi_wwan_manage_power,
-        .data           = BIT(8) | BIT(19), /* interface whitelist bitmap */
-};
-
 #define HUAWEI_VENDOR_ID        0x12D1
 
+/* map QMI/wwan function by a fixed interface number */
+#define QMI_FIXED_INTF(vend, prod, num) \
+        USB_DEVICE_INTERFACE_NUMBER(vend, prod, num), \
+        .driver_info = (unsigned long)&qmi_wwan_shared
+
 /* Gobi 1000 QMI/wwan interface number is 3 according to qcserial */
 #define QMI_GOBI1K_DEVICE(vend, prod) \
-        USB_DEVICE(vend, prod), \
-        .driver_info = (unsigned long)&qmi_wwan_force_int3
+        QMI_FIXED_INTF(vend, prod, 3)
 
-/* Gobi 2000 and Gobi 3000 QMI/wwan interface number is 0 according to qcserial */
+/* Gobi 2000/3000 QMI/wwan interface number is 0 according to qcserial */
 #define QMI_GOBI_DEVICE(vend, prod) \
-        USB_DEVICE(vend, prod), \
-        .driver_info = (unsigned long)&qmi_wwan_force_int0
+        QMI_FIXED_INTF(vend, prod, 0)
 
 static const struct usb_device_id products[] = {
+        /* 1. CDC ECM like devices match on the control interface */
         {       /* Huawei E392, E398 and possibly others sharing both device id and more... */
-                .match_flags        = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_INT_INFO,
-                .idVendor           = HUAWEI_VENDOR_ID,
-                .bInterfaceClass    = USB_CLASS_VENDOR_SPEC,
-                .bInterfaceSubClass = 1,
-                .bInterfaceProtocol = 9, /* CDC Ethernet *control* interface */
+                USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, USB_CLASS_VENDOR_SPEC, 1, 9),
                 .driver_info        = (unsigned long)&qmi_wwan_info,
         },
         {       /* Vodafone/Huawei K5005 (12d1:14c8) and similar modems */
-                .match_flags        = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_INT_INFO,
-                .idVendor           = HUAWEI_VENDOR_ID,
-                .bInterfaceClass    = USB_CLASS_VENDOR_SPEC,
-                .bInterfaceSubClass = 1,
-                .bInterfaceProtocol = 57, /* CDC Ethernet *control* interface */
+                USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, USB_CLASS_VENDOR_SPEC, 1, 57),
                 .driver_info        = (unsigned long)&qmi_wwan_info,
         },
-        {       /* Huawei E392, E398 and possibly others in "Windows mode"
-                 * using a combined control and data interface without any CDC
-                 * functional descriptors
-                 */
-                .match_flags        = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_INT_INFO,
-                .idVendor           = HUAWEI_VENDOR_ID,
-                .bInterfaceClass    = USB_CLASS_VENDOR_SPEC,
-                .bInterfaceSubClass = 1,
-                .bInterfaceProtocol = 17,
+
+        /* 2. Combined interface devices matching on class+protocol */
+        {       /* Huawei E392, E398 and possibly others in "Windows mode" */
+                USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, USB_CLASS_VENDOR_SPEC, 1, 17),
                 .driver_info        = (unsigned long)&qmi_wwan_shared,
         },
         {       /* Pantech UML290 */
-                .match_flags        = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
-                .idVendor           = 0x106c,
-                .idProduct          = 0x3718,
-                .bInterfaceClass    = 0xff,
-                .bInterfaceSubClass = 0xf0,
-                .bInterfaceProtocol = 0xff,
+                USB_DEVICE_AND_INTERFACE_INFO(0x106c, 0x3718, USB_CLASS_VENDOR_SPEC, 0xf0, 0xff),
                 .driver_info        = (unsigned long)&qmi_wwan_shared,
         },
-        {       /* ZTE MF820D */
-                .match_flags        = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
-                .idVendor           = 0x19d2,
-                .idProduct          = 0x0167,
-                .bInterfaceClass    = 0xff,
-                .bInterfaceSubClass = 0xff,
-                .bInterfaceProtocol = 0xff,
-                .driver_info        = (unsigned long)&qmi_wwan_force_int4,
-        },
-        {       /* ZTE MF821D */
-                .match_flags        = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
-                .idVendor           = 0x19d2,
-                .idProduct          = 0x0326,
-                .bInterfaceClass    = 0xff,
-                .bInterfaceSubClass = 0xff,
-                .bInterfaceProtocol = 0xff,
-                .driver_info        = (unsigned long)&qmi_wwan_force_int4,
-        },
-        {       /* ZTE (Vodafone) K3520-Z */
-                .match_flags        = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
-                .idVendor           = 0x19d2,
-                .idProduct          = 0x0055,
-                .bInterfaceClass    = 0xff,
-                .bInterfaceSubClass = 0xff,
-                .bInterfaceProtocol = 0xff,
-                .driver_info        = (unsigned long)&qmi_wwan_force_int1,
-        },
-        {       /* ZTE (Vodafone) K3565-Z */
-                .match_flags        = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
-                .idVendor           = 0x19d2,
-                .idProduct          = 0x0063,
-                .bInterfaceClass    = 0xff,
-                .bInterfaceSubClass = 0xff,
-                .bInterfaceProtocol = 0xff,
-                .driver_info        = (unsigned long)&qmi_wwan_force_int4,
-        },
-        {       /* ZTE (Vodafone) K3570-Z */
-                .match_flags        = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
-                .idVendor           = 0x19d2,
-                .idProduct          = 0x1008,
-                .bInterfaceClass    = 0xff,
-                .bInterfaceSubClass = 0xff,
-                .bInterfaceProtocol = 0xff,
-                .driver_info        = (unsigned long)&qmi_wwan_force_int4,
-        },
-        {       /* ZTE (Vodafone) K3571-Z */
-                .match_flags        = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
-                .idVendor           = 0x19d2,
-                .idProduct          = 0x1010,
-                .bInterfaceClass    = 0xff,
-                .bInterfaceSubClass = 0xff,
-                .bInterfaceProtocol = 0xff,
-                .driver_info        = (unsigned long)&qmi_wwan_force_int4,
-        },
-        {       /* ZTE (Vodafone) K3765-Z */
-                .match_flags        = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
-                .idVendor           = 0x19d2,
-                .idProduct          = 0x2002,
-                .bInterfaceClass    = 0xff,
-                .bInterfaceSubClass = 0xff,
-                .bInterfaceProtocol = 0xff,
-                .driver_info        = (unsigned long)&qmi_wwan_force_int4,
-        },
-        {       /* ZTE (Vodafone) K4505-Z */
-                .match_flags        = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
-                .idVendor           = 0x19d2,
-                .idProduct          = 0x0104,
-                .bInterfaceClass    = 0xff,
-                .bInterfaceSubClass = 0xff,
-                .bInterfaceProtocol = 0xff,
-                .driver_info        = (unsigned long)&qmi_wwan_force_int4,
-        },
-        {       /* ZTE MF60 */
-                .match_flags        = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
-                .idVendor           = 0x19d2,
-                .idProduct          = 0x1402,
-                .bInterfaceClass    = 0xff,
-                .bInterfaceSubClass = 0xff,
-                .bInterfaceProtocol = 0xff,
-                .driver_info        = (unsigned long)&qmi_wwan_force_int2,
-        },
-        {       /* Sierra Wireless MC77xx in QMI mode */
-                .match_flags        = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
-                .idVendor           = 0x1199,
-                .idProduct          = 0x68a2,
-                .bInterfaceClass    = 0xff,
-                .bInterfaceSubClass = 0xff,
-                .bInterfaceProtocol = 0xff,
-                .driver_info        = (unsigned long)&qmi_wwan_sierra,
-        },
 
-        /* Gobi 1000 devices */
+        /* 3. Combined interface devices matching on interface number */
+        {QMI_FIXED_INTF(0x19d2, 0x0055, 1)},    /* ZTE (Vodafone) K3520-Z */
+        {QMI_FIXED_INTF(0x19d2, 0x0063, 4)},    /* ZTE (Vodafone) K3565-Z */
+        {QMI_FIXED_INTF(0x19d2, 0x0104, 4)},    /* ZTE (Vodafone) K4505-Z */
+        {QMI_FIXED_INTF(0x19d2, 0x0167, 4)},    /* ZTE MF820D */
+        {QMI_FIXED_INTF(0x19d2, 0x0326, 4)},    /* ZTE MF821D */
+        {QMI_FIXED_INTF(0x19d2, 0x1008, 4)},    /* ZTE (Vodafone) K3570-Z */
+        {QMI_FIXED_INTF(0x19d2, 0x1010, 4)},    /* ZTE (Vodafone) K3571-Z */
+        {QMI_FIXED_INTF(0x19d2, 0x1402, 2)},    /* ZTE MF60 */
+        {QMI_FIXED_INTF(0x19d2, 0x2002, 4)},    /* ZTE (Vodafone) K3765-Z */
+        {QMI_FIXED_INTF(0x0f3d, 0x68a2, 8)},    /* Sierra Wireless MC7700 */
+        {QMI_FIXED_INTF(0x114f, 0x68a2, 8)},    /* Sierra Wireless MC7750 */
+        {QMI_FIXED_INTF(0x1199, 0x68a2, 8)},    /* Sierra Wireless MC7710 in QMI mode */
+        {QMI_FIXED_INTF(0x1199, 0x68a2, 19)},   /* Sierra Wireless MC7710 in QMI mode */
+        {QMI_FIXED_INTF(0x1199, 0x901c, 8)},    /* Sierra Wireless EM7700 */
+
+        /* 4. Gobi 1000 devices */
         {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)},    /* Acer Gobi Modem Device */
         {QMI_GOBI1K_DEVICE(0x03f0, 0x1f1d)},    /* HP un2400 Gobi Modem Device */
         {QMI_GOBI1K_DEVICE(0x03f0, 0x371d)},    /* HP un2430 Mobile Broadband Module */
@@ -579,7 +406,7 @@ static const struct usb_device_id products[] = {
         {QMI_GOBI1K_DEVICE(0x05c6, 0x9222)},    /* Generic Gobi Modem device */
         {QMI_GOBI1K_DEVICE(0x05c6, 0x9009)},    /* Generic Gobi Modem device */
 
-        /* Gobi 2000 and 3000 devices */
+        /* 5. Gobi 2000 and 3000 devices */
         {QMI_GOBI_DEVICE(0x413c, 0x8186)},      /* Dell Gobi 2000 Modem device (N0218, VU936) */
         {QMI_GOBI_DEVICE(0x05c6, 0x920b)},      /* Generic Gobi 2000 Modem device */
         {QMI_GOBI_DEVICE(0x05c6, 0x9225)},      /* Sony Gobi 2000 Modem device (N0279, VU730) */
@@ -589,6 +416,8 @@ static const struct usb_device_id products[] = {
         {QMI_GOBI_DEVICE(0x05c6, 0x9265)},      /* Asus Gobi 2000 Modem device (VR305) */
         {QMI_GOBI_DEVICE(0x05c6, 0x9235)},      /* Top Global Gobi 2000 Modem device (VR306) */
         {QMI_GOBI_DEVICE(0x05c6, 0x9275)},      /* iRex Technologies Gobi 2000 Modem device (VR307) */
+        {QMI_GOBI_DEVICE(0x1199, 0x68a5)},      /* Sierra Wireless Modem */
+        {QMI_GOBI_DEVICE(0x1199, 0x68a9)},      /* Sierra Wireless Modem */
         {QMI_GOBI_DEVICE(0x1199, 0x9001)},      /* Sierra Wireless Gobi 2000 Modem device (VT773) */
         {QMI_GOBI_DEVICE(0x1199, 0x9002)},      /* Sierra Wireless Gobi 2000 Modem device (VT773) */
         {QMI_GOBI_DEVICE(0x1199, 0x9003)},      /* Sierra Wireless Gobi 2000 Modem device (VT773) */
@@ -600,11 +429,14 @@ static const struct usb_device_id products[] = {
         {QMI_GOBI_DEVICE(0x1199, 0x9009)},      /* Sierra Wireless Gobi 2000 Modem device (VT773) */
         {QMI_GOBI_DEVICE(0x1199, 0x900a)},      /* Sierra Wireless Gobi 2000 Modem device (VT773) */
         {QMI_GOBI_DEVICE(0x1199, 0x9011)},      /* Sierra Wireless Gobi 2000 Modem device (MC8305) */
+        {QMI_FIXED_INTF(0x1199, 0x9011, 5)},    /* alternate interface number!? */
         {QMI_GOBI_DEVICE(0x16d8, 0x8002)},      /* CMDTech Gobi 2000 Modem device (VU922) */
         {QMI_GOBI_DEVICE(0x05c6, 0x9205)},      /* Gobi 2000 Modem device */
         {QMI_GOBI_DEVICE(0x1199, 0x9013)},      /* Sierra Wireless Gobi 3000 Modem device (MC8355) */
         {QMI_GOBI_DEVICE(0x1199, 0x9015)},      /* Sierra Wireless Gobi 3000 Modem device */
         {QMI_GOBI_DEVICE(0x1199, 0x9019)},      /* Sierra Wireless Gobi 3000 Modem device */
+        {QMI_GOBI_DEVICE(0x1199, 0x901b)},      /* Sierra Wireless MC7770 */
+
         { }                                     /* END */
 };
 MODULE_DEVICE_TABLE(usb, products);
diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
index d75d1f56becf..7be49ea60b6d 100644
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@ -68,15 +68,8 @@ static	atomic_t iface_counter = ATOMIC_INIT(0);
  */
 #define SIERRA_NET_USBCTL_BUF_LEN       1024
 
-/* list of interface numbers - used for constructing interface lists */
-struct sierra_net_iface_info {
-        const u32 infolen;      /* number of interface numbers on list */
-        const u8  *ifaceinfo;   /* pointer to the array holding the numbers */
-};
-
 struct sierra_net_info_data {
         u16 rx_urb_size;
-        struct sierra_net_iface_info whitelist;
 };
 
 /* Private data structure */
@@ -637,21 +630,6 @@ static int sierra_net_change_mtu(struct net_device *net, int new_mtu)
         return usbnet_change_mtu(net, new_mtu);
 }
 
-static int is_whitelisted(const u8 ifnum,
-                        const struct sierra_net_iface_info *whitelist)
-{
-        if (whitelist) {
-                const u8 *list = whitelist->ifaceinfo;
-                int i;
-
-                for (i = 0; i < whitelist->infolen; i++) {
-                        if (list[i] == ifnum)
-                                return 1;
-                }
-        }
-        return 0;
-}
-
 static int sierra_net_get_fw_attr(struct usbnet *dev, u16 *datap)
 {
         int result = 0;
@@ -706,11 +684,6 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
         dev_dbg(&dev->udev->dev, "%s", __func__);
 
         ifacenum = intf->cur_altsetting->desc.bInterfaceNumber;
-        /* We only accept certain interfaces */
-        if (!is_whitelisted(ifacenum, &data->whitelist)) {
-                dev_dbg(&dev->udev->dev, "Ignoring interface: %d", ifacenum);
-                return -ENODEV;
-        }
         numendpoints = intf->cur_altsetting->desc.bNumEndpoints;
         /* We have three endpoints, bulk in and out, and a status */
         if (numendpoints != 3) {
@@ -945,13 +918,8 @@ struct sk_buff *sierra_net_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
         return NULL;
 }
 
-static const u8 sierra_net_ifnum_list[] = { 7, 10, 11 };
 static const struct sierra_net_info_data sierra_net_info_data_direct_ip = {
         .rx_urb_size = 8 * 1024,
-        .whitelist = {
-                .infolen = ARRAY_SIZE(sierra_net_ifnum_list),
-                .ifaceinfo = sierra_net_ifnum_list
-        }
 };
 
 static const struct driver_info sierra_net_info_direct_ip = {
@@ -965,15 +933,19 @@ static const struct driver_info sierra_net_info_direct_ip = {
         .data = (unsigned long)&sierra_net_info_data_direct_ip,
 };
 
+#define DIRECT_IP_DEVICE(vend, prod) \
+        {USB_DEVICE_INTERFACE_NUMBER(vend, prod, 7), \
+        .driver_info = (unsigned long)&sierra_net_info_direct_ip}, \
+        {USB_DEVICE_INTERFACE_NUMBER(vend, prod, 10), \
+        .driver_info = (unsigned long)&sierra_net_info_direct_ip}, \
+        {USB_DEVICE_INTERFACE_NUMBER(vend, prod, 11), \
+        .driver_info = (unsigned long)&sierra_net_info_direct_ip}
+
 static const struct usb_device_id products[] = {
-        {USB_DEVICE(0x1199, 0x68A3), /* Sierra Wireless USB-to-WWAN modem */
-        .driver_info = (unsigned long) &sierra_net_info_direct_ip},
-        {USB_DEVICE(0x0F3D, 0x68A3), /* AT&T Direct IP modem */
-        .driver_info = (unsigned long) &sierra_net_info_direct_ip},
-        {USB_DEVICE(0x1199, 0x68AA), /* Sierra Wireless Direct IP LTE modem */
-        .driver_info = (unsigned long) &sierra_net_info_direct_ip},
-        {USB_DEVICE(0x0F3D, 0x68AA), /* AT&T Direct IP LTE modem */
-        .driver_info = (unsigned long) &sierra_net_info_direct_ip},
+        DIRECT_IP_DEVICE(0x1199, 0x68A3), /* Sierra Wireless USB-to-WWAN modem */
+        DIRECT_IP_DEVICE(0x0F3D, 0x68A3), /* AT&T Direct IP modem */
+        DIRECT_IP_DEVICE(0x1199, 0x68AA), /* Sierra Wireless Direct IP LTE modem */
+        DIRECT_IP_DEVICE(0x0F3D, 0x68AA), /* AT&T Direct IP LTE modem */
 
         {}, /* last item */
 };