Commit bc566f92 authored by Arik Nemtsov's avatar Arik Nemtsov Committed by John W. Linville

wlcore: wl18xx: allow CCK rates for AP mode

12xx chips allow only OFDM rates in AP mode for BT-Coex purposes. This
is no longer required in 18xx chips, starting with FW 8.6.0.0.8.

Update the min allowed FW version in 18xx to support this functionality.
Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5a441f5f
...@@ -1789,6 +1789,7 @@ static int wl12xx_setup(struct wl1271 *wl) ...@@ -1789,6 +1789,7 @@ static int wl12xx_setup(struct wl1271 *wl)
wl->fw_status_len = sizeof(struct wl12xx_fw_status); wl->fw_status_len = sizeof(struct wl12xx_fw_status);
wl->fw_status_priv_len = 0; wl->fw_status_priv_len = 0;
wl->stats.fw_stats_len = sizeof(struct wl12xx_acx_statistics); wl->stats.fw_stats_len = sizeof(struct wl12xx_acx_statistics);
wl->ofdm_only_ap = true;
wlcore_set_ht_cap(wl, IEEE80211_BAND_2GHZ, &wl12xx_ht_cap); wlcore_set_ht_cap(wl, IEEE80211_BAND_2GHZ, &wl12xx_ht_cap);
wlcore_set_ht_cap(wl, IEEE80211_BAND_5GHZ, &wl12xx_ht_cap); wlcore_set_ht_cap(wl, IEEE80211_BAND_5GHZ, &wl12xx_ht_cap);
wl12xx_conf_init(wl); wl12xx_conf_init(wl);
......
...@@ -462,7 +462,7 @@ int wl1271_init_ap_rates(struct wl1271 *wl, struct wl12xx_vif *wlvif) ...@@ -462,7 +462,7 @@ int wl1271_init_ap_rates(struct wl1271 *wl, struct wl12xx_vif *wlvif)
* If the basic rates contain OFDM rates, use OFDM only * If the basic rates contain OFDM rates, use OFDM only
* rates for unicast TX as well. Else use all supported rates. * rates for unicast TX as well. Else use all supported rates.
*/ */
if ((wlvif->basic_rate_set & CONF_TX_OFDM_RATES)) if (wl->ofdm_only_ap && (wlvif->basic_rate_set & CONF_TX_OFDM_RATES))
supported_rates = CONF_TX_OFDM_RATES; supported_rates = CONF_TX_OFDM_RATES;
else else
supported_rates = CONF_TX_ENABLED_RATES; supported_rates = CONF_TX_ENABLED_RATES;
......
...@@ -407,6 +407,9 @@ struct wl1271 { ...@@ -407,6 +407,9 @@ struct wl1271 {
/* AP-mode - number of currently connected stations */ /* AP-mode - number of currently connected stations */
int active_sta_count; int active_sta_count;
/* Flag determining whether AP should broadcast OFDM-only rates */
bool ofdm_only_ap;
/* last wlvif we transmitted from */ /* last wlvif we transmitted from */
struct wl12xx_vif *last_wlvif; struct wl12xx_vif *last_wlvif;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment