Merge tag 'master-2014-07-25' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

John W. Linville says:

====================
pull request: wireless-next 2014-07-25

Please pull this batch of updates intended for the 3.17 stream!

For the mac80211 bits, Johannes says:

"We have a lot of TDLS patches, among them a fix that should make hwsim
tests happy again. The rest, this time, is mostly small fixes."

For the Bluetooth bits, Gustavo says:

"Some more patches for 3.17. The most important change here is the move of
the 6lowpan code to net/6lowpan. It has been agreed with Davem that this
change will go through the bluetooth tree. The rest are mostly clean up and
fixes."

and,

"Here follows some more patches for 3.17. These are mostly fixes to what
we've sent to you before for next merge window."

For the iwlwifi bits, Emmanuel says:

"I have the usual amount of BT Coex stuff. Arik continues to work
on TDLS and Ariej contributes a few things for HS2.0. I added a few
more things to the firmware debugging infrastructure. Eran fixes a
small bug - pretty normal content."

And for the Atheros bits, Kalle says:

"For ath6kl me and Jessica added support for ar6004 hw3.0, our latest
version of ar6004.

For ath10k Janusz added a printout so that it's easier to check what
ath10k kconfig options are enabled. He also added a debugfs file to
configure maximum amsdu and ampdu values. Also we had few fixes as
usual."

On top of that is the usual large batch of various driver updates --
brcmfmac, mwifiex, the TI drivers, and wil6210 all get some action.
Rafał has also been very busy with b43 and related updates.

Also, I pulled the wireless tree into this in order to resolve a
merge conflict...

P.S.  The change to fs/compat_ioctl.c reflects a name change in a
Bluetooth header file...
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

10 files changed, 239 insertions, 42 deletions

diff --git a/drivers/net/wireless/ath/ath6kl/bmi.h b/drivers/net/wireless/ath/ath6kl/bmi.h
index 18fdd69e1f71..397a52f2628b 100644
--- a/drivers/net/wireless/ath/ath6kl/bmi.h
+++ b/drivers/net/wireless/ath/ath6kl/bmi.h
@@ -242,7 +242,8 @@ struct ath6kl_bmi_target_info {
                 (void) (check_type == val);                             \
                 addr = ath6kl_get_hi_item_addr(ar, HI_ITEM(item));      \
                 ret = ath6kl_bmi_read(ar, addr, (u8 *) &tmp, 4);        \
-                *val = le32_to_cpu(tmp);                                \
+                if (!ret)                                               \
+                        *val = le32_to_cpu(tmp);                        \
                 ret;                                                    \
         })
 
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 1c4ce8e3eebe..e535807c3d89 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -2899,7 +2899,8 @@ static int ath6kl_start_ap(struct wiphy *wiphy, struct net_device *dev,
         if (info->inactivity_timeout) {
                 inactivity_timeout = info->inactivity_timeout;
 
-                if (ar->hw.flags & ATH6KL_HW_AP_INACTIVITY_MINS)
+                if (test_bit(ATH6KL_FW_CAPABILITY_AP_INACTIVITY_MINS,
+                             ar->fw_capabilities))
                         inactivity_timeout = DIV_ROUND_UP(inactivity_timeout,
                                                           60);
 
@@ -3782,7 +3783,8 @@ int ath6kl_cfg80211_init(struct ath6kl *ar)
                 ath6kl_band_5ghz.ht_cap.ht_supported = false;
         }
 
-        if (ar->hw.flags & ATH6KL_HW_64BIT_RATES) {
+        if (test_bit(ATH6KL_FW_CAPABILITY_64BIT_RATES,
+                     ar->fw_capabilities)) {
                 ath6kl_band_2ghz.ht_cap.mcs.rx_mask[0] = 0xff;
                 ath6kl_band_5ghz.ht_cap.mcs.rx_mask[0] = 0xff;
                 ath6kl_band_2ghz.ht_cap.mcs.rx_mask[1] = 0xff;
diff --git a/drivers/net/wireless/ath/ath6kl/core.c b/drivers/net/wireless/ath/ath6kl/core.c
index b0b652042760..0df74b245af4 100644
--- a/drivers/net/wireless/ath/ath6kl/core.c
+++ b/drivers/net/wireless/ath/ath6kl/core.c
@@ -123,6 +123,22 @@ int ath6kl_core_init(struct ath6kl *ar, enum ath6kl_htc_type htc_type)
 
         /* FIXME: we should free all firmwares in the error cases below */
 
+        /*
+         * Backwards compatibility support for older ar6004 firmware images
+         * which do not set these feature flags.
+         */
+        if (ar->target_type == TARGET_TYPE_AR6004 &&
+            ar->fw_api <= 4) {
+                __set_bit(ATH6KL_FW_CAPABILITY_64BIT_RATES,
+                          ar->fw_capabilities);
+                __set_bit(ATH6KL_FW_CAPABILITY_AP_INACTIVITY_MINS,
+                          ar->fw_capabilities);
+
+                if (ar->hw.id == AR6004_HW_1_3_VERSION)
+                        __set_bit(ATH6KL_FW_CAPABILITY_MAP_LP_ENDPOINT,
+                                  ar->fw_capabilities);
+        }
+
         /* Indicate that WMI is enabled (although not ready yet) */
         set_bit(WMI_ENABLED, &ar->flag);
         ar->wmi = ath6kl_wmi_init(ar);
diff --git a/drivers/net/wireless/ath/ath6kl/core.h b/drivers/net/wireless/ath/ath6kl/core.h
index 26b0f92424e1..2b78c863d030 100644
--- a/drivers/net/wireless/ath/ath6kl/core.h
+++ b/drivers/net/wireless/ath/ath6kl/core.h
@@ -136,6 +136,21 @@ enum ath6kl_fw_capability {
          */
         ATH6KL_FW_CAPABILITY_HEART_BEAT_POLL,
 
+        /* WMI_SET_TX_SELECT_RATES_CMDID uses 64 bit size rate table */
+        ATH6KL_FW_CAPABILITY_64BIT_RATES,
+
+        /* WMI_AP_CONN_INACT_CMDID uses minutes as units */
+        ATH6KL_FW_CAPABILITY_AP_INACTIVITY_MINS,
+
+        /* use low priority endpoint for all data */
+        ATH6KL_FW_CAPABILITY_MAP_LP_ENDPOINT,
+
+        /* ratetable is the 2 stream version (max MCS15) */
+        ATH6KL_FW_CAPABILITY_RATETABLE_MCS15,
+
+        /* firmare doesn't support IP checksumming */
+        ATH6KL_FW_CAPABILITY_NO_IP_CHECKSUM,
+
         /* this needs to be last */
         ATH6KL_FW_CAPABILITY_MAX,
 };
@@ -149,15 +164,13 @@ struct ath6kl_fw_ie {
 };
 
 enum ath6kl_hw_flags {
-        ATH6KL_HW_64BIT_RATES           = BIT(0),
-        ATH6KL_HW_AP_INACTIVITY_MINS    = BIT(1),
-        ATH6KL_HW_MAP_LP_ENDPOINT       = BIT(2),
         ATH6KL_HW_SDIO_CRC_ERROR_WAR    = BIT(3),
 };
 
 #define ATH6KL_FW_API2_FILE "fw-2.bin"
 #define ATH6KL_FW_API3_FILE "fw-3.bin"
 #define ATH6KL_FW_API4_FILE "fw-4.bin"
+#define ATH6KL_FW_API5_FILE "fw-5.bin"
 
 /* AR6003 1.0 definitions */
 #define AR6003_HW_1_0_VERSION                 0x300002ba
@@ -215,8 +228,21 @@ enum ath6kl_hw_flags {
 #define AR6004_HW_1_3_VERSION                   0x31c8088a
 #define AR6004_HW_1_3_FW_DIR                    "ath6k/AR6004/hw1.3"
 #define AR6004_HW_1_3_FIRMWARE_FILE             "fw.ram.bin"
-#define AR6004_HW_1_3_BOARD_DATA_FILE           "ath6k/AR6004/hw1.3/bdata.bin"
-#define AR6004_HW_1_3_DEFAULT_BOARD_DATA_FILE   "ath6k/AR6004/hw1.3/bdata.bin"
+#define AR6004_HW_1_3_TCMD_FIRMWARE_FILE        "utf.bin"
+#define AR6004_HW_1_3_UTF_FIRMWARE_FILE         "utf.bin"
+#define AR6004_HW_1_3_TESTSCRIPT_FILE           "nullTestFlow.bin"
+#define AR6004_HW_1_3_BOARD_DATA_FILE         AR6004_HW_1_3_FW_DIR "/bdata.bin"
+#define AR6004_HW_1_3_DEFAULT_BOARD_DATA_FILE AR6004_HW_1_3_FW_DIR "/bdata.bin"
+
+/* AR6004 3.0 definitions */
+#define AR6004_HW_3_0_VERSION                   0x31C809F8
+#define AR6004_HW_3_0_FW_DIR                    "ath6k/AR6004/hw3.0"
+#define AR6004_HW_3_0_FIRMWARE_FILE             "fw.ram.bin"
+#define AR6004_HW_3_0_TCMD_FIRMWARE_FILE        "utf.bin"
+#define AR6004_HW_3_0_UTF_FIRMWARE_FILE         "utf.bin"
+#define AR6004_HW_3_0_TESTSCRIPT_FILE           "nullTestFlow.bin"
+#define AR6004_HW_3_0_BOARD_DATA_FILE         AR6004_HW_3_0_FW_DIR "/bdata.bin"
+#define AR6004_HW_3_0_DEFAULT_BOARD_DATA_FILE AR6004_HW_3_0_FW_DIR "/bdata.bin"
 
 /* Per STA data, used in AP mode */
 #define STA_PS_AWAKE            BIT(0)
diff --git a/drivers/net/wireless/ath/ath6kl/htc_pipe.c b/drivers/net/wireless/ath/ath6kl/htc_pipe.c
index 756fe52a12c8..ca1a18c86c0d 100644
--- a/drivers/net/wireless/ath/ath6kl/htc_pipe.c
+++ b/drivers/net/wireless/ath/ath6kl/htc_pipe.c
@@ -1170,8 +1170,12 @@ static int htc_wait_recv_ctrl_message(struct htc_target *target)
 static void htc_rxctrl_complete(struct htc_target *context,
                                 struct htc_packet *packet)
 {
-        /* TODO, can't really receive HTC control messages yet.... */
-        ath6kl_dbg(ATH6KL_DBG_HTC, "%s: invalid call function\n", __func__);
+        struct sk_buff *skb = packet->skb;
+
+        if (packet->endpoint == ENDPOINT_0 &&
+            packet->status == -ECANCELED &&
+            skb != NULL)
+                dev_kfree_skb(skb);
 }
 
 /* htc pipe initialization */
@@ -1678,7 +1682,29 @@ static void ath6kl_htc_pipe_activity_changed(struct htc_target *target,
 
 static void ath6kl_htc_pipe_flush_rx_buf(struct htc_target *target)
 {
-        /* TODO */
+        struct htc_endpoint *endpoint;
+        struct htc_packet *packet, *tmp_pkt;
+        int i;
+
+        for (i = ENDPOINT_0; i < ENDPOINT_MAX; i++) {
+                endpoint = &target->endpoint[i];
+
+                spin_lock_bh(&target->rx_lock);
+
+                list_for_each_entry_safe(packet, tmp_pkt,
+                                         &endpoint->rx_bufq, list) {
+                        list_del(&packet->list);
+                        spin_unlock_bh(&target->rx_lock);
+                        ath6kl_dbg(ATH6KL_DBG_HTC,
+                                   "htc rx flush pkt 0x%p len %d ep %d\n",
+                                   packet, packet->buf_len,
+                                   packet->endpoint);
+                        dev_kfree_skb(packet->pkt_cntxt);
+                        spin_lock_bh(&target->rx_lock);
+                }
+
+                spin_unlock_bh(&target->rx_lock);
+        }
 }
 
 static int ath6kl_htc_pipe_credit_setup(struct htc_target *target,
diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c
index 8ee7097f0b25..fffd52355123 100644
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@ -93,8 +93,7 @@ static const struct ath6kl_hw hw_list[] = {
                 .board_addr                     = 0x433900,
                 .refclk_hz                      = 26000000,
                 .uarttx_pin                     = 11,
-                .flags                          = ATH6KL_HW_64BIT_RATES |
-                                                  ATH6KL_HW_AP_INACTIVITY_MINS,
+                .flags                          = 0,
 
                 .fw = {
                         .dir            = AR6004_HW_1_0_FW_DIR,
@@ -114,8 +113,7 @@ static const struct ath6kl_hw hw_list[] = {
                 .board_addr                     = 0x43d400,
                 .refclk_hz                      = 40000000,
                 .uarttx_pin                     = 11,
-                .flags                          = ATH6KL_HW_64BIT_RATES |
-                                                  ATH6KL_HW_AP_INACTIVITY_MINS,
+                .flags                          = 0,
                 .fw = {
                         .dir            = AR6004_HW_1_1_FW_DIR,
                         .fw             = AR6004_HW_1_1_FIRMWARE_FILE,
@@ -134,8 +132,7 @@ static const struct ath6kl_hw hw_list[] = {
                 .board_addr                     = 0x435c00,
                 .refclk_hz                      = 40000000,
                 .uarttx_pin                     = 11,
-                .flags                          = ATH6KL_HW_64BIT_RATES |
-                                                  ATH6KL_HW_AP_INACTIVITY_MINS,
+                .flags                          = 0,
 
                 .fw = {
                         .dir            = AR6004_HW_1_2_FW_DIR,
@@ -152,20 +149,43 @@ static const struct ath6kl_hw hw_list[] = {
                 .board_ext_data_addr            = 0x437000,
                 .reserved_ram_size              = 7168,
                 .board_addr                     = 0x436400,
-                .refclk_hz                      = 40000000,
+                .refclk_hz                      = 0,
                 .uarttx_pin                     = 11,
-                .flags                          = ATH6KL_HW_64BIT_RATES |
-                                                  ATH6KL_HW_AP_INACTIVITY_MINS |
-                                                  ATH6KL_HW_MAP_LP_ENDPOINT,
+                .flags                          = 0,
 
                 .fw = {
                         .dir            = AR6004_HW_1_3_FW_DIR,
                         .fw             = AR6004_HW_1_3_FIRMWARE_FILE,
+                        .tcmd           = AR6004_HW_1_3_TCMD_FIRMWARE_FILE,
+                        .utf            = AR6004_HW_1_3_UTF_FIRMWARE_FILE,
+                        .testscript     = AR6004_HW_1_3_TESTSCRIPT_FILE,
                 },
 
                 .fw_board               = AR6004_HW_1_3_BOARD_DATA_FILE,
                 .fw_default_board       = AR6004_HW_1_3_DEFAULT_BOARD_DATA_FILE,
         },
+        {
+                .id                             = AR6004_HW_3_0_VERSION,
+                .name                           = "ar6004 hw 3.0",
+                .dataset_patch_addr             = 0,
+                .app_load_addr                  = 0x1234,
+                .board_ext_data_addr            = 0,
+                .reserved_ram_size              = 7168,
+                .board_addr                     = 0x436400,
+                .testscript_addr                = 0,
+                .flags                          = 0,
+
+                .fw = {
+                        .dir            = AR6004_HW_3_0_FW_DIR,
+                        .fw             = AR6004_HW_3_0_FIRMWARE_FILE,
+                        .tcmd           = AR6004_HW_3_0_TCMD_FIRMWARE_FILE,
+                        .utf            = AR6004_HW_3_0_UTF_FIRMWARE_FILE,
+                        .testscript     = AR6004_HW_3_0_TESTSCRIPT_FILE,
+                },
+
+                .fw_board               = AR6004_HW_3_0_BOARD_DATA_FILE,
+                .fw_default_board       = AR6004_HW_3_0_DEFAULT_BOARD_DATA_FILE,
+        },
 };
 
 /*
@@ -601,7 +621,9 @@ int ath6kl_configure_target(struct ath6kl *ar)
          * but possible in theory.
          */
 
-        if (ar->target_type == TARGET_TYPE_AR6003) {
+        if ((ar->target_type == TARGET_TYPE_AR6003) ||
+            (ar->version.target_ver == AR6004_HW_1_3_VERSION) ||
+            (ar->version.target_ver == AR6004_HW_3_0_VERSION)) {
                 param = ar->hw.board_ext_data_addr;
                 ram_reserved_size = ar->hw.reserved_ram_size;
 
@@ -629,9 +651,12 @@ int ath6kl_configure_target(struct ath6kl *ar)
                 return status;
 
         /* Configure target refclk_hz */
-        status = ath6kl_bmi_write_hi32(ar, hi_refclk_hz, ar->hw.refclk_hz);
-        if (status)
-                return status;
+        if (ar->hw.refclk_hz != 0) {
+                status = ath6kl_bmi_write_hi32(ar, hi_refclk_hz,
+                                               ar->hw.refclk_hz);
+                if (status)
+                        return status;
+        }
 
         return 0;
 }
@@ -1112,6 +1137,12 @@ int ath6kl_init_fetch_firmwares(struct ath6kl *ar)
         if (ret)
                 return ret;
 
+        ret = ath6kl_fetch_fw_apin(ar, ATH6KL_FW_API5_FILE);
+        if (ret == 0) {
+                ar->fw_api = 5;
+                goto out;
+        }
+
         ret = ath6kl_fetch_fw_apin(ar, ATH6KL_FW_API4_FILE);
         if (ret == 0) {
                 ar->fw_api = 4;
@@ -1161,11 +1192,19 @@ static int ath6kl_upload_board_file(struct ath6kl *ar)
                 ath6kl_bmi_write_hi32(ar, hi_board_data,
                                       board_address);
         } else {
-                ath6kl_bmi_read_hi32(ar, hi_board_data, &board_address);
+                ret = ath6kl_bmi_read_hi32(ar, hi_board_data, &board_address);
+                if (ret) {
+                        ath6kl_err("Failed to get board file target address.\n");
+                        return ret;
+                }
         }
 
         /* determine where in target ram to write extended board data */
-        ath6kl_bmi_read_hi32(ar, hi_board_ext_data, &board_ext_address);
+        ret = ath6kl_bmi_read_hi32(ar, hi_board_ext_data, &board_ext_address);
+        if (ret) {
+                ath6kl_err("Failed to get extended board file target address.\n");
+                return ret;
+        }
 
         if (ar->target_type == TARGET_TYPE_AR6003 &&
             board_ext_address == 0) {
@@ -1229,7 +1268,13 @@ static int ath6kl_upload_board_file(struct ath6kl *ar)
         }
 
         /* record the fact that Board Data IS initialized */
-        ath6kl_bmi_write_hi32(ar, hi_board_data_initialized, 1);
+        if ((ar->version.target_ver == AR6004_HW_1_3_VERSION) ||
+            (ar->version.target_ver == AR6004_HW_3_0_VERSION))
+                param = board_data_size;
+        else
+                param = 1;
+
+        ath6kl_bmi_write_hi32(ar, hi_board_data_initialized, param);
 
         return ret;
 }
@@ -1360,7 +1405,11 @@ static int ath6kl_upload_testscript(struct ath6kl *ar)
         }
 
         ath6kl_bmi_write_hi32(ar, hi_ota_testscript, address);
-        ath6kl_bmi_write_hi32(ar, hi_end_ram_reserve_sz, 4096);
+
+        if ((ar->version.target_ver != AR6004_HW_1_3_VERSION) &&
+            (ar->version.target_ver != AR6004_HW_3_0_VERSION))
+                ath6kl_bmi_write_hi32(ar, hi_end_ram_reserve_sz, 4096);
+
         ath6kl_bmi_write_hi32(ar, hi_test_apps_related, 1);
 
         return 0;
@@ -1566,6 +1615,11 @@ static const struct fw_capa_str_map {
         { ATH6KL_FW_CAPABILITY_REGDOMAIN, "regdomain" },
         { ATH6KL_FW_CAPABILITY_SCHED_SCAN_V2, "sched-scan-v2" },
         { ATH6KL_FW_CAPABILITY_HEART_BEAT_POLL, "hb-poll" },
+        { ATH6KL_FW_CAPABILITY_64BIT_RATES, "64bit-rates" },
+        { ATH6KL_FW_CAPABILITY_AP_INACTIVITY_MINS, "ap-inactivity-mins" },
+        { ATH6KL_FW_CAPABILITY_MAP_LP_ENDPOINT, "map-lp-endpoint" },
+        { ATH6KL_FW_CAPABILITY_RATETABLE_MCS15, "ratetable-mcs15" },
+        { ATH6KL_FW_CAPABILITY_NO_IP_CHECKSUM, "no-ip-checksum" },
 };
 
 static const char *ath6kl_init_get_fw_capa_name(unsigned int id)
diff --git a/drivers/net/wireless/ath/ath6kl/main.c b/drivers/net/wireless/ath/ath6kl/main.c
index d56554674da4..21516bc65785 100644
--- a/drivers/net/wireless/ath/ath6kl/main.c
+++ b/drivers/net/wireless/ath/ath6kl/main.c
@@ -702,6 +702,7 @@ static void ath6kl_update_target_stats(struct ath6kl_vif *vif, u8 *ptr, u32 len)
         struct ath6kl *ar = vif->ar;
         struct target_stats *stats = &vif->target_stats;
         struct tkip_ccmp_stats *ccmp_stats;
+        s32 rate;
         u8 ac;
 
         if (len < sizeof(*tgt_stats))
@@ -731,8 +732,9 @@ static void ath6kl_update_target_stats(struct ath6kl_vif *vif, u8 *ptr, u32 len)
                 le32_to_cpu(tgt_stats->stats.tx.mult_retry_cnt);
         stats->tx_rts_fail_cnt +=
                 le32_to_cpu(tgt_stats->stats.tx.rts_fail_cnt);
-        stats->tx_ucast_rate =
-            ath6kl_wmi_get_rate(a_sle32_to_cpu(tgt_stats->stats.tx.ucast_rate));
+
+        rate = a_sle32_to_cpu(tgt_stats->stats.tx.ucast_rate);
+        stats->tx_ucast_rate = ath6kl_wmi_get_rate(ar->wmi, rate);
 
         stats->rx_pkt += le32_to_cpu(tgt_stats->stats.rx.pkt);
         stats->rx_byte += le32_to_cpu(tgt_stats->stats.rx.byte);
@@ -749,8 +751,9 @@ static void ath6kl_update_target_stats(struct ath6kl_vif *vif, u8 *ptr, u32 len)
                 le32_to_cpu(tgt_stats->stats.rx.key_cache_miss);
         stats->rx_decrypt_err += le32_to_cpu(tgt_stats->stats.rx.decrypt_err);
         stats->rx_dupl_frame += le32_to_cpu(tgt_stats->stats.rx.dupl_frame);
-        stats->rx_ucast_rate =
-            ath6kl_wmi_get_rate(a_sle32_to_cpu(tgt_stats->stats.rx.ucast_rate));
+
+        rate = a_sle32_to_cpu(tgt_stats->stats.rx.ucast_rate);
+        stats->rx_ucast_rate = ath6kl_wmi_get_rate(ar->wmi, rate);
 
         ccmp_stats = &tgt_stats->stats.tkip_ccmp_stats;
 
@@ -1290,6 +1293,8 @@ static const struct net_device_ops ath6kl_netdev_ops = {
 
 void init_netdev(struct net_device *dev)
 {
+        struct ath6kl *ar = ath6kl_priv(dev);
+
         dev->netdev_ops = &ath6kl_netdev_ops;
         dev->destructor = free_netdev;
         dev->watchdog_timeo = ATH6KL_TX_TIMEOUT;
@@ -1301,7 +1306,9 @@ void init_netdev(struct net_device *dev)
                                         WMI_MAX_TX_META_SZ +
                                         ATH6KL_HTC_ALIGN_BYTES, 4);
 
-        dev->hw_features |= NETIF_F_IP_CSUM | NETIF_F_RXCSUM;
+        if (!test_bit(ATH6KL_FW_CAPABILITY_NO_IP_CHECKSUM,
+                      ar->fw_capabilities))
+                dev->hw_features |= NETIF_F_IP_CSUM | NETIF_F_RXCSUM;
 
         return;
 }
diff --git a/drivers/net/wireless/ath/ath6kl/usb.c b/drivers/net/wireless/ath/ath6kl/usb.c
index 3afc5a463d06..c44325856b81 100644
--- a/drivers/net/wireless/ath/ath6kl/usb.c
+++ b/drivers/net/wireless/ath/ath6kl/usb.c
@@ -802,7 +802,8 @@ static int ath6kl_usb_map_service_pipe(struct ath6kl *ar, u16 svc_id,
                 break;
         case WMI_DATA_VI_SVC:
 
-                if (ar->hw.flags & ATH6KL_HW_MAP_LP_ENDPOINT)
+                if (test_bit(ATH6KL_FW_CAPABILITY_MAP_LP_ENDPOINT,
+                             ar->fw_capabilities))
                         *ul_pipe = ATH6KL_USB_PIPE_TX_DATA_LP;
                 else
                         *ul_pipe = ATH6KL_USB_PIPE_TX_DATA_MP;
@@ -814,7 +815,8 @@ static int ath6kl_usb_map_service_pipe(struct ath6kl *ar, u16 svc_id,
                 break;
         case WMI_DATA_VO_SVC:
 
-                if (ar->hw.flags & ATH6KL_HW_MAP_LP_ENDPOINT)
+                if (test_bit(ATH6KL_FW_CAPABILITY_MAP_LP_ENDPOINT,
+                             ar->fw_capabilities))
                         *ul_pipe = ATH6KL_USB_PIPE_TX_DATA_LP;
                 else
                         *ul_pipe = ATH6KL_USB_PIPE_TX_DATA_MP;
@@ -1208,6 +1210,7 @@ static int ath6kl_usb_pm_reset_resume(struct usb_interface *intf)
 
 /* table of devices that work with this driver */
 static struct usb_device_id ath6kl_usb_ids[] = {
+        {USB_DEVICE(0x0cf3, 0x9375)},
         {USB_DEVICE(0x0cf3, 0x9374)},
         { /* Terminating entry */ },
 };
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
index 4d7f9e4712e9..94df345d08c2 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -59,6 +59,55 @@ static const s32 wmi_rate_tbl[][2] = {
         {0, 0}
 };
 
+static const s32 wmi_rate_tbl_mcs15[][2] = {
+        /* {W/O SGI, with SGI} */
+        {1000, 1000},
+        {2000, 2000},
+        {5500, 5500},
+        {11000, 11000},
+        {6000, 6000},
+        {9000, 9000},
+        {12000, 12000},
+        {18000, 18000},
+        {24000, 24000},
+        {36000, 36000},
+        {48000, 48000},
+        {54000, 54000},
+        {6500, 7200},     /* HT 20, MCS 0 */
+        {13000, 14400},
+        {19500, 21700},
+        {26000, 28900},
+        {39000, 43300},
+        {52000, 57800},
+        {58500, 65000},
+        {65000, 72200},
+        {13000, 14400},   /* HT 20, MCS 8 */
+        {26000, 28900},
+        {39000, 43300},
+        {52000, 57800},
+        {78000, 86700},
+        {104000, 115600},
+        {117000, 130000},
+        {130000, 144400}, /* HT 20, MCS 15 */
+        {13500, 15000},   /*HT 40, MCS 0 */
+        {27000, 30000},
+        {40500, 45000},
+        {54000, 60000},
+        {81000, 90000},
+        {108000, 120000},
+        {121500, 135000},
+        {135000, 150000},
+        {27000, 30000},   /*HT 40, MCS 8 */
+        {54000, 60000},
+        {81000, 90000},
+        {108000, 120000},
+        {162000, 180000},
+        {216000, 240000},
+        {243000, 270000},
+        {270000, 300000}, /*HT 40, MCS 15 */
+        {0, 0}
+};
+
 /* 802.1d to AC mapping. Refer pg 57 of WMM-test-plan-v1.2 */
 static const u8 up_to_ac[] = {
         WMM_AC_BE,
@@ -2838,7 +2887,8 @@ int ath6kl_wmi_set_bitrate_mask(struct wmi *wmi, u8 if_idx,
 {
         struct ath6kl *ar = wmi->parent_dev;
 
-        if (ar->hw.flags & ATH6KL_HW_64BIT_RATES)
+        if (test_bit(ATH6KL_FW_CAPABILITY_64BIT_RATES,
+                     ar->fw_capabilities))
                 return ath6kl_set_bitrate_mask64(wmi, if_idx, mask);
         else
                 return ath6kl_set_bitrate_mask32(wmi, if_idx, mask);
@@ -3279,9 +3329,11 @@ int ath6kl_wmi_set_regdomain_cmd(struct wmi *wmi, const char *alpha2)
                                    NO_SYNC_WMIFLAG);
 }
 
-s32 ath6kl_wmi_get_rate(s8 rate_index)
+s32 ath6kl_wmi_get_rate(struct wmi *wmi, s8 rate_index)
 {
+        struct ath6kl *ar = wmi->parent_dev;
         u8 sgi = 0;
+        s32 ret;
 
         if (rate_index == RATE_AUTO)
                 return 0;
@@ -3292,10 +3344,20 @@ s32 ath6kl_wmi_get_rate(s8 rate_index)
                 sgi = 1;
         }
 
-        if (WARN_ON(rate_index > RATE_MCS_7_40))
-                rate_index = RATE_MCS_7_40;
+        if (test_bit(ATH6KL_FW_CAPABILITY_RATETABLE_MCS15,
+                     ar->fw_capabilities)) {
+                if (WARN_ON(rate_index >= ARRAY_SIZE(wmi_rate_tbl_mcs15)))
+                        return 0;
+
+                ret = wmi_rate_tbl_mcs15[(u32) rate_index][sgi];
+        } else {
+                if (WARN_ON(rate_index >= ARRAY_SIZE(wmi_rate_tbl)))
+                        return 0;
 
-        return wmi_rate_tbl[(u32) rate_index][sgi];
+                ret = wmi_rate_tbl[(u32) rate_index][sgi];
+        }
+
+        return ret;
 }
 
 static int ath6kl_wmi_get_pmkid_list_event_rx(struct wmi *wmi, u8 *datap,
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h
index bb23fc00111d..19f88b4a24fb 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.h
+++ b/drivers/net/wireless/ath/ath6kl/wmi.h
@@ -2632,7 +2632,7 @@ int ath6kl_wmi_set_htcap_cmd(struct wmi *wmi, u8 if_idx,
                              struct ath6kl_htcap *htcap);
 int ath6kl_wmi_test_cmd(struct wmi *wmi, void *buf, size_t len);
 
-s32 ath6kl_wmi_get_rate(s8 rate_index);
+s32 ath6kl_wmi_get_rate(struct wmi *wmi, s8 rate_index);
 
 int ath6kl_wmi_set_ip_cmd(struct wmi *wmi, u8 if_idx,
                           __be32 ips0, __be32 ips1);