summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/wl12xx/tx.c
diff options
context:
space:
mode:
authorPontus Fuchs <pontus.fuchs@gmail.com>2012-01-31 15:54:41 (GMT)
committerLuciano Coelho <coelho@ti.com>2012-02-15 06:38:32 (GMT)
commitdefe02c720d54fc9bda3e5e625be70adac347a61 (patch)
tree6f6f2a6a92b107da5e9cf9494b14d236fa9f581f /drivers/net/wireless/wl12xx/tx.c
parentd2e2d769e3d328ba7cbf08e8ed85e3f817915843 (diff)
downloadlinux-fsl-qoriq-defe02c720d54fc9bda3e5e625be70adac347a61.tar.xz
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>
Diffstat (limited to 'drivers/net/wireless/wl12xx/tx.c')
-rw-r--r--drivers/net/wireless/wl12xx/tx.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c
index f95112f..ee313e7 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,