lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wl12xx: Set IEEE80211_TX_RC_SHORT_GI if short GI was used on

Browse Source 
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>
This commit is contained in:
Pontus Fuchs
2012-01-31 17:54:41 +02:00
committed by Luciano Coelho
parent d2e2d769e3
commit defe02c720
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/wl12xx/conf.h
View File

@@ -66,7 +66,8 @@ enum {
}; };
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_MCS6,
CONF_HW_RXTX_RATE_MCS5, CONF_HW_RXTX_RATE_MCS5,
CONF_HW_RXTX_RATE_MCS4, CONF_HW_RXTX_RATE_MCS4,
@@ -92,7 +93,7 @@ enum {
}; };
/* Rates between and including these are MCS rates */ /* 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 #define CONF_HW_RXTX_RATE_MCS_MAX CONF_HW_RXTX_RATE_MCS0
enum { enum {

2
drivers/net/wireless/wl12xx/main.c
View File

@@ -4406,6 +4406,7 @@ static struct ieee80211_channel wl1271_channels[] = {
/* mapping to indexes for wl1271_rates */ /* mapping to indexes for wl1271_rates */
static const u8 wl1271_rate_to_idx_2ghz[] = { static const u8 wl1271_rate_to_idx_2ghz[] = {
/* MCS rates are used only with 11n */ /* MCS rates are used only with 11n */
7, /* CONF_HW_RXTX_RATE_MCS7_SGI */
7, /* CONF_HW_RXTX_RATE_MCS7 */ 7, /* CONF_HW_RXTX_RATE_MCS7 */
6, /* CONF_HW_RXTX_RATE_MCS6 */ 6, /* CONF_HW_RXTX_RATE_MCS6 */
5, /* CONF_HW_RXTX_RATE_MCS5 */ 5, /* CONF_HW_RXTX_RATE_MCS5 */
@@ -4527,6 +4528,7 @@ static struct ieee80211_channel wl1271_channels_5ghz[] = {
/* mapping to indexes for wl1271_rates_5ghz */ /* mapping to indexes for wl1271_rates_5ghz */
static const u8 wl1271_rate_to_idx_5ghz[] = { static const u8 wl1271_rate_to_idx_5ghz[] = {
/* MCS rates are used only with 11n */ /* MCS rates are used only with 11n */
7, /* CONF_HW_RXTX_RATE_MCS7_SGI */
7, /* CONF_HW_RXTX_RATE_MCS7 */ 7, /* CONF_HW_RXTX_RATE_MCS7 */
6, /* CONF_HW_RXTX_RATE_MCS6 */ 6, /* CONF_HW_RXTX_RATE_MCS6 */
5, /* CONF_HW_RXTX_RATE_MCS5 */ 5, /* CONF_HW_RXTX_RATE_MCS5 */

8
drivers/net/wireless/wl12xx/tx.c
View File

@@ -766,10 +766,14 @@ out:
static u8 wl1271_tx_get_rate_flags(u8 rate_class_index) static u8 wl1271_tx_get_rate_flags(u8 rate_class_index)
{ {
u8 flags = 0;
if (rate_class_index >= CONF_HW_RXTX_RATE_MCS_MIN && if (rate_class_index >= CONF_HW_RXTX_RATE_MCS_MIN &&
rate_class_index <= CONF_HW_RXTX_RATE_MCS_MAX) rate_class_index <= CONF_HW_RXTX_RATE_MCS_MAX)
return IEEE80211_TX_RC_MCS; flags |= IEEE80211_TX_RC_MCS;
return 0; 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, static void wl1271_tx_complete_packet(struct wl1271 *wl,