ath9k_htc: Update supported product list

This patch adds USB IDs for some more supported
devices.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
index 5f3ea7091ae085240b64ae519d2c2534c9bda15e..74bc80f502920bfe4065b750286c814ccd90cb36 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -17,9 +17,17 @@
 #include "htc.h"
 
 static struct usb_device_id ath9k_hif_usb_ids[] = {
-       { USB_DEVICE(0x0cf3, 0x9271) },
-       { USB_DEVICE(0x0cf3, 0x1006) },
-       { USB_DEVICE(0x0cf3, 0x7010) },
+       { USB_DEVICE(0x0cf3, 0x9271) }, /* Atheros */
+       { USB_DEVICE(0x0cf3, 0x1006) }, /* Atheros */
+       { USB_DEVICE(0x0cf3, 0x7010) }, /* Atheros */
+       { USB_DEVICE(0x0cf3, 0x7015) }, /* Atheros */
+       { USB_DEVICE(0x0846, 0x9030) }, /* Netgear N150 */
+       { USB_DEVICE(0x0846, 0x9018) }, /* Netgear WNDA3200 */
+       { USB_DEVICE(0x07D1, 0x3A10) }, /* Dlink Wireless 150 */
+       { USB_DEVICE(0x13D3, 0x3327) }, /* Azurewave */
+       { USB_DEVICE(0x13D3, 0x3328) }, /* Azurewave */
+       { USB_DEVICE(0x04CA, 0x4605) }, /* Liteon */
+       { USB_DEVICE(0x083A, 0xA704) }, /* SMC Networks */
        { },
 };
 
@@ -879,17 +887,15 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface,
        /* Find out which firmware to load */
 
        switch(hif_dev->device_id) {
-       case 0x9271:
-       case 0x1006:
-               hif_dev->fw_name = "ar9271.fw";
-               break;
        case 0x7010:
+       case 0x9018:
                if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x0202)
                        hif_dev->fw_name = "ar7010_1_1.fw";
                else
                        hif_dev->fw_name = "ar7010.fw";
                break;
        default:
+               hif_dev->fw_name = "ar9271.fw";
                break;
        }
 

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index a63ae88abf3e8e102955a7e3674140339dee5f55..148b43317fdb1d6b78502ff42d208b197be28c33 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -244,17 +244,12 @@ static int ath9k_init_htc_services(struct ath9k_htc_priv *priv, u16 devid)
         */
 
        switch(devid) {
-       case 0x9271:
-       case 0x1006:
-               priv->htc->credits = 33;
-               break;
        case 0x7010:
+       case 0x9018:
                priv->htc->credits = 45;
                break;
        default:
-               dev_err(priv->dev, "ath9k_htc: Unsupported device id: 0x%x\n",
-                       devid);
-               goto err;
+               priv->htc->credits = 33;
        }
 
        ret = htc_init(priv->htc);