qcacld-3.0: Replace tHalHandle in sap_ch_select

I9d0d7d109621237f29d66f7b06c5b63c38f63fb2 (qcacld-3.0: Introduce
mac_handle_t) introduced a "better" name for tHalHandle, so replace
tHalHandle with mac_handle_t in sap_ch_select.

Change-Id: I204e955c7cda75bbed27a8653fbca4cca4f4b055
CRs-Fixed: 2348556
This commit is contained in:
Jeff Johnson
2018-11-07 16:12:13 -08:00
parent 6340ee0e43
commit adf1313618
2 changed files with 10 additions and 10 deletions

View File

@@ -321,7 +321,7 @@ sap_check_n_add_overlapped_chnls(struct sap_context *sap_ctx,
* *
* Return: void * Return: void
*/ */
static void sap_process_avoid_ie(tHalHandle hal, static void sap_process_avoid_ie(mac_handle_t hal,
struct sap_context *sap_ctx, struct sap_context *sap_ctx,
tScanResultHandle scan_result, tScanResultHandle scan_result,
tSapChSelSpectInfo *spect_info) tSapChSelSpectInfo *spect_info)
@@ -406,7 +406,7 @@ static void sap_process_avoid_ie(tHalHandle hal,
RETURN VALUE RETURN VALUE
NULL NULL
============================================================================*/ ============================================================================*/
void sap_update_unsafe_channel_list(tHalHandle hal, struct sap_context *sap_ctx) void sap_update_unsafe_channel_list(mac_handle_t hal, struct sap_context *sap_ctx)
{ {
uint16_t i, j; uint16_t i, j;
uint16_t unsafe_channel_list[NUM_CHANNELS]; uint16_t unsafe_channel_list[NUM_CHANNELS];
@@ -568,7 +568,7 @@ uint8_t sap_select_preferred_channel_from_channel_list(uint8_t best_chnl,
PARAMETERS PARAMETERS
IN IN
halHandle : Pointer to tHalHandle halHandle : Pointer to mac_handle_t
*pSpectInfoParams : Pointer to tSapChSelSpectInfo structure *pSpectInfoParams : Pointer to tSapChSelSpectInfo structure
sap_ctx : Pointer to SAP Context sap_ctx : Pointer to SAP Context
@@ -577,7 +577,7 @@ uint8_t sap_select_preferred_channel_from_channel_list(uint8_t best_chnl,
SIDE EFFECTS SIDE EFFECTS
============================================================================*/ ============================================================================*/
static bool sap_chan_sel_init(tHalHandle halHandle, static bool sap_chan_sel_init(mac_handle_t halHandle,
tSapChSelSpectInfo *pSpectInfoParams, tSapChSelSpectInfo *pSpectInfoParams,
struct sap_context *sap_ctx) struct sap_context *sap_ctx)
{ {
@@ -1512,7 +1512,7 @@ static bool ch_in_pcl(struct sap_context *sap_ctx, uint8_t channel)
* and number of BSS * and number of BSS
*/ */
static void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams, static void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams,
tHalHandle halHandle, mac_handle_t halHandle,
tScanResultHandle pResult, tScanResultHandle pResult,
struct sap_context *sap_ctx) struct sap_context *sap_ctx)
{ {
@@ -2541,7 +2541,7 @@ static bool sap_is_ch_non_overlap(struct sap_context *sap_ctx, uint16_t ch)
* *
* Returns: channel number if success, 0 otherwise * Returns: channel number if success, 0 otherwise
*/ */
static uint8_t sap_select_channel_no_scan_result(tHalHandle hal, static uint8_t sap_select_channel_no_scan_result(mac_handle_t hal,
struct sap_context *sap_ctx) struct sap_context *sap_ctx)
{ {
enum channel_state ch_type; enum channel_state ch_type;
@@ -2607,7 +2607,7 @@ static uint8_t sap_select_channel_no_scan_result(tHalHandle hal,
return first_safe_ch_in_range; return first_safe_ch_in_range;
} }
#else #else
static uint8_t sap_select_channel_no_scan_result(tHalHandle hal, static uint8_t sap_select_channel_no_scan_result(mac_handle_t hal,
struct sap_context *sap_ctx) struct sap_context *sap_ctx)
{ {
uint32_t start_ch_num = sap_ctx->acs_cfg->start_ch; uint32_t start_ch_num = sap_ctx->acs_cfg->start_ch;
@@ -2636,7 +2636,7 @@ static uint8_t sap_select_channel_no_scan_result(tHalHandle hal,
* *
* Returns: channel number if success, 0 otherwise * Returns: channel number if success, 0 otherwise
*/ */
uint8_t sap_select_channel(tHalHandle hal, struct sap_context *sap_ctx, uint8_t sap_select_channel(mac_handle_t hal, struct sap_context *sap_ctx,
tScanResultHandle scan_result) tScanResultHandle scan_result)
{ {
/* DFS param object holding all the data req by the algo */ /* DFS param object holding all the data req by the algo */

View File

@@ -315,7 +315,7 @@ QDF_STATUS wlansap_pre_start_bss_acs_scan_callback(mac_handle_t hal_handle,
QDF_STATUS SapFsm(struct sap_context *sapContext, ptWLAN_SAPEvent sapEvent, QDF_STATUS SapFsm(struct sap_context *sapContext, ptWLAN_SAPEvent sapEvent,
uint8_t *status); uint8_t *status);
uint8_t sap_select_channel(tHalHandle halHandle, struct sap_context *sap_ctx, uint8_t sap_select_channel(mac_handle_t halHandle, struct sap_context *sap_ctx,
tScanResultHandle pScanResult); tScanResultHandle pScanResult);
QDF_STATUS QDF_STATUS
@@ -354,7 +354,7 @@ sap_search_mac_list(struct qdf_mac_addr *macList, uint8_t num_mac,
uint8_t *peerMac, uint8_t *index); uint8_t *peerMac, uint8_t *index);
#ifdef FEATURE_WLAN_CH_AVOID #ifdef FEATURE_WLAN_CH_AVOID
void sap_update_unsafe_channel_list(tHalHandle hal, void sap_update_unsafe_channel_list(mac_handle_t hal,
struct sap_context *sap_ctx); struct sap_context *sap_ctx);
#endif /* FEATURE_WLAN_CH_AVOID */ #endif /* FEATURE_WLAN_CH_AVOID */