2 files changed, 15 insertions, 1 deletions

diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
index e95b035168ad..cd2db42c0989 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -3263,10 +3263,21 @@ int ath6kl_wmi_set_regdomain_cmd(struct wmi *wmi, const char *alpha2)
 
 s32 ath6kl_wmi_get_rate(s8 rate_index)
 {
+        u8 sgi = 0;
+
         if (rate_index == RATE_AUTO)
                 return 0;
 
-        return wmi_rate_tbl[(u32) rate_index][0];
+        /* SGI is stored as the MSB of the rate_index */
+        if (rate_index & RATE_INDEX_MSB) {
+                rate_index &= RATE_INDEX_WITHOUT_SGI_MASK;
+                sgi = 1;
+        }
+
+        if (WARN_ON(rate_index > RATE_MCS_7_40))
+                rate_index = RATE_MCS_7_40;
+
+        return wmi_rate_tbl[(u32) rate_index][sgi];
 }
 
 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 a638151cf861..e916e57c9d9a 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.h
+++ b/drivers/net/wireless/ath/ath6kl/wmi.h
@@ -1792,6 +1792,9 @@ struct rx_stats {
         a_sle32 ucast_rate;
 } __packed;
 
+#define RATE_INDEX_WITHOUT_SGI_MASK     0x7f
+#define RATE_INDEX_MSB     0x80
+
 struct tkip_ccmp_stats {
         __le32 tkip_local_mic_fail;
         __le32 tkip_cnter_measures_invoked;