From a66f9c5d71758472cdffd826d77150d8437a8f04 Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Wed, 17 Feb 2016 09:58:40 -0800 Subject: [PATCH] qcacld-3.0: Remove WLAN_FEATURE_ROAM_SCAN_OFFLOAD Remove WLAN_FEATURE_ROAM_SCAN_OFFLOAD compile time flag from the code since this is relevant to roaming (LFR2.0) and always enabled by default. The flag also does not seem to cover the feature entirely and it does not make any meaning to only cover this piece of code. CRs-Fixed: 978905 Change-Id: Ifa393c2733e87fcb34aba3e4f4cdb5f534196537 --- core/hdd/src/wlan_hdd_ioctl.c | 7 +------ core/sme/src/common/sme_api.c | 2 -- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index a042203e4a34..eb2622b3149d 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -4653,9 +4653,7 @@ static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter, tSirMacAddr targetApBssid; uint32_t roamId = 0; tCsrRoamModifyProfileFields modProfileFields; -#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD tCsrHandoffRequest handoffInfo; -#endif hdd_station_ctx_t *pHddStaCtx; if (QDF_STA_MODE != adapter->device_mode) { @@ -4723,15 +4721,12 @@ static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter, } #endif /* Proceed with reassoc */ -#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD handoffInfo.channel = channel; handoffInfo.src = FASTREASSOC; - qdf_mem_copy(handoffInfo.bssid, targetApBssid, + qdf_mem_copy(handoffInfo.bssid.bytes, targetApBssid, sizeof(tSirMacAddr)); sme_handoff_request(hdd_ctx->hHal, adapter->sessionId, &handoffInfo); -#endif - exit: return ret; } diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 3384d3e0cf53..4c4bdcb744c1 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -15223,13 +15223,11 @@ QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, } sme_release_global_lock(&mac_ctx->sme); } -#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD if (mac_ctx->roam.configParam.isRoamOffloadScanEnabled && status == QDF_STATUS_SUCCESS) { csr_roam_offload_scan(mac_ctx, session_id, ROAM_SCAN_OFFLOAD_UPDATE_CFG, reason); } -#endif return status; }