diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index acfb7f395f52..5ac94dc97713 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -1662,13 +1662,9 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, /* To be initialised if scan is required */ QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac_ctx; -#ifdef NAPIER_SCAN struct scan_start_request *req; struct wlan_objmgr_vdev *vdev; uint8_t i; -#else - tCsrScanRequest scan_request; -#endif #ifdef SOFTAP_CHANNEL_RANGE uint8_t *channel_list = NULL; @@ -1785,19 +1781,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, if (sap_context->acs_cfg->skip_scan_status != eSAP_SKIP_ACS_SCAN) { #endif -#ifndef NAPIER_SCAN - qdf_mem_zero(&scan_request, sizeof(scan_request)); - /* - * Set scanType to Active scan. FW takes care of using passive - * scan for DFS and active for non DFS channels. - */ - scan_request.scanType = eSIR_ACTIVE_SCAN; - /* Set min and max channel time to zero */ - scan_request.minChnTime = 0; - scan_request.maxChnTime = 0; - /* Set BSSType to default type */ - scan_request.BSSType = eCSR_BSS_TYPE_ANY; -#else + req = qdf_mem_malloc(sizeof(*req)); if (!req) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, @@ -1813,27 +1797,16 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, req->scan_req.scan_id = ucfg_scan_get_scan_id(mac_ctx->psoc); req->scan_req.vdev_id = wlan_vdev_get_id(vdev); req->scan_req.scan_req_id = sap_context->req_id; -#endif sap_get_channel_list(sap_context, &channel_list, &num_of_channels); #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE if (num_of_channels != 0) { #endif -#ifndef NAPIER_SCAN - /*Scan the channels in the list */ - scan_request.ChannelInfo.numOfChannels = - num_of_channels; - scan_request.ChannelInfo.ChannelList = - channel_list; - scan_request.requestType = - eCSR_SCAN_SOFTAP_CHANNEL_RANGE; -#else req->scan_req.num_chan = num_of_channels; for (i = 0; i < num_of_channels; i++) req->scan_req.chan_list[i] = wlan_chan_to_freq(channel_list[i]); -#endif sap_context->channelList = channel_list; sap_context->num_of_channel = num_of_channels; /* Set requestType to Full scan */ @@ -1846,36 +1819,9 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, #endif sme_scan_flush_result(h_hal); sap_context->sap_acs_pre_start_bss = sap_do_acs_pre_start_bss; -#ifndef NAPIER_SCAN - if (true == sap_do_acs_pre_start_bss) { - /* - * when ID == 0 11D scan/active scan with callback, - * min-maxChntime set in csrScanRequest()? - * csrScanCompleteCallback callback - * pContext scan_request_id filled up - */ - qdf_ret_status = sme_scan_request(h_hal, - sap_context->sessionId, - &scan_request, - &wlansap_pre_start_bss_acs_scan_callback, - sap_context); - } else { - /* - * when ID == 0 11D scan/active scan with callback, - * min-maxChntime set in csrScanRequest()? - * csrScanCompleteCallback callback, - * pContext scan_request_id filled up - */ - qdf_ret_status = sme_scan_request(h_hal, - sap_context->sessionId, - &scan_request, - &wlansap_scan_callback, - sap_context); - } -#else qdf_ret_status = ucfg_scan_start(req); wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_SME_ID); -#endif + if (QDF_STATUS_SUCCESS != qdf_ret_status) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("sme_scan_request fail %d!!!"), @@ -1913,11 +1859,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, } else { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("return sme_ScanReq, scanID=%d, Ch=%d"), -#ifndef NAPIER_SCAN - scan_request.scan_id, -#else req->scan_req.scan_id, -#endif sap_context->channel); } #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index a484b9b477e0..c8d92bc978c5 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -392,11 +392,10 @@ QDF_STATUS wlansap_start(void *pCtx, enum tQDF_ADAPTER_MODE mode, __func__, qdf_ret_status); return QDF_STATUS_E_FAILURE; } -#ifdef NAPIER_SCAN /* Register with scan component */ pSapCtx->req_id = ucfg_scan_register_requester(pmac->psoc, "SAP", sap_scan_event_callback, pSapCtx); -#endif + return QDF_STATUS_SUCCESS; } @@ -445,9 +444,7 @@ QDF_STATUS wlansap_stop(void *pCtx) FL("sap session can't be closed")); return QDF_STATUS_E_FAULT; } -#ifdef NAPIER_SCAN ucfg_scan_unregister_requester(pmac->psoc, pSapCtx->req_id); -#endif sap_free_roam_profile(&pSapCtx->csr_roamProfile); if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_destroy(&pSapCtx->SapGlobalLock))) { diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 4681e3158f11..2d8cfda7c822 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -905,12 +905,10 @@ QDF_STATUS csr_start(tpAniSirGlobal pMac) sme_warn("csr_start: Couldn't Init HO control blk "); break; } -#ifdef NAPIER_SCAN /* Register with scan component */ pMac->scan.requester_id = ucfg_scan_register_requester( pMac->psoc, "CSR", csr_scan_callback, pMac); -#endif } while (0); return status; } diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index e1865b70dd2b..382ad013c52f 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -51,14 +51,12 @@ #include "wlan_hdd_main.h" #include "pld_common.h" #include "csr_internal.h" -#ifdef NAPIER_SCAN #include #include #include #include #include #include -#endif #include "wlan_reg_services_api.h" #define MIN_CHN_TIME_TO_FIND_GO 100 @@ -5275,7 +5273,6 @@ void csr_scan_active_list_timeout_handle(void *userData) csr_release_command(mac_ctx, scan_cmd); } -#ifdef NAPIER_SCAN static enum wlan_auth_type csr_covert_auth_type_new(eCsrAuthType auth) { switch (auth) { @@ -5936,4 +5933,3 @@ QDF_STATUS csr_scan_filter_results(tpAniSirGlobal mac_ctx) wlan_objmgr_pdev_release_ref(pdev, WLAN_LEGACY_MAC_ID); return QDF_STATUS_SUCCESS; } -#endif