wl12xx: Set IEEE80211_TX_RC_SHORT_GI if short GI was used on

New FW reports usage of short GI as a rate class index. Check for
this rate and set the IEEE80211_TX_RC_SHORT_GI if used.

Signed-off-by: Pontus Fuchs <pontus.fuchs@gmail.com>
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>

3 files changed, 11 insertions, 4 deletions

diff --git a/drivers/net/wireless/wl12xx/conf.h b/drivers/net/wireless/wl12xx/conf.h
index 209f05312909..1147396bf7eb 100644
--- a/drivers/net/wireless/wl12xx/conf.h
+++ b/drivers/net/wireless/wl12xx/conf.h
@@ -66,7 +66,8 @@ enum {
 };
 
 enum {
-        CONF_HW_RXTX_RATE_MCS7 = 0,
+        CONF_HW_RXTX_RATE_MCS7_SGI = 0,
+        CONF_HW_RXTX_RATE_MCS7,
         CONF_HW_RXTX_RATE_MCS6,
         CONF_HW_RXTX_RATE_MCS5,
         CONF_HW_RXTX_RATE_MCS4,
@@ -92,7 +93,7 @@ enum {
 };
 
 /* Rates between and including these are MCS rates */
-#define CONF_HW_RXTX_RATE_MCS_MIN CONF_HW_RXTX_RATE_MCS7
+#define CONF_HW_RXTX_RATE_MCS_MIN CONF_HW_RXTX_RATE_MCS7_SGI
 #define CONF_HW_RXTX_RATE_MCS_MAX CONF_HW_RXTX_RATE_MCS0
 
 enum {
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 4ca7278201ec..fa2bf307aa0d 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -4406,6 +4406,7 @@ static struct ieee80211_channel wl1271_channels[] = {
 /* mapping to indexes for wl1271_rates */
 static const u8 wl1271_rate_to_idx_2ghz[] = {
         /* MCS rates are used only with 11n */
+        7,                            /* CONF_HW_RXTX_RATE_MCS7_SGI */
         7,                            /* CONF_HW_RXTX_RATE_MCS7 */
         6,                            /* CONF_HW_RXTX_RATE_MCS6 */
         5,                            /* CONF_HW_RXTX_RATE_MCS5 */
@@ -4527,6 +4528,7 @@ static struct ieee80211_channel wl1271_channels_5ghz[] = {
 /* mapping to indexes for wl1271_rates_5ghz */
 static const u8 wl1271_rate_to_idx_5ghz[] = {
         /* MCS rates are used only with 11n */
+        7,                            /* CONF_HW_RXTX_RATE_MCS7_SGI */
         7,                            /* CONF_HW_RXTX_RATE_MCS7 */
         6,                            /* CONF_HW_RXTX_RATE_MCS6 */
         5,                            /* CONF_HW_RXTX_RATE_MCS5 */
diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c
index f95112f6769f..ee313e7ce8fe 100644
--- a/drivers/net/wireless/wl12xx/tx.c
+++ b/drivers/net/wireless/wl12xx/tx.c
@@ -766,10 +766,14 @@ out:
 
 static u8 wl1271_tx_get_rate_flags(u8 rate_class_index)
 {
+        u8 flags = 0;
+
         if (rate_class_index >= CONF_HW_RXTX_RATE_MCS_MIN &&
             rate_class_index <= CONF_HW_RXTX_RATE_MCS_MAX)
-                return IEEE80211_TX_RC_MCS;
-        return 0;
+                flags |= IEEE80211_TX_RC_MCS;
+        if (rate_class_index == CONF_HW_RXTX_RATE_MCS7_SGI)
+                flags |= IEEE80211_TX_RC_SHORT_GI;
+        return flags;
 }
 
 static void wl1271_tx_complete_packet(struct wl1271 *wl,