From b45399a48b5ccab044ae67b3b592bcb1be175c58 Mon Sep 17 00:00:00 2001 From: Deepak Dhamdhere Date: Sat, 7 Nov 2015 00:23:22 -0800 Subject: [PATCH] qcacld-3.0: Remove #ifdef WLAN_FEATURE_NEIGHBOR_ROAMING from SME The condition #ifdef WLAN_FEATURE_NEIGHBOR_ROAMING is used to include some of the roaming code. It has been defined for all the recent driver builds. Roaming code underneath is permanent part of the driver. Remove #ifdef WLAN_FEATURE_NEIGHBOR_ROAMING compiler flag from SME and CSR so that the code will always be compiled in. CRs-Fixed: 936683 Change-Id: I63a43b7cfd9360341d4ac4126cbf9fc8ac89071a --- core/sme/inc/csr_api.h | 4 -- core/sme/inc/csr_internal.h | 8 --- core/sme/inc/csr_neighbor_roam.h | 2 - core/sme/inc/sme_api.h | 2 - core/sme/src/common/sme_api.c | 2 - core/sme/src/common/sme_ft_api.c | 2 - core/sme/src/csr/csr_api_roam.c | 89 ++++++++-------------------- core/sme/src/csr/csr_neighbor_roam.c | 6 +- 8 files changed, 27 insertions(+), 88 deletions(-) diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index b74e411153f9..e7df8894e350 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -1035,7 +1035,6 @@ typedef struct tagCsr11rConfigParams { } tCsr11rConfigParams; #endif -#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING typedef struct tagCsrNeighborRoamConfigParams { uint32_t nNeighborScanTimerPeriod; @@ -1057,7 +1056,6 @@ typedef struct tagCsrNeighborRoamConfigParams { uint32_t nhi_rssi_scan_delay; int32_t nhi_rssi_scan_rssi_ub; } tCsrNeighborRoamConfigParams; -#endif typedef struct tagCsrConfigParam { uint32_t FragmentationThreshold; @@ -1158,9 +1156,7 @@ typedef struct tagCsrConfigParam { uint8_t RoamRssiDiff; bool isWESModeEnabled; #endif -#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING tCsrNeighborRoamConfigParams neighborRoamConfig; -#endif /* * Instead of Reassoc, send ADDTS/DELTS even when ACM is off for that AC * This is mandated by WMM-AC certification diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index 0dc1db38f7a8..76288c29bae6 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -40,9 +40,7 @@ #include "csr_support.h" #include "cds_reg_service.h" -#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING #include "csr_neighbor_roam.h" -#endif #include "sir_types.h" @@ -464,7 +462,6 @@ typedef struct tagCsr11rConfig { } tCsr11rConfig; #endif -#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING typedef struct tagCsrNeighborRoamConfig { uint32_t nNeighborScanTimerPeriod; uint8_t nNeighborLookupRssiThreshold; @@ -485,7 +482,6 @@ typedef struct tagCsrNeighborRoamConfig { uint32_t nhi_rssi_scan_delay; int32_t nhi_rssi_scan_rssi_ub; } tCsrNeighborRoamConfig; -#endif typedef struct tagCsrConfig { uint32_t agingCount; @@ -591,9 +587,7 @@ typedef struct tagCsrConfig { uint16_t nRoamScanHomeAwayTime; #endif -#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING tCsrNeighborRoamConfig neighborRoamConfig; -#endif /* * Instead of Reassoc, send ADDTS/DELTS even when ACM is off for @@ -1022,9 +1016,7 @@ typedef struct tagCsrRoamStruct { tCsrTimerInfo WaitForKeyTimerInfo; tCsrRoamSession *roamSession; uint32_t transactionId; /* Current transaction ID for internal use. */ -#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING tCsrNeighborRoamControlInfo neighborRoamInfo[CSR_ROAM_SESSION_MAX]; -#endif #ifdef FEATURE_WLAN_LFR uint8_t isFastRoamIniFeatureEnabled; #endif diff --git a/core/sme/inc/csr_neighbor_roam.h b/core/sme/inc/csr_neighbor_roam.h index 6bf27d01a963..10dfaa05d915 100644 --- a/core/sme/inc/csr_neighbor_roam.h +++ b/core/sme/inc/csr_neighbor_roam.h @@ -35,7 +35,6 @@ #ifndef CSR_NEIGHBOR_ROAM_H #define CSR_NEIGHBOR_ROAM_H -#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING #include "sme_api.h" #define ROAM_AP_AGE_LIMIT_MS 10000 @@ -307,5 +306,4 @@ CDF_STATUS csr_roam_offload_send_synch_cnf(tpAniSirGlobal pMac, CDF_STATUS csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac, roam_offload_synch_ind *roam_synch_ind_ptr, uint8_t sessionId); #endif -#endif /* WLAN_FEATURE_NEIGHBOR_ROAMING */ #endif /* CSR_NEIGHBOR_ROAM_H */ diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index 748652169697..f99f70b83eee 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -615,7 +615,6 @@ CDF_STATUS sme_update_is_ese_feature_enabled(tHalHandle hHal, uint8_t sessionId, #endif /* FEATURE_WLAN_ESE */ CDF_STATUS sme_update_config_fw_rssi_monitoring(tHalHandle hHal, bool fEnableFwRssiMonitoring); -#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING CDF_STATUS sme_set_roam_rescan_rssi_diff(tHalHandle hHal, uint8_t sessionId, const uint8_t nRoamRescanRssiDiff); @@ -665,7 +664,6 @@ uint8_t sme_get_roam_bmiss_final_bcnt(tHalHandle hHal); CDF_STATUS sme_set_roam_beacon_rssi_weight(tHalHandle hHal, uint8_t sessionId, const uint8_t nRoamBeaconRssiWeight); uint8_t sme_get_roam_beacon_rssi_weight(tHalHandle hHal); -#endif #if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || \ defined(FEATURE_WLAN_LFR) uint8_t sme_get_roam_rssi_diff(tHalHandle hHal); diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index bca29ecb6c8e..e8fe27604ef3 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -8610,7 +8610,6 @@ CDF_STATUS sme_update_config_fw_rssi_monitoring(tHalHandle hHal, return cdf_ret_status; } -#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING /* --------------------------------------------------------------------------- \fn sme_set_roam_opportunistic_scan_threshold_diff \brief Update Opportunistic Scan threshold diff @@ -9424,7 +9423,6 @@ uint16_t sme_get_neighbor_scan_period(tHalHandle hHal, uint8_t sessionId) neighborScanPeriod; } -#endif #if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR) diff --git a/core/sme/src/common/sme_ft_api.c b/core/sme/src/common/sme_ft_api.c index b48e13f10cb3..8f141861a33c 100644 --- a/core/sme/src/common/sme_ft_api.c +++ b/core/sme/src/common/sme_ft_api.c @@ -561,14 +561,12 @@ void sme_get_rici_es(tHalHandle hHal, uint32_t sessionId, uint8_t *ric_ies, *------------------------------------------------------------------------*/ void sme_preauth_reassoc_intvl_timer_callback(void *context) { -#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING tFTRoamCallbackUsrCtx *pUsrCtx = (tFTRoamCallbackUsrCtx *) context; if (pUsrCtx) { csr_neighbor_roam_request_handoff(pUsrCtx->pMac, pUsrCtx->sessionId); } -#endif return; } diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 44908ed713a6..a8f575486a73 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -47,9 +47,7 @@ #include "csr_internal.h" #include "cds_reg_service.h" #include "mac_trace.h" -#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING #include "csr_neighbor_roam.h" -#endif /* WLAN_FEATURE_NEIGHBOR_ROAMING */ #include "cds_regdomain_common.h" #include "cds_utils.h" #include "sir_types.h" @@ -712,10 +710,8 @@ CDF_STATUS csr_start(tpAniSirGlobal pMac) pMac->roam.sPendingCommands = 0; csr_scan_enable(pMac); -#if defined WLAN_FEATURE_NEIGHBOR_ROAMING for (i = 0; i < CSR_ROAM_SESSION_MAX; i++) status = csr_neighbor_roam_init(pMac, i); -#endif /* WLAN_FEATURE_NEIGHBOR_ROAMING */ pMac->roam.tlStatsReqInfo.numClient = 0; pMac->roam.tlStatsReqInfo.periodicity = 0; pMac->roam.tlStatsReqInfo.timerRunning = false; @@ -747,10 +743,8 @@ CDF_STATUS csr_stop(tpAniSirGlobal pMac, tHalStopType stopType) pMac->scan.fRestartIdleScan = false; csr_ll_purge(&pMac->roam.roamCmdPendingList, true); -#if defined WLAN_FEATURE_NEIGHBOR_ROAMING for (sessionId = 0; sessionId < CSR_ROAM_SESSION_MAX; sessionId++) csr_neighbor_roam_close(pMac, sessionId); -#endif for (sessionId = 0; sessionId < CSR_ROAM_SESSION_MAX; sessionId++) if (CSR_IS_SESSION_VALID(pMac, sessionId)) csr_scan_flush_result(pMac); @@ -1272,7 +1266,6 @@ static void init_config_param(tpAniSirGlobal pMac) #ifdef WLAN_FEATURE_VOWIFI_11R pMac->roam.configParam.csr11rConfig.IsFTResourceReqSupported = 0; #endif -#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING pMac->roam.configParam.neighborRoamConfig.nMaxNeighborRetries = 3; pMac->roam.configParam.neighborRoamConfig.nNeighborLookupRssiThreshold = 120; @@ -1296,7 +1289,6 @@ static void init_config_param(tpAniSirGlobal pMac) pMac->roam.configParam.neighborRoamConfig.nRoamBmissFirstBcnt = 10; pMac->roam.configParam.neighborRoamConfig.nRoamBmissFinalBcnt = 10; pMac->roam.configParam.neighborRoamConfig.nRoamBeaconRssiWeight = 14; -#endif #ifdef WLAN_FEATURE_11AC pMac->roam.configParam.nVhtChannelWidth = WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ + 1; @@ -1888,7 +1880,6 @@ CDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, pMac->roam.configParam.isEseIniFeatureEnabled = pParam->isEseIniFeatureEnabled; #endif -#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING cdf_mem_copy(&pMac->roam.configParam.neighborRoamConfig, &pParam->neighborRoamConfig, sizeof(tCsrNeighborRoamConfigParams)); @@ -1944,7 +1935,6 @@ CDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, sms_log(pMac, LOG1, "nRoamBeaconRssiWeight = %d", pMac->roam.configParam.neighborRoamConfig. nRoamBeaconRssiWeight); -#endif pMac->roam.configParam.addTSWhenACMIsOff = pParam->addTSWhenACMIsOff; pMac->scan.fValidateList = pParam->fValidateList; @@ -2087,11 +2077,9 @@ CDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) pParam->fEnableMCCMode = cfg_params->fenableMCCMode; pParam->fAllowMCCGODiffBI = cfg_params->fAllowMCCGODiffBI; pParam->scanCfgAgingTime = pMac->scan.scanResultCfgAgingTime; -#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING cdf_mem_copy(&pParam->neighborRoamConfig, &cfg_params->neighborRoamConfig, sizeof(tCsrNeighborRoamConfigParams)); -#endif #ifdef WLAN_FEATURE_11AC pParam->nVhtChannelWidth = cfg_params->nVhtChannelWidth; pParam->enableTxBF = cfg_params->txBFEnable; @@ -2124,7 +2112,6 @@ CDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) #ifdef FEATURE_WLAN_ESE pParam->isEseIniFeatureEnabled = cfg_params->isEseIniFeatureEnabled; #endif -#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING cdf_mem_copy(&pParam->neighborRoamConfig, &cfg_params->neighborRoamConfig, sizeof(tCsrNeighborRoamConfigParams)); @@ -2138,7 +2125,6 @@ CDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) cfg_params->neighborRoamConfig. neighborScanChanList.channelList[i]); } -#endif #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH pParam->cc_switch_mode = cfg_params->cc_switch_mode; @@ -2908,11 +2894,7 @@ CDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, /* Returns whether handoff is currently in progress or not */ bool csr_roam_is_handoff_in_progress(tpAniSirGlobal pMac, uint8_t sessionId) { -#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING return csr_neighbor_roam_is_handoff_in_progress(pMac, sessionId); -#else - return false; -#endif } CDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal pMac, uint32_t sessionId, @@ -5451,22 +5433,14 @@ static CDF_STATUS csr_roam_save_security_rsp_ie(tpAniSirGlobal pMac, /* Returns whether the current association is a 11r assoc or not */ bool csr_roam_is11r_assoc(tpAniSirGlobal pMac, uint8_t sessionId) { -#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING return csr_neighbor_roam_is11r_assoc(pMac, sessionId); -#else - return false; -#endif } #endif #ifdef FEATURE_WLAN_ESE /* Returns whether the current association is a ESE assoc or not */ bool csr_roam_is_ese_assoc(tpAniSirGlobal pMac, uint8_t sessionId) { -#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING return csr_neighbor_roam_is_ese_assoc(pMac, sessionId); -#else - return false; -#endif } #endif #ifdef FEATURE_WLAN_LFR @@ -5720,7 +5694,6 @@ static void csr_roam_process_results_default(tpAniSirGlobal mac_ctx, &session->joinFailStatusCode.bssId, sizeof(struct cdf_mac_addr)); -#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING /* * If Join fails while Handoff is in progress, indicate * disassociated event to supplicant to reconnect @@ -5729,7 +5702,6 @@ static void csr_roam_process_results_default(tpAniSirGlobal mac_ctx, csr_neighbor_roam_indicate_connect(mac_ctx, (uint8_t)session_id, CDF_STATUS_E_FAILURE); } -#endif if (session->bRefAssocStartCnt > 0) { session->bRefAssocStartCnt--; if (eCsrJoinFailureDueToConcurrency == res) @@ -7997,7 +7969,6 @@ static void csr_roam_join_rsp_processor(tpAniSirGlobal pMac, sms_log(pMac, LOGW, "SmeJoinReq failed with statusCode= 0x%08X [%d]", pSmeJoinRsp->statusCode, pSmeJoinRsp->statusCode); -#if defined WLAN_FEATURE_NEIGHBOR_ROAMING /* If Join fails while Handoff is in progress, indicate disassociated event to supplicant to reconnect */ if (csr_roam_is_handoff_in_progress(pMac, pSmeJoinRsp->sessionId)) { csr_roam_call_callback(pMac, pSmeJoinRsp->sessionId, NULL, @@ -8008,7 +7979,6 @@ static void csr_roam_join_rsp_processor(tpAniSirGlobal pMac, pSmeJoinRsp->sessionId, CDF_STATUS_E_FAILURE); } -#endif /* * if userspace has issued disconnection, * driver should not continue connecting @@ -8523,18 +8493,17 @@ static void csr_roam_roaming_state_reassoc_rsp_processor(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("CSR SmeReassocReq Successful")); result = eCsrReassocSuccess; - /* Defeaturize this part later if needed */ -#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING - /* Since the neighbor roam algorithm uses reassoc req for handoff instead of join, - * we need the response contents while processing the result in csr_roam_process_results() */ + /* + * Since the neighbor roam algorithm uses reassoc req for + * handoff instead of join, we need the response contents while + * processing the result in csr_roam_process_results() + */ if (csr_roam_is_handoff_in_progress(pMac, pSmeJoinRsp->sessionId)) { /* Need to dig more on indicating events to SME QoS module */ sme_qos_csr_event_ind(pMac, pSmeJoinRsp->sessionId, SME_QOS_CSR_HANDOFF_COMPLETE, NULL); csr_roam_complete(pMac, result, pSmeJoinRsp); - } else -#endif - { + } else { csr_roam_complete(pMac, result, NULL); } } @@ -8758,13 +8727,11 @@ csr_check_profile_in_scan_cache(tpAniSirGlobal mac_ctx, void csr_roam_roaming_state_disassoc_rsp_processor(tpAniSirGlobal pMac, tSirSmeDisassocRsp *pSmeRsp) { -#if defined WLAN_FEATURE_NEIGHBOR_ROAMING tScanResultHandle hBSSList; tCsrRoamInfo roamInfo; tCsrScanResultFilter *pScanFilter = NULL; uint32_t roamId = 0; tCsrRoamProfile *pCurRoamProfile = NULL; -#endif CDF_STATUS status; uint32_t sessionId; tCsrRoamSession *pSession; @@ -8806,7 +8773,6 @@ void csr_roam_roaming_state_disassoc_rsp_processor(tpAniSirGlobal pMac, FL("CSR SmeDisassocReq due to HO on session %d"), sessionId); pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; -#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING /* * First ensure if the roam profile is in the scan cache. * If not, post a reassoc failure and disconnect. @@ -8866,9 +8832,8 @@ void csr_roam_roaming_state_disassoc_rsp_processor(tpAniSirGlobal pMac, } POST_ROAM_FAILURE: - csr_post_roam_failure(pMac, sessionId, &roamInfo, + csr_post_roam_failure(pMac, sessionId, &roamInfo, pScanFilter, pCurRoamProfile); -#endif } /* else if ( CSR_IS_ROAM_SUBSTATE_DISASSOC_HO( pMac ) ) */ else if (CSR_IS_ROAM_SUBSTATE_REASSOC_FAIL(pMac, sessionId)) { /* Disassoc due to Reassoc failure falls into this codepath */ @@ -15231,32 +15196,32 @@ static uint32_t csr_find_ibss_session(tpAniSirGlobal pMac) static void csr_roam_link_up(tpAniSirGlobal pMac, struct cdf_mac_addr bssid) { - /* Update the current BSS info in ho control block based on connected - profile info from pmac global structure */ + uint32_t sessionId = 0; + + /* + * Update the current BSS info in ho control block based on connected + * profile info from pmac global structure + */ sms_log(pMac, LOGW, " csr_roam_link_up: WLAN link UP with AP= " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(bssid.bytes)); - /* Check for user misconfig of RSSI trigger threshold */ + /* Check for user misconfig of RSSI trigger threshold */ pMac->roam.configParam.vccRssiThreshold = (0 == pMac->roam.configParam.vccRssiThreshold) ? - CSR_VCC_RSSI_THRESHOLD : pMac->roam.configParam.vccRssiThreshold; + CSR_VCC_RSSI_THRESHOLD : + pMac->roam.configParam.vccRssiThreshold; pMac->roam.vccLinkQuality = eCSR_ROAM_LINK_QUAL_POOR_IND; - /* Check for user misconfig of UL MAC Loss trigger threshold */ + /* Check for user misconfig of UL MAC Loss trigger threshold */ pMac->roam.configParam.vccUlMacLossThreshold = (0 == pMac->roam.configParam.vccUlMacLossThreshold) ? CSR_VCC_UL_MAC_LOSS_THRESHOLD : pMac->roam.configParam. vccUlMacLossThreshold; -#if defined WLAN_FEATURE_NEIGHBOR_ROAMING - { - uint32_t sessionId = 0; - /* Indicate the neighbor roal algorithm about the connect indication */ - csr_roam_get_session_id_from_bssid(pMac, &bssid, - &sessionId); - csr_neighbor_roam_indicate_connect(pMac, sessionId, - CDF_STATUS_SUCCESS); - } -#endif + /* Indicate the neighbor roal algorithm about the connect indication */ + csr_roam_get_session_id_from_bssid(pMac, &bssid, + &sessionId); + csr_neighbor_roam_indicate_connect(pMac, sessionId, + CDF_STATUS_SUCCESS); } static void csr_roam_link_down(tpAniSirGlobal pMac, uint32_t sessionId) @@ -15290,10 +15255,8 @@ static void csr_roam_link_down(tpAniSirGlobal pMac, uint32_t sessionId) /* deregister the clients requesting stats from PE/TL & also stop the corresponding timers */ csr_roam_dereg_statistics_req(pMac); pMac->roam.vccLinkQuality = eCSR_ROAM_LINK_QUAL_POOR_IND; -#if defined WLAN_FEATURE_NEIGHBOR_ROAMING /* Indicate the neighbor roal algorithm about the disconnect indication */ csr_neighbor_roam_indicate_disconnect(pMac, sessionId); -#endif /* Remove this code once SLM_Sessionization is supported */ /* BMPS_WORKAROUND_NOT_NEEDED */ @@ -17744,10 +17707,9 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, sms_log(pMac, LOGE, FL("pSession is NULL")); return; } -#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING - status = - csr_neighbor_roam_preauth_rsp_handler(pMac, pFTPreAuthRsp->smeSessionId, - pFTPreAuthRsp->status); + status = csr_neighbor_roam_preauth_rsp_handler(pMac, + pFTPreAuthRsp->smeSessionId, + pFTPreAuthRsp->status); if (status != CDF_STATUS_SUCCESS) { /* * Bail out if pre-auth was not even processed. @@ -17757,7 +17719,6 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, status, sessionId); return; } -#endif /* The below function calls/timers should be invoked only if the pre-auth is successful */ if (CDF_STATUS_SUCCESS != (CDF_STATUS) pFTPreAuthRsp->status) diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index 31cae0c215ba..b015bb855a46 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -34,7 +34,6 @@ transitions and Legacy roaming for Android platform. ========================================================================== */ -#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING #include "wma_types.h" #include "cds_mq.h" #include "csr_inside_api.h" @@ -1121,7 +1120,7 @@ DEQ_PREAUTH: csr_dequeue_roam_command(mac_ctx, eCsrPerformPreauth); return preauth_processed; } -#endif /* WLAN_FEATURE_NEIGHBOR_ROAMING */ +#endif /* WLAN_FEATURE_VOWIFI_11R */ #ifdef WLAN_FEATURE_ROAM_OFFLOAD /** @@ -3046,7 +3045,7 @@ bool csr_neighbor_roam_is_handoff_in_progress(tpAniSirGlobal pMac, uint8_t sessi return false; } -#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(WLAN_FEATURE_NEIGHBOR_ROAMING) +#if defined(WLAN_FEATURE_VOWIFI_11R) /* --------------------------------------------------------------------------- \fn csr_neighbor_roam_is11r_assoc @@ -3553,4 +3552,3 @@ CDF_STATUS csr_neighbor_roam_start_lfr_scan(tpAniSirGlobal pMac, uint8_t session return CDF_STATUS_SUCCESS; } -#endif /* WLAN_FEATURE_NEIGHBOR_ROAMING */