diff options
author | Shahar Levi <shahar_levi@ti.com> | 2011-09-05 06:54:36 -0400 |
---|---|---|
committer | Luciano Coelho <coelho@ti.com> | 2011-09-23 07:21:36 -0400 |
commit | 06b660e1a31cf1c7bdcfb87ebf7785dd715b7d17 (patch) | |
tree | 304b5357ab15bb2c3e979117460b3e0deee28a41 | |
parent | d3b104ae22a761dbec8410e6e66ac048c9ff9b5f (diff) |
wl12xx: Include OFDM rates in IBSS mode
We were including only 11b rates in IBSS mode. This patch adds OFDM
rates.
[Rephrased commit log and removed one unnecessary comment. -- Luca]
Signed-off-by: Shahar Levi <shahar_levi@ti.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
-rw-r--r-- | drivers/net/wireless/wl12xx/conf.h | 6 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/wl12xx/conf.h b/drivers/net/wireless/wl12xx/conf.h index 45428a21f9e2..6a6805c3cc74 100644 --- a/drivers/net/wireless/wl12xx/conf.h +++ b/drivers/net/wireless/wl12xx/conf.h | |||
@@ -454,12 +454,10 @@ struct conf_rx_settings { | |||
454 | #define CONF_TX_AP_DEFAULT_MGMT_RATES (CONF_HW_BIT_RATE_1MBPS | \ | 454 | #define CONF_TX_AP_DEFAULT_MGMT_RATES (CONF_HW_BIT_RATE_1MBPS | \ |
455 | CONF_HW_BIT_RATE_2MBPS | CONF_HW_BIT_RATE_5_5MBPS) | 455 | CONF_HW_BIT_RATE_2MBPS | CONF_HW_BIT_RATE_5_5MBPS) |
456 | 456 | ||
457 | /* | 457 | /* default rates for working as IBSS (11b and OFDM) */ |
458 | * Default rates for working as IBSS. use 11b rates | ||
459 | */ | ||
460 | #define CONF_TX_IBSS_DEFAULT_RATES (CONF_HW_BIT_RATE_1MBPS | \ | 458 | #define CONF_TX_IBSS_DEFAULT_RATES (CONF_HW_BIT_RATE_1MBPS | \ |
461 | CONF_HW_BIT_RATE_2MBPS | CONF_HW_BIT_RATE_5_5MBPS | \ | 459 | CONF_HW_BIT_RATE_2MBPS | CONF_HW_BIT_RATE_5_5MBPS | \ |
462 | CONF_HW_BIT_RATE_11MBPS); | 460 | CONF_HW_BIT_RATE_11MBPS | CONF_TX_OFDM_RATES); |
463 | 461 | ||
464 | struct conf_tx_rate_class { | 462 | struct conf_tx_rate_class { |
465 | 463 | ||
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 680f5582618e..7218944f4700 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c | |||
@@ -3472,7 +3472,7 @@ sta_not_found: | |||
3472 | rates); | 3472 | rates); |
3473 | wl->basic_rate = wl1271_tx_min_rate_get(wl); | 3473 | wl->basic_rate = wl1271_tx_min_rate_get(wl); |
3474 | 3474 | ||
3475 | /* by default, use 11b rates */ | 3475 | /* by default, use 11b + OFDM rates */ |
3476 | wl->rate_set = CONF_TX_IBSS_DEFAULT_RATES; | 3476 | wl->rate_set = CONF_TX_IBSS_DEFAULT_RATES; |
3477 | ret = wl1271_acx_sta_rate_policies(wl); | 3477 | ret = wl1271_acx_sta_rate_policies(wl); |
3478 | if (ret < 0) | 3478 | if (ret < 0) |