From 57b7ee356f4eb94e2bf55569b7bdb8472a8344ed Mon Sep 17 00:00:00 2001 From: Himanshu Agarwal Date: Mon, 11 Jun 2018 15:09:52 +0530 Subject: [PATCH] qcacld-3.0: Copy ch_width irrespective of gvendor_acs_support value When gvendor_acs_support=1, ch_width provided by hostapd is not getting copied to sap_cfg. As a result, ch_width is 0 (20Mhz) irrepective of whatever provided by hostapd causing issues. Copy ch_width irrespective of gvendor_acs_support value. Change-Id: I7013eb7ee3610790194916078640d633747de15e CRs-Fixed: 2247771 --- core/hdd/src/wlan_hdd_hostapd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 423b1cf07f2d..0a7e5aaa64d9 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -7277,10 +7277,6 @@ static int wlan_hdd_sap_p2p_11ac_overrides(struct hdd_adapter *ap_adapter) } } - sap_cfg->ch_params.ch_width = sap_cfg->ch_width_orig; - wlan_reg_set_channel_params(hdd_ctx->hdd_pdev, sap_cfg->channel, - sap_cfg->sec_ch, &sap_cfg->ch_params); - return 0; } @@ -7863,6 +7859,10 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter, goto error; } + pConfig->ch_params.ch_width = pConfig->ch_width_orig; + wlan_reg_set_channel_params(hdd_ctx->hdd_pdev, pConfig->channel, + pConfig->sec_ch, &pConfig->ch_params); + /* ht_capab is not what the name conveys, * this is used for protection bitmap */