samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Fix compile error for LFR2 when CM_ROAM_OFFLOAD enabled

Browse Source 
Fix compile error for LFR2 when CM_ROAM_OFFLOAD enabled.

Change-Id: Ia8a346a93c4b46e1a2daaed426a271d5f9e1f3e3
CRs-Fixed: 2786503
This commit is contained in:
hqu
2020-09-28 13:10:09 +08:00
committed by snandini
parent 7baa7b0782
commit 8b43074f9c
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/sme/src/csr/csr_api_roam.c
View File

@@ -20337,7 +20337,8 @@ csr_cm_fill_rso_channel_list(struct mac_context *mac_ctx,
rso_chan_info->chan_count, ch_cache_str); rso_chan_info->chan_count, ch_cache_str);
} }
#if defined(WLAN_SAE_SINGLE_PMK) && defined(WLAN_FEATURE_ROAM_OFFLOAD) #ifdef WLAN_FEATURE_ROAM_OFFLOAD
#ifdef WLAN_SAE_SINGLE_PMK
static bool static bool
csr_cm_fill_rso_sae_single_pmk_info(struct mac_context *mac_ctx, csr_cm_fill_rso_sae_single_pmk_info(struct mac_context *mac_ctx,
struct wlan_rso_11i_params *rso_11i_info, struct wlan_rso_11i_params *rso_11i_info,
@@ -20383,7 +20384,8 @@ csr_cm_fill_rso_sae_single_pmk_info(struct mac_context *mac_ctx,
{ {
return false; return false;
} }
#endif /* WLAN_SAE_SINGLE_PMK && WLAN_FEATURE_ROAM_OFFLOAD */ #endif
#endif
#ifdef WLAN_FEATURE_ROAM_OFFLOAD #ifdef WLAN_FEATURE_ROAM_OFFLOAD
#define RSN_CAPS_SHIFT 16 #define RSN_CAPS_SHIFT 16

16
core/wma/src/wma_scan_roam.c
View File

@@ -343,8 +343,8 @@ static void wma_handle_disconnect_reason(tp_wma_handle wma_handle,
(void *)del_sta_ctx, 0); (void *)del_sta_ctx, 0);
} }
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
#ifndef ROAM_OFFLOAD_V1 #ifndef ROAM_OFFLOAD_V1
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
/** /**
* wma_roam_scan_offload_set_params() - Set roam scan offload params * wma_roam_scan_offload_set_params() - Set roam scan offload params
* @wma_handle: pointer to wma context * @wma_handle: pointer to wma context
@@ -408,8 +408,16 @@ static void wma_roam_scan_offload_set_params(
params->roam_offload_params.roam_preauth_no_ack_timeout, params->roam_offload_params.roam_preauth_no_ack_timeout,
params->is_sae_same_pmk); params->is_sae_same_pmk);
} }
#else
static inline void
wma_roam_scan_offload_set_params(tp_wma_handle wma_handle,
struct roam_offload_scan_params *params,
struct roam_offload_scan_req *roam_req)
{}
#endif
#endif #endif
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
int wma_roam_vdev_disconnect_event_handler(void *handle, uint8_t *event, int wma_roam_vdev_disconnect_event_handler(void *handle, uint8_t *event,
uint32_t len) uint32_t len)
{ {
@@ -452,12 +460,6 @@ int wma_roam_vdev_disconnect_event_handler(void *handle, uint8_t *event,
return 0; return 0;
} }
#else
static inline void
wma_roam_scan_offload_set_params(tp_wma_handle wma_handle,
struct roam_offload_scan_params *params,
struct roam_offload_scan_req *roam_req)
{}
#endif #endif
#ifndef ROAM_OFFLOAD_V1 #ifndef ROAM_OFFLOAD_V1