]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
ath9k_htc: Set proper firmware offset for Netgear WNDA3200
authorRajkumar Manoharan <rmanoharan@atheros.com>
Wed, 27 Oct 2010 06:32:54 +0000 (12:02 +0530)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 27 Oct 2010 19:46:50 +0000 (15:46 -0400)
Netgear WNDA3200 device uses ar7010 firmware but it is failed to set
correct firmware offset on firmware download which causes device initialization
failure.

Cc: stable@kernel.org
Signed-off-by: Rajkumar Manoharan <rmanoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/hif_usb.c

index 728d904c74d7d30408231c90b46a2cfe95f3e2a9..6576f683dba06c24611160cd068060032bbd9bfd 100644 (file)
@@ -801,10 +801,16 @@ static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev)
        }
        kfree(buf);
 
-       if ((hif_dev->device_id == 0x7010) || (hif_dev->device_id == 0x7015))
+       switch (hif_dev->device_id) {
+       case 0x7010:
+       case 0x7015:
+       case 0x9018:
                firm_offset = AR7010_FIRMWARE_TEXT;
-       else
+               break;
+       default:
                firm_offset = AR9271_FIRMWARE_TEXT;
+               break;
+       }
 
        /*
         * Issue FW download complete command to firmware.