summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaveen Rawat <naveenrawat@codeaurora.org>2017-01-04 16:36:28 -0800
committerqcabuildsw <qcabuildsw@localhost>2017-01-09 15:38:54 -0800
commitfc523c6dbb7dbe71290f13176614c3f8dfff0d25 (patch)
tree9f9f3280ade663321bebbf986189622b34e5feee
parentf98af945ebc4900af9daa8d0788e2823da4e04e9 (diff)
qcacld-3.0: Do not upgrade SAP to 11AC for 5/10 MHz channel width
Do not upgrade SAP to 11AC due to gAP11ACOverride ini setting when channel width is sub 20 MHz. Sub 20 MHz channel width operation is not compatible with VHT rates. Change-Id: I515cc60dbd3f76994f1288f9380618ee13ea1a23 CRs-Fixed: 1107601
-rw-r--r--core/hdd/src/wlan_hdd_hostapd.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c
index 943b87a0ae0d..2506b778dbdb 100644
--- a/core/hdd/src/wlan_hdd_hostapd.c
+++ b/core/hdd/src/wlan_hdd_hostapd.c
@@ -6974,7 +6974,13 @@ static int wlan_hdd_setup_driver_overrides(hdd_adapter_t *ap_adapter)
*
* Default override enabled (for android). MDM shall disable this in ini
*/
- if (hdd_ctx->config->sap_p2p_11ac_override &&
+ /*
+ * sub_20 MHz channel width is incompatible with 11AC rates, hence do
+ * not allow 11AC rates or more than 20 MHz channel width when
+ * enable_sub_20_channel_width is non zero
+ */
+ if (!hdd_ctx->config->enable_sub_20_channel_width &&
+ hdd_ctx->config->sap_p2p_11ac_override &&
(sap_cfg->SapHw_mode == eCSR_DOT11_MODE_11n ||
sap_cfg->SapHw_mode == eCSR_DOT11_MODE_11ac ||
sap_cfg->SapHw_mode == eCSR_DOT11_MODE_11ac_ONLY) &&