A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 16:46:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Replace hal in sap_module

Browse source 
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 hal with mac_handle
in sap_module.

Change-Id: I8631e7b3cc4bdca564846bb2dee50e6c993087ef
CRs-Fixed: 2351898
This commit is contained in:
Jeff Johnson 2018-11-09 14:27:23 -08:00 • committed by Nitesh Shrivastav
commit 1856266cba
3 changed files with 46 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

16
core/sap/inc/sap_api.h
View file

@ -1283,7 +1283,8 @@ QDF_STATUS wlansap_set_dfs_restrict_japan_w53(mac_handle_t mac_handle,
#ifdef FEATURE_AP_MCC_CH_AVOIDANCE
QDF_STATUS
wlan_sap_set_channel_avoidance(mac_handle_t hal, bool sap_channel_avoidance);
wlan_sap_set_channel_avoidance(mac_handle_t mac_handle,
bool sap_channel_avoidance);
#endif
QDF_STATUS wlansap_set_dfs_preferred_channel_location(mac_handle_t mac_handle,
@ -1367,9 +1368,12 @@ QDF_STATUS wlansap_update_sap_config_add_ie(tsap_config_t *pConfig,
eUpdateIEsType updateType);
QDF_STATUS wlansap_reset_sap_config_add_ie(tsap_config_t *pConfig,
eUpdateIEsType updateType);
void wlansap_extend_to_acs_range(mac_handle_t hal, uint8_t *startChannelNum,
uint8_t *endChannelNum, uint8_t *bandStartChannel,
uint8_t *bandEndChannel);
void wlansap_extend_to_acs_range(mac_handle_t mac_handle,
uint8_t *startChannelNum,
uint8_t *endChannelNum,
uint8_t *bandStartChannel,
uint8_t *bandEndChannel);
/**
* wlansap_set_dfs_nol() - Set dfs nol
@ -1436,14 +1440,14 @@ uint32_t wlansap_get_chan_width(struct sap_context *sap_ctx);
/**
* wlansap_set_tx_leakage_threshold() - set sap tx leakage threshold.
* @hal: HAL pointer
* @mac_handle: Opaque handle to the global MAC context
* @tx_leakage_threshold: sap tx leakage threshold
*
* This function set sap tx leakage threshold.
*
* Return: QDF_STATUS.
*/
QDF_STATUS wlansap_set_tx_leakage_threshold(mac_handle_t hal,
QDF_STATUS wlansap_set_tx_leakage_threshold(mac_handle_t mac_handle,
uint16_t tx_leakage_threshold);
/*

62
core/sap/src/sap_module.c
View file

@ -598,26 +598,28 @@ void wlan_sap_set_vht_ch_width(struct sap_context *sap_ctx,
/**
* wlan_sap_validate_channel_switch() - validate target channel switch w.r.t
* concurreny rules set to avoid channel interference.
* @hal - Hal context
* @sap_ch - channel to switch
* @sap_context - sap session context
* @mac_handle: Opaque handle to the global MAC context
* @sap_ch: channel to switch
* @sap_context: sap session context
*
* Return: true if there is no channel interference else return false
*/
#ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
static bool wlan_sap_validate_channel_switch(mac_handle_t hal, uint16_t sap_ch,
struct sap_context *sap_context)
static bool wlan_sap_validate_channel_switch(mac_handle_t mac_handle,
uint16_t sap_ch,
struct sap_context *sap_context)
{
return sme_validate_sap_channel_switch(
hal,
mac_handle,
sap_ch,
sap_context->csr_roamProfile.phyMode,
sap_context->cc_switch_mode,
sap_context->sessionId);
}
#else
static inline bool wlan_sap_validate_channel_switch(mac_handle_t hal,
uint16_t sap_ch, struct sap_context *sap_context)
static bool wlan_sap_validate_channel_switch(mac_handle_t mac_handle,
uint16_t sap_ch,
struct sap_context *sap_context)
{
return true;
}
@ -1909,24 +1911,25 @@ bool sap_is_auto_channel_select(struct sap_context *sapcontext)
#ifdef FEATURE_AP_MCC_CH_AVOIDANCE
/**
* wlan_sap_set_channel_avoidance() - sets sap mcc channel avoidance ini param
* @hal: hal handle
* @sap_channel_avoidance: ini parameter value
* @mac_handle: Opaque handle to the global MAC context
* @sap_channel_avoidance: ini parameter value
*
* sets sap mcc channel avoidance ini param, to be called in sap_start
*
* Return: success of failure of operation
*/
QDF_STATUS
wlan_sap_set_channel_avoidance(mac_handle_t hal, bool sap_channel_avoidance)
wlan_sap_set_channel_avoidance(mac_handle_t mac_handle,
bool sap_channel_avoidance)
{
tpAniSirGlobal mac_ctx = NULL;
if (NULL != hal) {
mac_ctx = PMAC_STRUCT(hal);
if (NULL != mac_handle) {
mac_ctx = PMAC_STRUCT(mac_handle);
} else {
QDF_TRACE(QDF_MODULE_ID_SAP,
QDF_TRACE_LEVEL_ERROR,
FL("hal or mac_ctx pointer NULL"));
FL("mac_handle or mac_ctx pointer NULL"));
return QDF_STATUS_E_FAULT;
}
mac_ctx->sap.sap_channel_avoidance = sap_channel_avoidance;
@ -1936,7 +1939,7 @@ wlan_sap_set_channel_avoidance(mac_handle_t hal, bool sap_channel_avoidance)
/**
* wlansap_set_dfs_preferred_channel_location() - set dfs preferred channel
* @mac_handle : HAL pointer
* @mac_handle: Opaque handle to the global MAC context
* @dfs_Preferred_Channels_location :
* 0 - Indicates No preferred channel location restrictions
* 1 - Indicates SAP Indoor Channels operation only.
@ -2164,9 +2167,11 @@ wlansap_reset_sap_config_add_ie(tsap_config_t *pConfig, eUpdateIEsType updateTyp
SIDE EFFECTS
============================================================================*/
void wlansap_extend_to_acs_range(mac_handle_t hal, uint8_t *startChannelNum,
uint8_t *endChannelNum, uint8_t *bandStartChannel,
uint8_t *bandEndChannel)
void wlansap_extend_to_acs_range(mac_handle_t mac_handle,
uint8_t *startChannelNum,
uint8_t *endChannelNum,
uint8_t *bandStartChannel,
uint8_t *bandEndChannel)
{
#define ACS_WLAN_20M_CH_INC 4
#define ACS_2G_EXTEND ACS_WLAN_20M_CH_INC
@ -2175,7 +2180,7 @@ void wlansap_extend_to_acs_range(mac_handle_t hal, uint8_t *startChannelNum,
uint8_t tmp_startChannelNum = 0, tmp_endChannelNum = 0;
tpAniSirGlobal mac_ctx;
mac_ctx = PMAC_STRUCT(hal);
mac_ctx = PMAC_STRUCT(mac_handle);
if (!mac_ctx) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
"%s: Invalid mac_ctx", __func__);
@ -2416,21 +2421,22 @@ QDF_STATUS wlansap_acs_chselect(struct sap_context *sap_context,
/**
* wlan_sap_enable_phy_error_logs() - Enable DFS phy error logs
* @hal: global hal handle
* @mac_handle: Opaque handle to the global MAC context
* @enable_log: value to set
*
* Since the frequency of DFS phy error is very high, enabling logs for them
* all the times can cause crash and will also create lot of useless logs
* causing difficulties in debugging other issue. This function will be called
* from iwpriv cmd to eanble such logs temporarily.
* from iwpriv cmd to enable such logs temporarily.
*
* Return: void
*/
void wlan_sap_enable_phy_error_logs(mac_handle_t hal, uint32_t enable_log)
void wlan_sap_enable_phy_error_logs(mac_handle_t mac_handle,
uint32_t enable_log)
{
int error;
tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal);
tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
mac_ctx->sap.enable_dfs_phy_error_logs = !!enable_log;
tgt_dfs_control(mac_ctx->pdev, DFS_SET_DEBUG_LEVEL, &enable_log,
@ -2442,18 +2448,18 @@ uint32_t wlansap_get_chan_width(struct sap_context *sap_ctx)
return wlan_sap_get_vht_ch_width(sap_ctx);
}
QDF_STATUS wlansap_set_tx_leakage_threshold(mac_handle_t hal,
uint16_t tx_leakage_threshold)
QDF_STATUS wlansap_set_tx_leakage_threshold(mac_handle_t mac_handle,
uint16_t tx_leakage_threshold)
{
tpAniSirGlobal mac;
if (NULL == hal) {
if (NULL == mac_handle) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
"%s: Invalid hal pointer", __func__);
"%s: Invalid mac_handle pointer", __func__);
return QDF_STATUS_E_FAULT;
}
mac = PMAC_STRUCT(hal);
mac = PMAC_STRUCT(mac_handle);
tgt_dfs_set_tx_leakage_threshold(mac->pdev, tx_leakage_threshold);
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG,
"%s: leakage_threshold %d", __func__,

3
core/sme/inc/sme_api.h
View file

@ -1502,7 +1502,8 @@ int sme_update_tx_bfee_supp(mac_handle_t hal, uint8_t session_id,
int sme_update_tx_bfee_nsts(mac_handle_t hal, uint8_t session_id,
uint8_t usr_cfg_val, uint8_t nsts_val);
void wlan_sap_enable_phy_error_logs(mac_handle_t hal, uint32_t enable_log);
void wlan_sap_enable_phy_error_logs(mac_handle_t mac_handle,
uint32_t enable_log);
#ifdef WLAN_FEATURE_DSRC
QDF_STATUS sme_ocb_set_config(mac_handle_t mac_handle, void *context,
ocb_callback callback,