diff options
| author | Vignesh Viswanathan <viswanat@codeaurora.org> | 2018-09-19 11:59:49 +0530 |
|---|---|---|
| committer | nshrivas <nshrivas@codeaurora.org> | 2018-09-19 08:44:25 -0700 |
| commit | c734e570e883dd9a10caa6d2e4b9c2aa6f208e2b (patch) | |
| tree | 9f793f8c34788618f5adf54b3c5018008f754347 | |
| parent | 62d595ed6a6cee0cecd1daa4e868e3243cf44690 (diff) | |
qcacld-3.0: Fix compilation issues with WLAN_FEATURE_ROAM_OFFLOAD disabled
Fix compilation issues seen with WLAN_FEATURE_ROAM_OFFLOAD flag disabled
in Kbuild.
Change-Id: I0e4ffb099bfe0f766228031d7b5e80ac4a40ae9e
CRs-Fixed: 2318258
| -rw-r--r-- | core/sme/src/common/sme_api.c | 2 | ||||
| -rw-r--r-- | core/sme/src/csr/csr_util.c | 28 | ||||
| -rw-r--r-- | core/wma/src/wma_scan_roam.c | 2 |
3 files changed, 27 insertions, 5 deletions
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 0f5b31260983..d89a24a3ada0 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -19293,6 +19293,7 @@ sme_get_roam_scan_stats(tHalHandle hal, roam_scan_stats_cb cb, void *context, return status; } +#ifdef WLAN_FEATURE_ROAM_OFFLOAD QDF_STATUS sme_fast_reassoc(tHalHandle hal, tCsrRoamProfile *profile, const tSirMacAddr bssid, int channel, uint8_t vdev_id, const tSirMacAddr connected_bssid) @@ -19373,6 +19374,7 @@ QDF_STATUS sme_fast_reassoc(tHalHandle hal, tCsrRoamProfile *profile, return status; } +#endif void sme_enable_roaming_on_connected_sta(tHalHandle hal) { diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 8ea574af4922..76b4aa5aae56 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -3615,6 +3615,28 @@ static inline void csr_update_pmksa_to_profile(tCsrRoamProfile *profile, } #endif +/** + * csr_update_session_pmk() - Update the pmk len and pmk in the roam session + * @session: pointer to the CSR Roam session + * @pmkid_cache: pointer to the pmkid cache + * + * Return: None + */ +#ifdef WLAN_FEATURE_ROAM_OFFLOAD +static void csr_update_session_pmk(tCsrRoamSession *session, + tPmkidCacheInfo *pmkid_cache) +{ + session->pmk_len = pmkid_cache->pmk_len; + qdf_mem_zero(session->psk_pmk, sizeof(session->psk_pmk)); + qdf_mem_copy(session->psk_pmk, pmkid_cache->pmk, session->pmk_len); +} +#else +static inline void csr_update_session_pmk(tCsrRoamSession *session, + tPmkidCacheInfo *pmkid_cache) +{ +} +#endif + uint8_t csr_construct_rsn_ie(tHalHandle hHal, uint32_t sessionId, tCsrRoamProfile *pProfile, tSirBssDescription *pSirBssDesc, @@ -3753,11 +3775,7 @@ uint8_t csr_construct_rsn_ie(tHalHandle hHal, uint32_t sessionId, * update the PMK in CSR session also as this * will be sent to the FW during RSO. */ - session->pmk_len = pmkid_cache.pmk_len; - qdf_mem_zero(session->psk_pmk, - sizeof(session->psk_pmk)); - qdf_mem_copy(session->psk_pmk, pmkid_cache.pmk, - session->pmk_len); + csr_update_session_pmk(session, &pmkid_cache); csr_update_pmksa_to_profile(pProfile, &pmkid_cache); } else { diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index c695d71dcdd3..5b9e765648f0 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -1161,6 +1161,7 @@ QDF_STATUS wma_roam_scan_offload_rssi_thresh(tp_wma_handle wma_handle, return status; } +#ifdef WLAN_FEATURE_ROAM_OFFLOAD static const char *wma_roam_reason_to_string(uint32_t roam_reason) { switch (roam_reason) { @@ -1182,6 +1183,7 @@ static const char *wma_roam_reason_to_string(uint32_t roam_reason) return "unknown"; } } +#endif static const char *wma_roam_event_to_string(uint32_t roam_reason) { |