diff options
| author | Mahesh A Saptasagar <c_msapta@qti.qualcomm.com> | 2016-06-15 16:58:05 +0530 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2016-07-04 17:01:36 +0530 |
| commit | ded05c83d960b72d355b3037925c8c0c39d37c16 (patch) | |
| tree | 76780a69d1f4b6544acca9fe3fa24a9bf818c051 | |
| parent | c7415d16d429657971f1003054defccd185d77af (diff) | |
qcacld-2.0: Initialize frequency band before reg_notifier is called
Since wiphy register is done before we configure band information
using ini parameter, wrong channels are being updated to the
supplicant through linux_reg_notifier, which is causing p2p
connection failures.
This commit ensures that channel list for configured band is updated
before linux_reg_notifier is called.
Change-Id: Ie0c68a24befad9806b366e1e1e7e686bdfc71ddd
CRs-Fixed: 1021751
| -rwxr-xr-x | CORE/HDD/src/wlan_hdd_main.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index b55792f42bae..474b410d2a04 100755 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/CORE/HDD/src/wlan_hdd_main.c @@ -14836,13 +14836,6 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc) } } - status = wlan_hdd_reg_init(pHddCtx); - if (status != VOS_STATUS_SUCCESS) { - hddLog(VOS_TRACE_LEVEL_FATAL, - "%s: Failed to init channel list", __func__); - goto err_vosclose; - } - if (0 != wlan_hdd_set_wow_pulse(pHddCtx, true)) { hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Failed to set wow pulse", __func__); @@ -14877,9 +14870,15 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc) if ( VOS_STATUS_SUCCESS != status ) { hddLog(VOS_TRACE_LEVEL_FATAL, "%s: Failed hdd_set_sme_config", __func__); - goto err_wiphy_unregister; + goto err_vosclose; } + status = wlan_hdd_reg_init(pHddCtx); + if (status != VOS_STATUS_SUCCESS) { + hddLog(VOS_TRACE_LEVEL_FATAL, + "%s: Failed to init channel list", __func__); + goto err_vosclose; + } ret = process_wma_set_command(0, WMI_PDEV_PARAM_TX_CHAIN_MASK_1SS, pHddCtx->cfg_ini->tx_chain_mask_1ss, PDEV_CMD); |