From 9b0ebdb7698cb8525bdd0b8e11c54a1db51450b1 Mon Sep 17 00:00:00 2001 From: Ajit Pal Singh Date: Thu, 8 Jun 2017 11:26:43 +0530 Subject: [PATCH] qcacld-3.0: Restart SAP with CSA/ECSA when gWlanMccToSccSwitchMod=3 Restart SAP with CSA/ECSA when ini variable gWlanMccToSccSwitchMod=3. Currently ini variable setting gWlanMccToSccSwitchMod=2 was causing SAP to restart with CSA. Change-Id: I9a4b68cd154fa63325d146510832c2410f2dc244 CRs-Fixed: 2058154 --- core/hdd/src/wlan_hdd_hostapd.c | 13 +++++-------- core/hdd/src/wlan_hdd_hostapd.h | 3 +-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index fbaab8217f26..c7c03c0fcb70 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -2389,7 +2389,7 @@ void sap_restart_chan_switch_cb (struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_hdd_get_channel_for_sap_restart( struct wlan_objmgr_psoc *psoc, uint8_t vdev_id, uint8_t *channel, - uint8_t *sec_ch, bool restart_sap) + uint8_t *sec_ch) { tHalHandle *hal_handle; hdd_ap_ctx_t *hdd_ap_ctx; @@ -2439,13 +2439,10 @@ QDF_STATUS wlan_hdd_get_channel_for_sap_restart( *channel = hdd_ap_ctx->sapConfig.channel; *sec_ch = hdd_ap_ctx->sapConfig.sec_ch; - if (restart_sap) { - hdd_info("Restart SAP as a part of channel switch"); - sap_restart_chan_switch_cb(psoc, vdev_id, - hdd_ap_ctx->sapConfig.channel, - hdd_ap_ctx->sapConfig.ch_params.ch_width); - - } + hdd_info("SAP channel change with CSA/ECSA"); + sap_restart_chan_switch_cb(psoc, vdev_id, + hdd_ap_ctx->sapConfig.channel, + hdd_ap_ctx->sapConfig.ch_params.ch_width); return QDF_STATUS_SUCCESS; } diff --git a/core/hdd/src/wlan_hdd_hostapd.h b/core/hdd/src/wlan_hdd_hostapd.h index ab5c2a7dba38..557c620e92a9 100644 --- a/core/hdd/src/wlan_hdd_hostapd.h +++ b/core/hdd/src/wlan_hdd_hostapd.h @@ -89,7 +89,6 @@ void sap_restart_chan_switch_cb (struct wlan_objmgr_psoc *psoc, * @vdev_id: vdev id * @channel: channel to be returned * @sec_ch: secondary channel to be returned - * @restart_sap: restsart SAP as a part of channel switch * * This function gets the channel parameters to restart SAP * @@ -99,7 +98,7 @@ void sap_restart_chan_switch_cb (struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_hdd_get_channel_for_sap_restart( struct wlan_objmgr_psoc *psoc, uint8_t vdev_id, uint8_t *channel, - uint8_t *sec_ch, bool restart_sap); + uint8_t *sec_ch); #endif eCsrEncryptionType