diff options
-rw-r--r-- | drivers/net/wireless/wl12xx/conf.h | 5 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/init.c | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/conf.h b/drivers/net/wireless/wl12xx/conf.h index 76b5c6233da4..82f205c43342 100644 --- a/drivers/net/wireless/wl12xx/conf.h +++ b/drivers/net/wireless/wl12xx/conf.h | |||
@@ -441,6 +441,11 @@ struct conf_rx_settings { | |||
441 | CONF_HW_BIT_RATE_36MBPS | CONF_HW_BIT_RATE_48MBPS | \ | 441 | CONF_HW_BIT_RATE_36MBPS | CONF_HW_BIT_RATE_48MBPS | \ |
442 | CONF_HW_BIT_RATE_54MBPS) | 442 | CONF_HW_BIT_RATE_54MBPS) |
443 | 443 | ||
444 | #define CONF_TX_MCS_RATES (CONF_HW_BIT_RATE_MCS_0 | \ | ||
445 | CONF_HW_BIT_RATE_MCS_1 | CONF_HW_BIT_RATE_MCS_2 | \ | ||
446 | CONF_HW_BIT_RATE_MCS_3 | CONF_HW_BIT_RATE_MCS_4 | \ | ||
447 | CONF_HW_BIT_RATE_MCS_5 | CONF_HW_BIT_RATE_MCS_6 | \ | ||
448 | CONF_HW_BIT_RATE_MCS_7) | ||
444 | 449 | ||
445 | /* | 450 | /* |
446 | * Default rates for management traffic when operating in AP mode. This | 451 | * Default rates for management traffic when operating in AP mode. This |
diff --git a/drivers/net/wireless/wl12xx/init.c b/drivers/net/wireless/wl12xx/init.c index a374c2112be3..b13bebea95e0 100644 --- a/drivers/net/wireless/wl12xx/init.c +++ b/drivers/net/wireless/wl12xx/init.c | |||
@@ -515,6 +515,9 @@ int wl1271_init_ap_rates(struct wl1271 *wl) | |||
515 | else | 515 | else |
516 | supported_rates = CONF_TX_AP_ENABLED_RATES; | 516 | supported_rates = CONF_TX_AP_ENABLED_RATES; |
517 | 517 | ||
518 | /* unconditionally enable HT rates */ | ||
519 | supported_rates |= CONF_TX_MCS_RATES; | ||
520 | |||
518 | /* configure unicast TX rate classes */ | 521 | /* configure unicast TX rate classes */ |
519 | for (i = 0; i < wl->conf.tx.ac_conf_count; i++) { | 522 | for (i = 0; i < wl->conf.tx.ac_conf_count; i++) { |
520 | rc.enabled_rates = supported_rates; | 523 | rc.enabled_rates = supported_rates; |