CHROMIUM: qcusbnet: Add gobi3k support.

drivers/net/usb/gobi/qcusbnet.c

 /* qcusbnet.c - gobi network device
  * Copyright (c) 2010, Code Aurora Forum. All rights reserved.
 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
  * only version 2 as published by the Free Software Foundation.
 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
  */
 
 #include "structs.h"
 #include "qmidevice.h"
 #include "qmi.h"
 #include "qcusbnet.h"
 
 #define DRIVER_VERSION "1.0.110"

[Jason Glasgow, 2011/03/10 20:58:40]

As you change the driver do you want to change the version string?

 #define DRIVER_AUTHOR "Qualcomm Innovation Center"
 #define DRIVER_DESC "QCUSBNet2k"

[Jason Glasgow, 2011/03/10 20:58:40]

Is 2k correct?  gobi?

 
 int qcusbnet_debug;
 static struct class *devclass;
 
 int qc_suspend(struct usb_interface *iface, pm_message_t event)
 {
         struct usbnet *usbnet;
         struct qcusbnet *dev;
 
         if (!iface)
@@ skipping 88 matching lines @@
         int i;
         struct usb_host_endpoint *endpoint = NULL;
         struct usb_host_endpoint *in = NULL;
         struct usb_host_endpoint *out = NULL;
 
         if (iface->num_altsetting != 1) {
                 DBG("invalid num_altsetting %u\n", iface->num_altsetting);
                 return -EINVAL;
         }
 
-        if (iface->cur_altsetting->desc.bInterfaceNumber != 0) {
+        if (iface->cur_altsetting->desc.bInterfaceNumber != 0
+            && iface->cur_altsetting->desc.bInterfaceNumber != 5) {
                 DBG("invalid interface %d\n",
                           iface->cur_altsetting->desc.bInterfaceNumber);
                 return -EINVAL;
         }
 
         numends = iface->cur_altsetting->desc.bNumEndpoints;
         for (i = 0; i < numends; i++) {
                 endpoint = iface->cur_altsetting->endpoint + i;
                 if (!endpoint) {
                         DBG("invalid endpoint %u\n", i);
@@ skipping 378 matching lines @@
         MKVIDPID(0x1199, 0x9004),       /* Sierra Wireless Gobi 2000 */
         MKVIDPID(0x1199, 0x9005),       /* Sierra Wireless Gobi 2000 */
         MKVIDPID(0x1199, 0x9006),       /* Sierra Wireless Gobi 2000 */
         MKVIDPID(0x1199, 0x9007),       /* Sierra Wireless Gobi 2000 */
         MKVIDPID(0x1199, 0x9008),       /* Sierra Wireless Gobi 2000 */
         MKVIDPID(0x1199, 0x9009),       /* Sierra Wireless Gobi 2000 */
         MKVIDPID(0x1199, 0x900a),       /* Sierra Wireless Gobi 2000 */
         MKVIDPID(0x05c6, 0x9225),       /* Sony Gobi 2000 */
         MKVIDPID(0x05c6, 0x9235),       /* Top Global Gobi 2000 */
         MKVIDPID(0x05c6, 0x9275),       /* iRex Technologies Gobi 2000 */
+
+        MKVIDPID(0x05c6, 0x920d),       /* Qualcomm Gobi 3000 */
+        MKVIDPID(0x1410, 0xa021),       /* Novatel Gobi 3000 */
         { }
 };
 
 MODULE_DEVICE_TABLE(usb, qc_vidpids);
 
 int qcnet_probe(struct usb_interface *iface, const struct usb_device_id *vidpids)
 {
         int status;
         struct usbnet *usbnet;
         struct qcusbnet *dev;
@@ skipping 61 matching lines @@
         status = qc_register(dev);
         if (status) {
                 qc_deregister(dev);
         }
 
         return status;
 }
 EXPORT_SYMBOL_GPL(qcnet_probe);
 
 static struct usb_driver qcusbnet = {
-        .name       = "QCUSBNet2k",
+        .name       = "gobi",
         .id_table   = qc_vidpids,
         .probe      = qcnet_probe,
         .disconnect = usbnet_disconnect,
         .suspend    = qc_suspend,
         .resume     = qc_resume,
         .supports_autosuspend = true,
 };
 
 static int __init modinit(void)
 {
@@ skipping 14 matching lines @@
 }
 module_exit(modexit);
 
 MODULE_VERSION(DRIVER_VERSION);
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("Dual BSD/GPL");
 
 module_param(qcusbnet_debug, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(qcusbnet_debug, "Debugging enabled or not");