diff options
| author | Abhinav Kumar <abhikuma@codeaurora.org> | 2018-06-27 17:57:48 +0530 |
|---|---|---|
| committer | nshrivas <nshrivas@codeaurora.org> | 2018-07-09 18:03:47 -0700 |
| commit | 2ddd8e4972448625886a10666dc65f229bfc2ecd (patch) | |
| tree | 329dea00a6c7c32f11582827d8508c9ea2068551 | |
| parent | 4b5d52e4d2acbf2798dd3a9db943de87932cb654 (diff) | |
qcacld-3.0: Fix compilation error if we disable LFR3 featurization
If we disable LFR3 featurization (CONFIG_QCACLD_WLAN_LFR3=n),
Driver does not able to compile due to change present in
Change-Id: I4c91cac6bad400c8fa58b2a6ba2b282a3b7f1620.
Fix is to include change I4c91cac6bad400c8fa58b2a6ba2b282a3b7f1620
under WLAN_FEATURE_ROAM_OFFLOAD feature flag
Change-Id: I9dcf3bbcd5564c08b0ba52cfebfb2118fd50fee8
CRs-Fixed: 2268764
| -rw-r--r-- | core/sme/inc/sme_api.h | 2 | ||||
| -rw-r--r-- | core/sme/src/common/sme_api.c | 8 | ||||
| -rw-r--r-- | core/sme/src/csr/csr_api_roam.c | 3 | ||||
| -rw-r--r-- | core/sme/src/csr/csr_inside_api.h | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index 5c580a106734..952188a95819 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -421,6 +421,7 @@ QDF_STATUS sme_roam_set_pmkid_cache(tHalHandle hHal, uint8_t sessionId, uint32_t numItems, bool update_entire_cache); +#ifdef WLAN_FEATURE_ROAM_OFFLOAD /** * sme_get_pmk_info(): A wrapper function to request CSR to save PMK * @hal: Global structure @@ -432,7 +433,6 @@ QDF_STATUS sme_roam_set_pmkid_cache(tHalHandle hHal, uint8_t sessionId, void sme_get_pmk_info(tHalHandle hal, uint8_t session_id, tPmkidCacheInfo *pmk_cache); -#ifdef WLAN_FEATURE_ROAM_OFFLOAD QDF_STATUS sme_roam_set_psk_pmk(tHalHandle hHal, uint8_t sessionId, uint8_t *pPSK_PMK, size_t pmk_len); #endif diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index dd8f72cd38f4..88695c4a663c 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -4490,6 +4490,7 @@ QDF_STATUS sme_roam_del_pmkid_from_cache(tHalHandle hHal, uint8_t sessionId, return status; } +#ifdef WLAN_FEATURE_ROAM_OFFLOAD void sme_get_pmk_info(tHalHandle hal, uint8_t session_id, tPmkidCacheInfo *pmk_cache) { @@ -4502,6 +4503,13 @@ void sme_get_pmk_info(tHalHandle hal, uint8_t session_id, sme_release_global_lock(&mac_ctx->sme); } } +#else +static inline +void sme_get_pmk_info(tHalHandle hal, uint8_t session_id, + tPmkidCacheInfo *pmk_cache) +{} +#endif + #ifdef WLAN_FEATURE_ROAM_OFFLOAD /** * sme_roam_set_psk_pmk() - A wrapper function to request CSR to save PSK/PMK diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 57a6304012a0..511594c062bd 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -14503,6 +14503,7 @@ static void csr_roam_update_connected_profile_from_new_bss(tpAniSirGlobal pMac, } } +#ifdef WLAN_FEATURE_ROAM_OFFLOAD void csr_get_pmk_info(tpAniSirGlobal mac_ctx, uint8_t session_id, tPmkidCacheInfo *pmk_cache) { @@ -14521,7 +14522,7 @@ void csr_get_pmk_info(tpAniSirGlobal mac_ctx, uint8_t session_id, sizeof(session->psk_pmk)); pmk_cache->pmk_len = session->pmk_len; } -#ifdef WLAN_FEATURE_ROAM_OFFLOAD + QDF_STATUS csr_roam_set_psk_pmk(tpAniSirGlobal pMac, uint32_t sessionId, uint8_t *pPSK_PMK, size_t pmk_len) { diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h index 5f9edf88c93c..aadf6ea5f2b9 100644 --- a/core/sme/src/csr/csr_inside_api.h +++ b/core/sme/src/csr/csr_inside_api.h @@ -926,6 +926,7 @@ QDF_STATUS csr_roam_set_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, tPmkidCacheInfo *pPMKIDCache, uint32_t numItems, bool update_entire_cache); +#ifdef WLAN_FEATURE_ROAM_OFFLOAD /* * csr_get_pmk_info(): store PMK in pmk_cache * @mac_ctx: pointer to global structure for MAC @@ -940,7 +941,6 @@ QDF_STATUS csr_roam_set_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, void csr_get_pmk_info(tpAniSirGlobal mac_ctx, uint8_t session_id, tPmkidCacheInfo *pmk_cache); -#ifdef WLAN_FEATURE_ROAM_OFFLOAD /* * csr_roam_set_psk_pmk() - * store PSK/PMK |