diff options
| author | Manikandan Mohan <manikand@qca.qualcomm.com> | 2015-04-08 17:24:59 -0700 |
|---|---|---|
| committer | AnjaneeDevi Kapparapu <c_akappa@qti.qualcomm.com> | 2015-04-09 16:33:07 +0530 |
| commit | 55861854a7b70815a4e8af1815a8986c24fc426a (patch) | |
| tree | 5128726c8cc2f2fe4416f93049886e7e148470ae | |
| parent | 44f3b2cd7d3f248b9e9ed4c871117e29eb1dd988 (diff) | |
qcacld: Fix invalid VHT Operation IE
Fix the regression that over writes channel bonding mode resulting
in invalid VHT operation IE.
Change-Id: Ie715c7704e6559cdbd82924e8019dbf48febe3d4
CRs-fixed: 820006
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg80211.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index 34f5cbeb3a64..52b878b882c3 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -8615,8 +8615,6 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, clear_bit(ACS_IN_PROGRESS, &pHddCtx->g_event_flags); pConfig = &pHostapdAdapter->sessionCtx.ap.sapConfig; - vos_mem_zero(&sme_config, sizeof (tSmeConfigParams)); - sme_GetConfigParam(pHddCtx->hHal, &sme_config); pBeacon = pHostapdAdapter->sessionCtx.ap.beacon; @@ -9093,6 +9091,8 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, * As per spec 11n/11AC STA are QOS STA and may not connect to nonQOS 11n AP * Default enable QOS for SAP */ + vos_mem_zero(&sme_config, sizeof(tSmeConfigParams)); + sme_GetConfigParam(pHddCtx->hHal, &sme_config); sme_config.csrConfig.WMMSupportMode = eCsrRoamWmmAuto; pIe = wlan_hdd_get_vendor_oui_ie_ptr(WMM_OUI_TYPE, WMM_OUI_TYPE_SIZE, pBeacon->tail, pBeacon->tail_len); @@ -9100,6 +9100,8 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, pConfig->SapHw_mode == eCSR_DOT11_MODE_11g || pConfig->SapHw_mode == eCSR_DOT11_MODE_11b)) sme_config.csrConfig.WMMSupportMode = eCsrRoamWmmNoQos; + sme_UpdateConfig(pHddCtx->hHal, &sme_config); + #ifdef WLAN_FEATURE_11AC /* Overwrite the hostapd setting for HW mode only for 11ac. @@ -9227,9 +9229,6 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, (WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter))->dfs_cac_block_tx = VOS_TRUE; - /* Apply updated SME config before start BSS */ - sme_UpdateConfig(pHddCtx->hHal, &sme_config); - status = WLANSAP_StartBss( #ifdef WLAN_FEATURE_MBSSID WLAN_HDD_GET_SAP_CTX_PTR(pHostapdAdapter), |