samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Vork 0
Code Kwesties Pull-aanvragen Actions Packages Projecten Publicaties Wiki Activiteit

qcacld-3.0: Replace hHal in sap_api_link_cntl

Bladeren bron 
Recently all instances of tHalHandle were replaced with mac_handle_t
to align with current usage and the Linux coding standard. To align
with the new naming now replace all instances of hHal with mac_handle
in sap_api_link_cntl.

Change-Id: I1248b01c4da617c307bc7262e32c32e069491d1c
CRs-Fixed: 2349565
This commit is contained in:
Jeff Johnson
2018-11-08 07:57:04 -08:00
gecommit door nshrivas
bovenliggende 19681ce028
commit 793e5a9163
2 gewijzigde bestanden met toevoegingen van 22 en 21 verwijderingen
Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

39
core/sap/src/sap_api_link_cntl.c
Bestand weergeven

@@ -175,7 +175,7 @@ static const char *acs_scan_done_status_str(eCsrScanStatus status)
}
}
QDF_STATUS wlansap_pre_start_bss_acs_scan_callback(mac_handle_t hal_handle,
QDF_STATUS wlansap_pre_start_bss_acs_scan_callback(mac_handle_t mac_handle,
struct sap_context *sap_ctx,
uint8_t sessionid,
uint32_t scanid,
@@ -196,7 +196,7 @@ QDF_STATUS wlansap_pre_start_bss_acs_scan_callback(mac_handle_t hal_handle,
sap_select_default_oper_chan(sap_ctx->acs_cfg);
sap_ctx->channel = oper_channel;
sap_ctx->acs_cfg->pri_ch = oper_channel;
sap_config_acs_result(hal_handle, sap_ctx,
sap_config_acs_result(mac_handle, sap_ctx,
sap_ctx->acs_cfg->ht_sec_ch);
sap_ctx->sap_state = eSAP_ACS_CHANNEL_SELECTED;
sap_ctx->sap_status = eSAP_STATUS_SUCCESS;
@@ -210,7 +210,7 @@ QDF_STATUS wlansap_pre_start_bss_acs_scan_callback(mac_handle_t hal_handle,
* 2. Run channel selection algorithm
* select channel and store in sap_context->Channel
*/
scan_get_result_status = sme_scan_get_result(hal_handle,
scan_get_result_status = sme_scan_get_result(mac_handle,
sap_ctx->sessionId,
NULL, &presult);
if ((scan_get_result_status != QDF_STATUS_SUCCESS) &&
@@ -237,7 +237,7 @@ QDF_STATUS wlansap_pre_start_bss_acs_scan_callback(mac_handle_t hal_handle,
scanid);
}
#endif
oper_channel = sap_select_channel(hal_handle, sap_ctx, presult);
oper_channel = sap_select_channel(mac_handle, sap_ctx, presult);
sme_scan_result_purge(presult);
}
@@ -259,7 +259,7 @@ QDF_STATUS wlansap_pre_start_bss_acs_scan_callback(mac_handle_t hal_handle,
sap_ctx->acs_cfg->pri_ch = oper_channel;
sap_ctx->channel = oper_channel;
}
sap_config_acs_result(hal_handle, sap_ctx,
sap_config_acs_result(mac_handle, sap_ctx,
sap_ctx->acs_cfg->ht_sec_ch);
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
@@ -402,20 +402,20 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx,
* wlansap_roam_process_dfs_chansw_update() - handles the case for
* eCSR_ROAM_RESULT_DFS_CHANSW_UPDATE_SUCCESS in wlansap_roam_callback()
*
* @hal: hal global context
* @mac_handle: opaque handle to the global MAC context
* @sap_ctx: sap context
* @ret_status: update return status
*
* Return: void
*/
static void
wlansap_roam_process_dfs_chansw_update(mac_handle_t hHal,
struct sap_context *sap_ctx,
QDF_STATUS *ret_status)
wlansap_roam_process_dfs_chansw_update(mac_handle_t mac_handle,
struct sap_context *sap_ctx,
QDF_STATUS *ret_status)
{
uint8_t intf;
QDF_STATUS qdf_status;
tpAniSirGlobal mac_ctx = PMAC_STRUCT(hHal);
tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
uint8_t dfs_beacon_start_req = 0;
bool sap_scc_dfs;
@@ -430,7 +430,8 @@ wlansap_roam_process_dfs_chansw_update(mac_handle_t hHal,
*/
dfs_beacon_start_req = true;
sap_ctx->pre_cac_complete = false;
*ret_status = sme_roam_start_beacon_req(hHal, sap_ctx->bssid,
*ret_status = sme_roam_start_beacon_req(mac_handle,
sap_ctx->bssid,
dfs_beacon_start_req);
return;
}
@@ -487,8 +488,8 @@ wlansap_roam_process_dfs_chansw_update(mac_handle_t hHal,
* radio limitation.
*
*/
sap_scc_dfs = sap_is_conc_sap_doing_scc_dfs(hHal, sap_ctx);
if (sap_get_total_number_sap_intf(hHal) <= 1 ||
sap_scc_dfs = sap_is_conc_sap_doing_scc_dfs(mac_handle, sap_ctx);
if (sap_get_total_number_sap_intf(mac_handle) <= 1 ||
policy_mgr_is_current_hwmode_dbs(mac_ctx->psoc) ||
!sap_scc_dfs) {
sap_get_cac_dur_dfs_region(sap_ctx,
@@ -522,7 +523,7 @@ wlansap_roam_process_dfs_chansw_update(mac_handle_t hHal,
* which causes some of the stability issues in old platforms.
*/
if (false ==
is_concurrent_sap_ready_for_channel_change(hHal, sap_ctx)) {
is_concurrent_sap_ready_for_channel_change(mac_handle, sap_ctx)) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
FL("sapdfs: sapctx[%pK] ready but not concurrent sap"),
sap_ctx);
@@ -1238,14 +1239,14 @@ void sap_scan_event_callback(struct wlan_objmgr_vdev *vdev,
uint8_t session_id;
bool success = false;
eCsrScanStatus scan_status = eCSR_SCAN_FAILURE;
mac_handle_t hal_handle;
mac_handle_t mac_handle;
session_id = wlan_vdev_get_id(vdev);
scan_id = event->scan_id;
hal_handle = cds_get_context(QDF_MODULE_ID_SME);
if (!hal_handle) {
mac_handle = cds_get_context(QDF_MODULE_ID_SME);
if (!mac_handle) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL,
FL("invalid h_hal"));
FL("invalid MAC handle"));
return;
}
@@ -1258,7 +1259,7 @@ void sap_scan_event_callback(struct wlan_objmgr_vdev *vdev,
if (success)
scan_status = eCSR_SCAN_SUCCESS;
wlansap_pre_start_bss_acs_scan_callback(hal_handle,
wlansap_pre_start_bss_acs_scan_callback(mac_handle,
arg, session_id,
scan_id, scan_status);
}

4
core/sap/src/sap_internal.h
Bestand weergeven

@@ -295,7 +295,7 @@ void wlansap_context_put(struct sap_context *ctx);
/**
* wlansap_pre_start_bss_acs_scan_callback() - callback for scan results
* @hal_handle: the hal_handle passed in with the scan request
* @mac_handle: the mac_handle passed in with the scan request
* @sap_ctx: the SAP context pointer.
* @scanid: scan id passed
* @sessionid: session identifier
@@ -306,7 +306,7 @@ void wlansap_context_put(struct sap_context *ctx);
*
* Return: The QDF_STATUS code associated with performing the operation
*/
QDF_STATUS wlansap_pre_start_bss_acs_scan_callback(mac_handle_t hal_handle,
QDF_STATUS wlansap_pre_start_bss_acs_scan_callback(mac_handle_t mac_handle,
struct sap_context *sap_ctx,
uint8_t sessionid,
uint32_t scanid,