qcacld-3.0: Replace PMAC_STRUCT() with MAC_CONTEXT()
The inline function MAC_CONTEXT() is the preferred mechanism for
converting a MAC handle into a MAC context, so replace all instances
of the legacy macro PMAC_STRUCT().
Change-Id: Ieb29696c79b729648462be699892607484c2f301
CRs-Fixed: 2357873
diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h
index d0c6f0a..59e8f50 100644
--- a/core/mac/inc/ani_global.h
+++ b/core/mac/inc/ani_global.h
@@ -60,9 +60,6 @@
return (tpAniSirGlobal)handle;
}
-/* legacy definition */
-#define PMAC_STRUCT(handle) MAC_CONTEXT(handle)
-
/**
* MAC_HANDLE() - Convert a mac context into an opaque mac handle
* @mac: MAC context to be converted
@@ -70,7 +67,7 @@
* Given a mac context this function will return the opaque mac handle
* that is associated with that handle.
*
- * This is the inverse function of PMAC_STRUCT()
+ * This is the inverse function of MAC_CONTEXT()
*
* Return: opaque handle for @mac
*/
diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c
index 2aff598..74d0611 100644
--- a/core/sap/src/sap_api_link_cntl.c
+++ b/core/sap/src/sap_api_link_cntl.c
@@ -98,7 +98,7 @@
{
uint32_t channel = sap_ctx->acs_cfg->pri_ch;
struct ch_params ch_params = {0};
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
ch_params.ch_width = sap_ctx->acs_cfg->ch_width;
wlan_reg_set_channel_params(mac_ctx->pdev, channel, sec_ch,
@@ -415,7 +415,7 @@
{
uint8_t intf;
QDF_STATUS qdf_status;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
uint8_t dfs_beacon_start_req = 0;
bool sap_scc_dfs;
diff --git a/core/sap/src/sap_ch_select.c b/core/sap/src/sap_ch_select.c
index 63bc065..f3f9f83 100644
--- a/core/sap/src/sap_ch_select.c
+++ b/core/sap/src/sap_ch_select.c
@@ -335,7 +335,7 @@
tpAniSirGlobal mac_ctx = NULL;
tSapSpectChInfo *spect_ch = NULL;
- mac_ctx = PMAC_STRUCT(mac_handle);
+ mac_ctx = MAC_CONTEXT(mac_handle);
spect_ch = spect_info->pSpectCh;
node = sme_scan_result_get_first(mac_handle, scan_result);
@@ -422,7 +422,7 @@
"qdf_ctx is NULL");
return;
}
- mac_ctx = PMAC_STRUCT(mac_handle);
+ mac_ctx = MAC_CONTEXT(mac_handle);
/* Flush, default set all channel safe */
for (i = 0; i < NUM_CHANNELS; i++) {
@@ -575,7 +575,7 @@
tSapSpectChInfo *pSpectCh = NULL;
uint8_t *pChans = NULL;
uint16_t channelnum = 0;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
bool chSafe = true;
#ifdef FEATURE_WLAN_CH_AVOID
uint16_t i;
@@ -2541,7 +2541,7 @@
uint32_t end_ch_num = sap_ctx->acs_cfg->end_ch;
tpAniSirGlobal mac_ctx = NULL;
- mac_ctx = PMAC_STRUCT(mac_handle);
+ mac_ctx = MAC_CONTEXT(mac_handle);
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
FL("start - end: %d - %d"), start_ch_num, end_ch_num);
@@ -2644,7 +2644,7 @@
#endif
tpAniSirGlobal mac_ctx;
- mac_ctx = PMAC_STRUCT(mac_handle);
+ mac_ctx = MAC_CONTEXT(mac_handle);
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
"In %s, Running SAP Ch Select", __func__);
diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c
index 067569c..2e65f68 100644
--- a/core/sap/src/sap_fsm.c
+++ b/core/sap/src/sap_fsm.c
@@ -554,7 +554,7 @@
{
tpAniSirGlobal mac;
- mac = PMAC_STRUCT(mac_handle);
+ mac = MAC_CONTEXT(mac_handle);
if (NULL == mac) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
FL("invalid mac"));
@@ -577,7 +577,7 @@
{
tpAniSirGlobal mac;
- mac = PMAC_STRUCT(mac_handle);
+ mac = MAC_CONTEXT(mac_handle);
if (NULL == mac) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
FL("invalid mac"));
@@ -989,7 +989,7 @@
return QDF_STATUS_E_FAULT;
}
- mac_ctx = PMAC_STRUCT(mac_handle);
+ mac_ctx = MAC_CONTEXT(mac_handle);
if (!mac_ctx) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
FL("Invalid MAC context"));
@@ -1157,7 +1157,7 @@
static struct sap_context *
sap_find_valid_concurrent_session(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
uint8_t intf = 0;
struct sap_context *sap_ctx;
@@ -1178,7 +1178,7 @@
static QDF_STATUS sap_clear_global_dfs_param(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
if (NULL != sap_find_valid_concurrent_session(mac_handle)) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG,
@@ -1243,7 +1243,7 @@
struct sap_context *sapctx,
uint32_t session_id)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
int i;
QDF_STATUS status;
@@ -1282,7 +1282,7 @@
struct sap_context *sapctx,
uint32_t session_id)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
if (sapctx->sessionId >= SAP_MAX_NUM_SESSION)
return QDF_STATUS_E_FAILURE;
@@ -1809,7 +1809,7 @@
*/
static struct sap_context *sap_find_cac_wait_session(mac_handle_t handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(handle);
uint8_t i = 0;
struct sap_context *sap_ctx;
@@ -1840,7 +1840,7 @@
void sap_cac_reset_notify(mac_handle_t mac_handle)
{
uint8_t intf = 0;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) {
struct sap_context *sap_context =
@@ -1867,7 +1867,7 @@
static QDF_STATUS sap_cac_start_notify(mac_handle_t mac_handle)
{
uint8_t intf = 0;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;
for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) {
@@ -1962,7 +1962,7 @@
struct csr_roam_info *roamInfo)
{
uint8_t intf;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;
/*
@@ -3509,7 +3509,7 @@
"In %s invalid mac_handle", __func__);
return;
}
- mac = PMAC_STRUCT(mac_handle);
+ mac = MAC_CONTEXT(mac_handle);
sapContext = sap_find_cac_wait_session(mac_handle);
if (NULL == sapContext) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
@@ -3695,7 +3695,7 @@
*/
uint8_t sap_get_total_number_sap_intf(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
uint8_t intf = 0;
uint8_t intf_count = 0;
@@ -3725,7 +3725,7 @@
bool is_concurrent_sap_ready_for_channel_change(mac_handle_t mac_handle,
struct sap_context *sapContext)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct sap_context *sap_context;
uint8_t intf = 0;
@@ -3769,7 +3769,7 @@
bool sap_is_conc_sap_doing_scc_dfs(mac_handle_t mac_handle,
struct sap_context *given_sapctx)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct sap_context *sap_ctx;
uint8_t intf = 0, scc_dfs_counter = 0;
diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c
index 0e36f79..e9fb64f 100644
--- a/core/sap/src/sap_module.c
+++ b/core/sap/src/sap_module.c
@@ -1556,7 +1556,7 @@
tpAniSirGlobal mac = NULL;
int i;
- mac = PMAC_STRUCT(handle);
+ mac = MAC_CONTEXT(handle);
if (!mac) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
"%s: Invalid mac context", __func__);
@@ -1586,7 +1586,7 @@
tpAniSirGlobal mac = NULL;
uint8_t i;
- mac = PMAC_STRUCT(handle);
+ mac = MAC_CONTEXT(handle);
if (!mac) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
"%s: Invalid mac context", __func__);
@@ -1828,7 +1828,7 @@
tpAniSirGlobal mac = NULL;
if (NULL != mac_handle) {
- mac = PMAC_STRUCT(mac_handle);
+ mac = MAC_CONTEXT(mac_handle);
} else {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
"%s: Invalid mac_handle pointer", __func__);
@@ -1845,7 +1845,7 @@
tpAniSirGlobal mac = NULL;
if (NULL != mac_handle) {
- mac = PMAC_STRUCT(mac_handle);
+ mac = MAC_CONTEXT(mac_handle);
} else {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
"%s: Invalid mac_handle pointer", __func__);
@@ -1866,7 +1866,7 @@
enum dfs_reg dfs_region;
if (NULL != mac_handle) {
- mac = PMAC_STRUCT(mac_handle);
+ mac = MAC_CONTEXT(mac_handle);
} else {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
"%s: Invalid mac_handle pointer", __func__);
@@ -1925,7 +1925,7 @@
tpAniSirGlobal mac_ctx = NULL;
if (NULL != mac_handle) {
- mac_ctx = PMAC_STRUCT(mac_handle);
+ mac_ctx = MAC_CONTEXT(mac_handle);
} else {
QDF_TRACE(QDF_MODULE_ID_SAP,
QDF_TRACE_LEVEL_ERROR,
@@ -1962,7 +1962,7 @@
enum dfs_reg dfs_region;
if (NULL != mac_handle) {
- mac = PMAC_STRUCT(mac_handle);
+ mac = MAC_CONTEXT(mac_handle);
} else {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
"%s: Invalid mac_handle pointer", __func__);
@@ -2004,7 +2004,7 @@
tpAniSirGlobal mac = NULL;
if (NULL != mac_handle) {
- mac = PMAC_STRUCT(mac_handle);
+ mac = MAC_CONTEXT(mac_handle);
} else {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
"%s: Invalid mac_handle pointer", __func__);
@@ -2180,7 +2180,7 @@
uint8_t tmp_startChannelNum = 0, tmp_endChannelNum = 0;
tpAniSirGlobal mac_ctx;
- mac_ctx = PMAC_STRUCT(mac_handle);
+ mac_ctx = MAC_CONTEXT(mac_handle);
if (!mac_ctx) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
"%s: Invalid mac_ctx", __func__);
@@ -2436,7 +2436,7 @@
{
int error;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
mac_ctx->sap.enable_dfs_phy_error_logs = !!enable_log;
tgt_dfs_control(mac_ctx->pdev, DFS_SET_DEBUG_LEVEL, &enable_log,
@@ -2459,7 +2459,7 @@
return QDF_STATUS_E_FAULT;
}
- mac = PMAC_STRUCT(mac_handle);
+ mac = MAC_CONTEXT(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__,
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c
index 3ad0b7e..efe962a 100644
--- a/core/sme/src/common/sme_api.c
+++ b/core/sme/src/common/sme_api.c
@@ -120,7 +120,7 @@
return NULL;
}
- mac_ctx = PMAC_STRUCT(mac_handle);
+ mac_ctx = MAC_CONTEXT(mac_handle);
return mac_ctx;
}
@@ -264,7 +264,7 @@
void sme_purge_pdev_all_ser_cmd_list(mac_handle_t mac_handle)
{
QDF_STATUS status;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac_ctx->sme);
if (QDF_IS_STATUS_ERROR(status))
@@ -504,7 +504,7 @@
mac_handle = cds_get_context(QDF_MODULE_ID_SME);
if (NULL != mac_handle) {
- mac_ctx = PMAC_STRUCT(mac_handle);
+ mac_ctx = MAC_CONTEXT(mac_handle);
} else {
sme_err("No mac_handle found");
return QDF_STATUS_E_FAILURE;
@@ -566,7 +566,7 @@
mac_handle = cds_get_context(QDF_MODULE_ID_SME);
if (mac_handle != NULL) {
- mac_ctx = PMAC_STRUCT(mac_handle);
+ mac_ctx = MAC_CONTEXT(mac_handle);
} else {
sme_err("mac_handle is null");
return QDF_STATUS_E_FAILURE;
@@ -655,7 +655,7 @@
return;
}
- mac = PMAC_STRUCT(mac_handle);
+ mac = MAC_CONTEXT(mac_handle);
active_session_id = sme_get_sessionid_from_activelist(mac);
if (active_session_id != CSR_SESSION_ID_INVALID) {
@@ -725,7 +725,7 @@
QDF_STATUS sme_open(mac_handle_t mac_handle)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
mac->sme.state = SME_STATE_STOP;
mac->sme.currDeviceMode = QDF_STA_MODE;
@@ -775,7 +775,7 @@
QDF_STATUS sme_init_chan_list(mac_handle_t mac_handle, uint8_t *alpha2,
enum country_src cc_src)
{
- tpAniSirGlobal pmac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal pmac = MAC_CONTEXT(mac_handle);
if ((cc_src == SOURCE_USERSPACE) &&
(pmac->mlme_cfg->sap_cfg.country_code_priority)) {
@@ -832,7 +832,7 @@
*/
void sme_set_scan_disable(mac_handle_t mac_handle, int value)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
sme_info("scan disable %d", value);
ucfg_scan_set_enable(mac_ctx->psoc, !value);
@@ -851,7 +851,7 @@
v_REGDOMAIN_t *domainIdSoftAp)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
TRACE_CODE_SME_RX_HDD_MSG_GET_SOFTAP_DOMAIN,
@@ -879,7 +879,7 @@
uint8_t session_id,
uint32_t val)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
QDF_STATUS status;
ucfg_wifi_pos_set_ftm_cap(mac_ctx->psoc, val);
@@ -923,7 +923,7 @@
pSmeConfigParams)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
TRACE_CODE_SME_RX_HDD_MSG_UPDATE_CONFIG, NO_SESSION,
@@ -1017,7 +1017,7 @@
struct roam_ext_params *roam_params_src,
int update_param)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct roam_ext_params *roam_params_dst;
QDF_STATUS status;
uint8_t i;
@@ -1175,7 +1175,7 @@
{
tSirSmeReadyReq *msg;
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
TRACE_CODE_SME_RX_HDD_MSG_HDDREADYIND, NO_SESSION, 0));
@@ -1255,7 +1255,7 @@
QDF_STATUS sme_start(mac_handle_t mac_handle)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct policy_mgr_sme_cbacks sme_cbacks;
do {
@@ -1395,7 +1395,7 @@
uint8_t session_id)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct csr_roam_info *roamInfo;
eRoamCmdStatus roamStatus;
eCsrRoamResult roamResult;
@@ -1473,7 +1473,7 @@
QDF_STATUS sme_update_is_ese_feature_enabled(mac_handle_t mac_handle,
uint8_t sessionId, const bool isEseIniFeatureEnabled)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status;
if (mac->mlme_cfg->lfr.ese_enabled ==
@@ -1523,7 +1523,7 @@
{
QDF_STATUS status;
bool ret = false;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
uint8_t ch_list[WNI_CFG_VALID_CHANNEL_LIST_LEN] = { 0 };
uint8_t count, valid_count = 0;
struct scheduler_msg msg = {0};
@@ -1647,7 +1647,7 @@
QDF_STATUS sme_set_cckm_ie(mac_handle_t mac_handle, uint8_t sessionId,
uint8_t *pCckmIe, uint8_t cckmIeLen)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
status = sme_acquire_global_lock(&mac->sme);
@@ -1673,7 +1673,7 @@
const tCsrEseBeaconReq *pEseBcnReq)
{
QDF_STATUS status;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
tpSirBeaconReportReqInd pSmeBcnReportReq = NULL;
tCsrEseBeaconReqParams *pBeaconReq = NULL;
uint8_t counter = 0;
@@ -1747,7 +1747,7 @@
void *pContext, uint8_t tid)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -1776,7 +1776,7 @@
uint8_t *pChannelList,
uint8_t numChannels)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
tpCsrNeighborRoamControlInfo pNeighborRoamInfo = NULL;
tpCsrChannelInfo curchnl_list_info = NULL;
@@ -2538,7 +2538,7 @@
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
QDF_STATUS fail_status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
if (!mac)
return QDF_STATUS_E_FAILURE;
@@ -2596,7 +2596,7 @@
tSirMacAddr bssid)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac_ctx->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -2622,7 +2622,7 @@
tScanResultHandle *phResult)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
TRACE_CODE_SME_RX_HDD_MSG_SCAN_GET_RESULTS, sessionId,
@@ -2640,7 +2640,7 @@
struct qdf_mac_addr *bssid,
tCsrScanResultInfo *res)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
QDF_STATUS status;
status = sme_acquire_global_lock(&mac_ctx->sme);
@@ -2800,7 +2800,7 @@
uint32_t *roam_id,
uint32_t session_id)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_E_FAILURE;
bool ret_status = true;
@@ -2834,7 +2834,7 @@
bool sme_clear_joinreq_param(mac_handle_t mac_handle,
uint32_t session_id)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_E_FAILURE;
bool ret_status = true;
@@ -2870,7 +2870,7 @@
uint32_t *roam_id,
uint32_t session_id)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_E_FAILURE;
QDF_STATUS ret_status = QDF_STATUS_SUCCESS;
@@ -2902,7 +2902,7 @@
QDF_STATUS sme_scan_flush_result(mac_handle_t mac_handle)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
TRACE_CODE_SME_RX_HDD_MSG_SCAN_FLUSH_RESULTS,
@@ -2919,7 +2919,7 @@
QDF_STATUS sme_scan_flush_p2p_result(mac_handle_t mac_handle, uint8_t sessionId)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
TRACE_CODE_SME_RX_HDD_MSG_SCAN_FLUSH_P2PRESULTS,
@@ -2946,7 +2946,7 @@
tScanResultHandle hScanResult)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
tCsrScanResultInfo *pRet = NULL;
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
@@ -2974,7 +2974,7 @@
tScanResultHandle hScanResult)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
tCsrScanResultInfo *pRet = NULL;
status = sme_acquire_global_lock(&mac->sme);
@@ -3016,7 +3016,7 @@
eCsrPhyMode sme_get_phy_mode(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return mac->roam.configParam.phyMode;
}
@@ -3111,7 +3111,7 @@
uint32_t *pRoamId)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
if (!mac)
return QDF_STATUS_E_FAILURE;
@@ -3146,7 +3146,7 @@
*/
QDF_STATUS sme_set_phy_mode(mac_handle_t mac_handle, eCsrPhyMode phyMode)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
mac->roam.configParam.phyMode = phyMode;
mac->roam.configParam.uCfgDot11Mode =
@@ -3177,7 +3177,7 @@
uint32_t *pRoamId, bool fForce)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
TRACE_CODE_SME_RX_HDD_ROAM_REASSOC, sessionId, 0));
@@ -3213,7 +3213,7 @@
uint8_t sessionId)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
TRACE_CODE_SME_RX_HDD_ROAM_GET_CONNECTPROFILE,
@@ -3235,7 +3235,7 @@
eCsrRoamDisconnectReason reason)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
TRACE_CODE_SME_RX_HDD_ROAM_DISCONNECT, session_id,
@@ -3261,7 +3261,7 @@
*/
void sme_dhcp_done_ind(mac_handle_t mac_handle, uint8_t session_id)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct csr_roam_session *session;
if (!mac_ctx)
@@ -3287,7 +3287,7 @@
QDF_STATUS sme_roam_stop_bss(mac_handle_t mac_handle, uint8_t sessionId)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -3317,7 +3317,7 @@
struct csr_del_sta_params *p_del_sta_params)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
if (NULL == mac) {
QDF_ASSERT(0);
@@ -3353,7 +3353,7 @@
struct csr_del_sta_params *pDelStaParams)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
if (NULL == mac) {
QDF_ASSERT(0);
@@ -3400,7 +3400,7 @@
uint8_t *pAssocStasBuf)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
if (NULL == mac) {
QDF_ASSERT(0);
@@ -3437,7 +3437,7 @@
eCsrConnectState *pState)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -3468,7 +3468,7 @@
tCsrRoamConnectedProfile *pProfile)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
TRACE_CODE_SME_RX_HDD_ROAM_GET_CONNECTPROFILE,
@@ -3526,7 +3526,7 @@
uint32_t numItems, bool update_entire_cache)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
TRACE_CODE_SME_RX_HDD_ROAM_SET_PMKIDCACHE, sessionId,
@@ -3551,7 +3551,7 @@
bool flush_cache)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
TRACE_CODE_SME_RX_HDD_ROAM_DEL_PMKIDCACHE,
@@ -3572,7 +3572,7 @@
void sme_get_pmk_info(mac_handle_t mac_handle, uint8_t session_id,
tPmkidCacheInfo *pmk_cache)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
QDF_STATUS status = sme_acquire_global_lock(&mac_ctx->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -3605,7 +3605,7 @@
uint8_t *pPSK_PMK, size_t pmk_len)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -3625,7 +3625,7 @@
uint32_t *len, uint8_t *buf)
{
QDF_STATUS status;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -3645,7 +3645,7 @@
uint32_t *len, uint8_t *buf)
{
QDF_STATUS status;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -3672,7 +3672,7 @@
uint8_t sessionId)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
uint32_t numPmkidCache = 0;
status = sme_acquire_global_lock(&mac->sme);
@@ -3706,7 +3706,7 @@
uint32_t *pNum, tPmkidCacheInfo *pPmkidCache)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
TRACE_CODE_SME_RX_HDD_ROAM_GET_PMKIDCACHE, sessionId,
@@ -3737,7 +3737,7 @@
tSmeConfigParams *pParam)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
TRACE_CODE_SME_RX_HDD_GET_CONFIGPARAM, NO_SESSION, 0));
@@ -3772,7 +3772,7 @@
QDF_STATUS sme_cfg_set_int(mac_handle_t mac_handle, uint16_t cfg_id,
uint32_t value)
{
- tpAniSirGlobal pmac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal pmac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
if (QDF_STATUS_SUCCESS != cfg_set_int(pmac, cfg_id, value))
@@ -3795,7 +3795,7 @@
QDF_STATUS sme_cfg_set_str(mac_handle_t mac_handle, uint16_t cfg_id,
uint8_t *str, uint32_t length)
{
- tpAniSirGlobal pmac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal pmac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
if (QDF_STATUS_SUCCESS != cfg_set_str(pmac, cfg_id, str, length))
@@ -3818,7 +3818,7 @@
QDF_STATUS sme_cfg_get_int(mac_handle_t mac_handle, uint16_t cfg_id,
uint32_t *cfg_value)
{
- tpAniSirGlobal pmac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal pmac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
if (QDF_STATUS_SUCCESS != wlan_cfg_get_int(pmac, cfg_id, cfg_value))
@@ -3841,7 +3841,7 @@
QDF_STATUS sme_cfg_get_str(mac_handle_t mac_handle, uint16_t cfg_id,
uint8_t *str, uint32_t *length)
{
- tpAniSirGlobal pmac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal pmac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
if (QDF_STATUS_SUCCESS != wlan_cfg_get_str(pmac, cfg_id, str, length))
@@ -3870,7 +3870,7 @@
pModifyProfileFields)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
TRACE_CODE_SME_RX_HDD_GET_MODPROFFIELDS, sessionId,
@@ -3896,7 +3896,7 @@
*/
void sme_set_dhcp_till_power_active_flag(mac_handle_t mac_handle, uint8_t flag)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct ps_global_info *ps_global_info = &mac->sme.ps_global_info;
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
@@ -3923,7 +3923,7 @@
sme_send_oem_data_rsp_msg callback)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal pmac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal pmac = MAC_CONTEXT(mac_handle);
pmac->sme.oem_data_rsp_callback = callback;
@@ -3947,7 +3947,7 @@
FL("mac_handle is not valid"));
return;
}
- pmac = PMAC_STRUCT(mac_handle);
+ pmac = MAC_CONTEXT(mac_handle);
pmac->sme.oem_data_rsp_callback = NULL;
}
@@ -3967,7 +3967,7 @@
struct sme_oem_capability *cap)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal pmac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal pmac = MAC_CONTEXT(mac_handle);
uint8_t *bytes;
bytes = pmac->rrm.rrmSmeContext.rrmConfig.rm_capability;
@@ -3995,7 +3995,7 @@
struct sme_oem_capability *cap)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal pmac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal pmac = MAC_CONTEXT(mac_handle);
uint8_t *bytes;
bytes = pmac->rrm.rrmSmeContext.rrmConfig.rm_capability;
@@ -4024,7 +4024,7 @@
tCsrRoamSetKey *set_key, uint32_t *ptr_roam_id)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
uint32_t roam_id;
struct csr_roam_session *session = NULL;
struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info;
@@ -4138,7 +4138,7 @@
void *pContext)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
TRACE_CODE_SME_RX_HDD_GET_RSSI, NO_SESSION, 0));
@@ -4167,7 +4167,7 @@
uint8_t staId, struct qdf_mac_addr bssId, void *pContext)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -4202,7 +4202,7 @@
uint8_t staId, void *pContext, uint8_t sessionId)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -4282,7 +4282,7 @@
QDF_STATUS sme_get_country_code(mac_handle_t mac_handle, uint8_t *pBuf,
uint8_t *pbLen)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
TRACE_CODE_SME_RX_HDD_GET_CNTRYCODE, NO_SESSION, 0));
@@ -4293,21 +4293,21 @@
/* some support functions */
bool sme_is11d_supported(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return wlan_reg_11d_enabled_on_host(mac->psoc);
}
bool sme_is11h_supported(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return csr_is11h_supported(mac);
}
bool sme_is_wmm_supported(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return csr_is_wmm_supported(mac);
}
@@ -4327,7 +4327,7 @@
uint8_t *pCountry)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg msg = {0};
tAniGenericChangeCountryCodeReq *pMsg;
@@ -4386,7 +4386,7 @@
{
QDF_STATUS status;
QDF_STATUS qdf_status;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg message = {0};
tAniDHCPInd *pMsg;
struct csr_roam_session *pSession;
@@ -4452,7 +4452,7 @@
{
QDF_STATUS status;
QDF_STATUS qdf_status;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg message = {0};
tAniDHCPInd *pMsg;
struct csr_roam_session *pSession;
@@ -4516,7 +4516,7 @@
{
QDF_STATUS status;
QDF_STATUS qdf_status;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg message = {0};
tAniTXFailMonitorInd *pMsg;
@@ -4574,7 +4574,7 @@
tpRrmNeighborRspCallbackInfo callbackInfo)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
TRACE_CODE_SME_RX_HDD_NEIGHBOR_REPORTREQ, NO_SESSION,
@@ -4612,7 +4612,7 @@
tSirVersionType *pVersion)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&mac->sme)) {
if (pVersion != NULL)
@@ -4640,7 +4640,7 @@
tSirVersionType *pVersion)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&mac->sme)) {
if (pVersion != NULL)
@@ -4670,7 +4670,7 @@
uint32_t versionBufferSize)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&mac->sme)) {
if (pVersion != NULL)
@@ -4702,7 +4702,7 @@
uint32_t versionBufferSize)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&mac->sme)) {
if (pVersion != NULL)
@@ -5144,7 +5144,7 @@
struct sme_session_params *params)
{
QDF_STATUS status = QDF_STATUS_E_INVAL;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct cdp_pdev *pdev;
ol_txrx_peer_handle peer;
uint8_t peer_id;
@@ -5189,7 +5189,7 @@
QDF_STATUS sme_close_session(mac_handle_t mac_handle, uint8_t session_id)
{
QDF_STATUS status;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
TRACE_CODE_SME_RX_HDD_CLOSE_SESSION, session_id, 0));
@@ -5242,7 +5242,7 @@
QDF_STATUS sme_set_host_offload(mac_handle_t mac_handle, uint8_t sessionId,
tpSirHostOffloadReq request)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_E_FAILURE;
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
@@ -5278,7 +5278,7 @@
{
tpSirKeepAliveReq request_buf;
struct scheduler_msg msg = {0};
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct csr_roam_session *pSession = CSR_GET_SESSION(mac, session_id);
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
@@ -5332,7 +5332,7 @@
uint32_t *pChannel,
uint8_t sessionId)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct csr_roam_session *pSession;
if (CSR_IS_SESSION_VALID(mac, sessionId)) {
@@ -5368,7 +5368,7 @@
QDF_STATUS sme_register_mgmt_frame_ind_callback(mac_handle_t mac_handle,
sir_mgmt_frame_ind_callback callback)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct sir_sme_mgmt_frame_cb_req *msg;
QDF_STATUS status = QDF_STATUS_SUCCESS;
@@ -5405,7 +5405,7 @@
uint16_t matchLen)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -5463,7 +5463,7 @@
uint16_t matchLen)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
TRACE_CODE_SME_RX_HDD_DEREGISTER_MGMTFR, sessionId,
@@ -5552,7 +5552,7 @@
const uint8_t *buf, uint32_t len)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -5581,7 +5581,7 @@
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg message = {0};
tpSirExtWoWParams MsgPtr = qdf_mem_malloc(sizeof(*MsgPtr));
@@ -5634,7 +5634,7 @@
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg message = {0};
tpSirAppType1Params MsgPtr = qdf_mem_malloc(sizeof(*MsgPtr));
@@ -5680,7 +5680,7 @@
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg message = {0};
tpSirAppType2Params MsgPtr = qdf_mem_malloc(sizeof(*MsgPtr));
@@ -5726,7 +5726,7 @@
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
int8_t sessionid = -1;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -5752,7 +5752,7 @@
uint8_t sessionId)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
uint8_t channel = 0;
status = sme_acquire_global_lock(&mac->sme);
@@ -5773,7 +5773,7 @@
uint8_t sme_get_concurrent_operation_channel(mac_handle_t mac_handle)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
uint8_t channel = 0;
status = sme_acquire_global_lock(&mac->sme);
@@ -5795,7 +5795,7 @@
uint8_t cc_switch_mode)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
uint16_t channel = 0;
status = sme_acquire_global_lock(&mac->sme);
@@ -5822,7 +5822,7 @@
QDF_STATUS sme_set_tsfcb(mac_handle_t mac_handle,
int (*cb_fn)(void *cb_ctx, struct stsf *ptsf), void *cb_ctx)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status;
status = sme_acquire_global_lock(&mac->sme);
@@ -5852,7 +5852,7 @@
FL("mac_handle is not valid"));
return QDF_STATUS_E_INVAL;
}
- mac = PMAC_STRUCT(mac_handle);
+ mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -5875,7 +5875,7 @@
{
QDF_STATUS status;
struct scheduler_msg tsf_msg = {0};
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -5940,7 +5940,7 @@
void sme_set_cc_src(mac_handle_t mac_handle, enum country_src cc_src)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
mac_ctx->reg_hint_src = cc_src;
@@ -6034,7 +6034,7 @@
QDF_STATUS sme_update_channel_list(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
QDF_STATUS status;
status = sme_acquire_global_lock(&mac_ctx->sme);
@@ -6109,7 +6109,7 @@
{
tpSirRcvFltMcAddrList request_buf;
struct scheduler_msg msg = {0};
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct csr_roam_session *pSession = NULL;
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
@@ -6181,7 +6181,7 @@
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
bool valid = false;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -6205,7 +6205,7 @@
QDF_STATUS sme_get_freq_band(mac_handle_t mac_handle, enum band_info *pBand)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -6395,7 +6395,7 @@
uint32_t param_type, uint32_t param_val)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
uint16_t len;
status = sme_acquire_global_lock(&mac_ctx->sme);
@@ -6448,7 +6448,7 @@
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg message = {0};
tAniSetTmLevelReq *setTmLevelReq = NULL;
@@ -6521,7 +6521,7 @@
*/
void sme_reset_power_values_for5_g(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
TRACE_CODE_SME_RX_HDD_RESET_PW5G, NO_SESSION, 0));
@@ -6544,7 +6544,7 @@
uint8_t sessionId,
const uint8_t nProbes)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
@@ -6587,7 +6587,7 @@
const uint16_t nRoamScanHomeAwayTime,
const bool bSendOffloadCmd)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
@@ -6629,7 +6629,7 @@
uint8_t session_id)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
uint8_t channel_state;
sme_err("Set Channel: %d", channel);
@@ -6662,7 +6662,7 @@
*/
bool sme_get_roam_intra_band(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
TRACE_CODE_SME_RX_HDD_GET_ROAMIBAND, NO_SESSION, 0));
@@ -6679,7 +6679,7 @@
*/
uint8_t sme_get_roam_scan_n_probes(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return mac->mlme_cfg->lfr.roam_scan_n_probes;
}
@@ -6693,7 +6693,7 @@
*/
uint16_t sme_get_roam_scan_home_away_time(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return mac->mlme_cfg->lfr.roam_scan_home_away_time;
}
@@ -6715,7 +6715,7 @@
QDF_STATUS sme_update_roam_rssi_diff(mac_handle_t mac_handle, uint8_t sessionId,
uint8_t RoamRssiDiff)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
if (sessionId >= CSR_ROAM_SESSION_MAX) {
@@ -6750,7 +6750,7 @@
QDF_STATUS sme_update_fils_config(mac_handle_t mac_handle, uint8_t session_id,
struct csr_roam_profile *src_profile)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
tpCsrNeighborRoamControlInfo neighbor_roam_info =
&mac->roam.neighborRoamInfo[session_id];
@@ -6800,7 +6800,7 @@
struct scheduler_msg msg;
QDF_STATUS status;
struct hlp_params *params;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct csr_roam_session *session = CSR_GET_SESSION(mac, session_id);
tpCsrNeighborRoamControlInfo neighbor_roam_info =
&mac->roam.neighborRoamInfo[session_id];
@@ -6907,7 +6907,7 @@
QDF_STATUS sme_update_wes_mode(mac_handle_t mac_handle, bool isWESModeEnabled,
uint8_t sessionId)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
if (sessionId >= CSR_ROAM_SESSION_MAX) {
@@ -6947,7 +6947,7 @@
QDF_STATUS sme_set_roam_scan_control(mac_handle_t mac_handle, uint8_t sessionId,
bool roamScanControl)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
@@ -7002,7 +7002,7 @@
QDF_STATUS sme_update_is_fast_roam_ini_feature_enabled(mac_handle_t mac_handle,
uint8_t sessionId, const bool isFastRoamIniFeatureEnabled)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
if (mac->mlme_cfg->lfr.lfr_enabled ==
isFastRoamIniFeatureEnabled) {
@@ -7040,7 +7040,7 @@
QDF_STATUS sme_config_fast_roaming(mac_handle_t mac_handle, uint8_t session_id,
const bool is_fast_roam_enabled)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id);
QDF_STATUS status;
@@ -7093,7 +7093,7 @@
struct scheduler_msg wma_msg = {0};
QDF_STATUS status;
tSirRoamOffloadScanReq *req;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
tpCsrNeighborRoamControlInfo roam_info;
struct csr_roam_session *session;
@@ -7164,7 +7164,7 @@
QDF_STATUS sme_start_roaming(mac_handle_t mac_handle, uint8_t sessionId,
uint8_t reason)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
status = sme_acquire_global_lock(&mac->sme);
@@ -7195,7 +7195,7 @@
uint8_t sessionId,
const uint8_t nOpportunisticThresholdDiff)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
status = sme_acquire_global_lock(&mac->sme);
@@ -7222,7 +7222,7 @@
*/
uint8_t sme_get_roam_opportunistic_scan_threshold_diff(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return mac->mlme_cfg->lfr.opportunistic_scan_threshold_diff;
}
@@ -7243,7 +7243,7 @@
uint8_t sessionId,
const uint8_t nRoamRescanRssiDiff)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
status = sme_acquire_global_lock(&mac->sme);
@@ -7270,7 +7270,7 @@
*/
uint8_t sme_get_roam_rescan_rssi_diff(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return mac->mlme_cfg->lfr.roam_rescan_rssi_diff;
}
@@ -7291,7 +7291,7 @@
uint8_t sessionId,
const uint8_t nRoamBmissFirstBcnt)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
status = sme_acquire_global_lock(&mac->sme);
@@ -7324,7 +7324,7 @@
uint8_t sessionId,
const uint8_t nRoamBmissFinalBcnt)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
status = sme_acquire_global_lock(&mac->sme);
@@ -7351,7 +7351,7 @@
*/
uint8_t sme_get_roam_beacon_rssi_weight(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return mac->mlme_cfg->lfr.roam_beacon_rssi_weight;
}
@@ -7369,7 +7369,7 @@
QDF_STATUS sme_set_neighbor_lookup_rssi_threshold(mac_handle_t mac_handle,
uint8_t sessionId, uint8_t neighborLookupRssiThreshold)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
status = sme_acquire_global_lock(&mac->sme);
@@ -7397,7 +7397,7 @@
*/
uint8_t sme_get_neighbor_lookup_rssi_threshold(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return mac->mlme_cfg->lfr.neighbor_lookup_rssi_threshold;
}
@@ -7415,7 +7415,7 @@
QDF_STATUS sme_set_neighbor_scan_refresh_period(mac_handle_t mac_handle,
uint8_t sessionId, uint16_t neighborScanResultsRefreshPeriod)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
tpCsrNeighborRoamControlInfo pNeighborRoamInfo = NULL;
@@ -7463,7 +7463,7 @@
*/
uint16_t sme_get_neighbor_scan_refresh_period(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return mac->mlme_cfg->lfr.neighbor_scan_results_refresh_period;
}
@@ -7478,7 +7478,7 @@
*/
uint16_t sme_get_empty_scan_refresh_period(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return mac->mlme_cfg->lfr.empty_scan_refresh_period;
}
@@ -7501,7 +7501,7 @@
uint8_t sessionId, uint16_t
nEmptyScanRefreshPeriod)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
tpCsrNeighborRoamControlInfo pNeighborRoamInfo = NULL;
@@ -7556,7 +7556,7 @@
nNeighborScanMinChanTime,
uint8_t sessionId)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
if (sessionId >= CSR_ROAM_SESSION_MAX) {
@@ -7604,7 +7604,7 @@
const uint16_t
nNeighborScanMaxChanTime)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
tpCsrNeighborRoamControlInfo pNeighborRoamInfo = NULL;
@@ -7651,7 +7651,7 @@
uint16_t sme_get_neighbor_scan_min_chan_time(mac_handle_t mac_handle,
uint8_t sessionId)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
if (sessionId >= CSR_ROAM_SESSION_MAX) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
@@ -7673,7 +7673,7 @@
*/
uint32_t sme_get_neighbor_roam_state(mac_handle_t mac_handle, uint8_t sessionId)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
if (sessionId >= CSR_ROAM_SESSION_MAX) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
@@ -7694,7 +7694,7 @@
*/
uint32_t sme_get_current_roam_state(mac_handle_t mac_handle, uint8_t sessionId)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return mac->roam.curState[sessionId];
}
@@ -7710,7 +7710,7 @@
uint32_t sme_get_current_roam_sub_state(mac_handle_t mac_handle,
uint8_t sessionId)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return mac->roam.curSubState[sessionId];
}
@@ -7724,7 +7724,7 @@
*/
uint32_t sme_get_lim_sme_state(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return mac->lim.gLimSmeState;
}
@@ -7738,7 +7738,7 @@
*/
uint32_t sme_get_lim_mlm_state(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return mac->lim.gLimMlmState;
}
@@ -7753,7 +7753,7 @@
*/
bool sme_is_lim_session_valid(mac_handle_t mac_handle, uint8_t sessionId)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
if (sessionId > mac->lim.maxBssId)
return false;
@@ -7772,7 +7772,7 @@
uint32_t sme_get_lim_sme_session_state(mac_handle_t mac_handle,
uint8_t sessionId)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return mac->lim.gpSession[sessionId].limSmeState;
}
@@ -7788,7 +7788,7 @@
uint32_t sme_get_lim_mlm_session_state(mac_handle_t mac_handle,
uint8_t sessionId)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return mac->lim.gpSession[sessionId].limMlmState;
}
@@ -7804,7 +7804,7 @@
uint16_t sme_get_neighbor_scan_max_chan_time(mac_handle_t mac_handle,
uint8_t sessionId)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
if (sessionId >= CSR_ROAM_SESSION_MAX) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
@@ -7833,7 +7833,7 @@
uint8_t sessionId,
const uint16_t nNeighborScanPeriod)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
tpCsrNeighborRoamControlInfo pNeighborRoamInfo = NULL;
@@ -7881,7 +7881,7 @@
uint16_t sme_get_neighbor_scan_period(mac_handle_t mac_handle,
uint8_t sessionId)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
if (sessionId >= CSR_ROAM_SESSION_MAX) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
@@ -7909,7 +7909,7 @@
const uint16_t
neighbor_scan_min_period)
{
- tpAniSirGlobal pmac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal pmac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
tpCsrNeighborRoamControlInfo p_neighbor_roam_info = NULL;
@@ -7949,7 +7949,7 @@
*/
uint8_t sme_get_roam_rssi_diff(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return mac->mlme_cfg->lfr.roam_rssi_diff;
}
@@ -7971,7 +7971,7 @@
uint8_t *pChannelList,
uint8_t numChannels)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
tpCsrNeighborRoamControlInfo pNeighborRoamInfo = NULL;
uint8_t oldChannelList[WNI_CFG_VALID_CHANNEL_LIST_LEN * 2] = { 0 };
@@ -8051,7 +8051,7 @@
{
int i = 0;
uint8_t *pOutPtr = pChannelList;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
tpCsrNeighborRoamControlInfo pNeighborRoamInfo = NULL;
QDF_STATUS status = QDF_STATUS_SUCCESS;
@@ -8094,7 +8094,7 @@
bool sme_get_is_ese_feature_enabled(mac_handle_t mac_handle)
{
#ifdef FEATURE_WLAN_ESE
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return csr_roam_is_ese_ini_feature_enabled(mac);
#else
@@ -8111,7 +8111,7 @@
*/
bool sme_get_wes_mode(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return mac->mlme_cfg->lfr.wes_mode_enabled;
}
@@ -8125,7 +8125,7 @@
*/
bool sme_get_roam_scan_control(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return mac->roam.configParam.nRoamScanControl;
}
@@ -8139,7 +8139,7 @@
*/
bool sme_get_is_lfr_feature_enabled(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return mac->mlme_cfg->lfr.lfr_enabled;
}
@@ -8154,7 +8154,7 @@
*/
bool sme_get_is_ft_feature_enabled(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return mac->mlme_cfg->lfr.fast_transition_enabled;
}
@@ -8193,7 +8193,7 @@
return QDF_STATUS_E_FAILURE;
}
- mac = PMAC_STRUCT(mac_handle);
+ mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
if (QDF_STATUS_SUCCESS != status) {
sme_err("Failed to acquire global lock");
@@ -8250,7 +8250,7 @@
QDF_STATUS status;
QDF_STATUS qdf_status;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg message = {0};
status = sme_acquire_global_lock(&mac->sme);
@@ -8298,7 +8298,7 @@
{
QDF_STATUS status;
QDF_STATUS qdf_status;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg message = {0};
status = sme_acquire_global_lock(&mac->sme);
@@ -8355,7 +8355,7 @@
void sme_set_curr_device_mode(mac_handle_t mac_handle,
enum QDF_OPMODE currDeviceMode)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
mac->sme.currDeviceMode = currDeviceMode;
}
@@ -8376,7 +8376,7 @@
uint8_t sessionId,
tCsrHandoffRequest *pHandoffInfo)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
status = sme_acquire_global_lock(&mac->sme);
@@ -8396,7 +8396,7 @@
*/
QDF_STATUS sme_is_sta_p2p_client_connected(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
if (csr_is_infra_connected(mac))
return QDF_STATUS_SUCCESS;
@@ -8416,7 +8416,7 @@
struct sSirAddPeriodicTxPtrn *addPeriodicTxPtrnParams)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct sSirAddPeriodicTxPtrn *req_msg;
struct scheduler_msg msg = {0};
@@ -8465,7 +8465,7 @@
struct sSirDelPeriodicTxPtrn *delPeriodicTxPtrnParams)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct sSirDelPeriodicTxPtrn *req_msg;
struct scheduler_msg msg = {0};
@@ -8513,7 +8513,7 @@
QDF_STATUS sme_enable_rmc(mac_handle_t mac_handle, uint32_t sessionId)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg message = {0};
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
@@ -8548,7 +8548,7 @@
QDF_STATUS sme_disable_rmc(mac_handle_t mac_handle, uint32_t sessionId)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg message = {0};
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
@@ -8585,7 +8585,7 @@
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg message = {0};
status = sme_acquire_global_lock(&mac->sme);
@@ -8625,7 +8625,7 @@
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg message = {0};
tSirIbssGetPeerInfoReqParams *pIbssInfoReqParams;
@@ -8677,7 +8677,7 @@
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg message = {0};
status = sme_acquire_global_lock(&mac->sme);
@@ -8705,7 +8705,7 @@
uint16_t latency_level)
{
QDF_STATUS status;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct wlm_latency_level_param params;
void *wma = cds_get_context(QDF_MODULE_ID_WMA);
@@ -8744,7 +8744,7 @@
tpAniSirGlobal mac;
if (NULL != mac_handle) {
- mac = PMAC_STRUCT(mac_handle);
+ mac = MAC_CONTEXT(mac_handle);
} else {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
"%s: Invalid mac_handle pointer", __func__);
@@ -8831,7 +8831,7 @@
struct sir_ocb_config *config)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg msg = {0};
struct sir_ocb_config *msg_body;
@@ -8892,7 +8892,7 @@
struct sir_ocb_utc *utc)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg msg = {0};
struct sir_ocb_utc *sme_utc;
@@ -8938,7 +8938,7 @@
struct sir_ocb_timing_advert *timing_advert)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg msg = {0};
void *buf;
struct sir_ocb_timing_advert *sme_timing_advert;
@@ -8990,7 +8990,7 @@
struct sir_ocb_timing_advert *timing_advert)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg msg = {0};
struct sir_ocb_timing_advert *sme_timing_advert;
@@ -9040,7 +9040,7 @@
uint32_t *time_value_offset)
{
int template_length;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
template_length = sch_gen_timing_advert_frame(mac_ctx, self_addr, buf,
timestamp_offset,
@@ -9061,7 +9061,7 @@
struct sir_ocb_get_tsf_timer *request)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg msg = {0};
struct sir_ocb_get_tsf_timer *msg_body;
@@ -9118,7 +9118,7 @@
struct sir_dcc_get_stats *request)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg msg = {0};
struct sir_dcc_get_stats *msg_body;
@@ -9176,7 +9176,7 @@
uint32_t dcc_stats_bitmap)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg msg = {0};
struct sir_dcc_clear_stats *request;
@@ -9227,7 +9227,7 @@
struct sir_dcc_update_ndl *request)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg msg = {0};
struct sir_dcc_update_ndl *msg_body;
@@ -9294,7 +9294,7 @@
void *context,
ocb_callback callback)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_E_FAILURE;
status = sme_acquire_global_lock(&mac->sme);
@@ -9324,7 +9324,7 @@
FL("mac_handle is not valid"));
return QDF_STATUS_E_INVAL;
}
- mac = PMAC_STRUCT(mac_handle);
+ mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
if (!QDF_IS_STATUS_SUCCESS(status)) {
@@ -9344,7 +9344,7 @@
{
tpAniSirGlobal mac;
- mac = PMAC_STRUCT(mac_handle);
+ mac = MAC_CONTEXT(mac_handle);
mac->sap.enable_etsi13_srd_chan_support = etsi13_srd_chan_support;
sme_debug("srd_ch_support %d", mac->sap.enable_etsi13_srd_chan_support);
}
@@ -9375,7 +9375,7 @@
{
struct scheduler_msg msg = {0};
tpSirModemPowerStateInd request_buf;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
if (NULL == mac)
return QDF_STATUS_E_FAILURE;
@@ -9411,7 +9411,7 @@
{
struct scheduler_msg msg = {0};
tUpdateVHTOpMode *pHtOpMode = NULL;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
if (NULL == mac)
return QDF_STATUS_E_FAILURE;
@@ -9474,7 +9474,7 @@
uint8_t channel_type, bool obssEnabled)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
ePhyChanBondState cbMode;
struct csr_roam_session *session = CSR_GET_SESSION(mac, sessionId);
@@ -9547,7 +9547,7 @@
int16_t sme_get_ht_config(mac_handle_t mac_handle, uint8_t session_id,
uint16_t ht_capab)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct csr_roam_session *pSession = CSR_GET_SESSION(mac, session_id);
if (NULL == pSession) {
@@ -9576,7 +9576,7 @@
int sme_update_ht_config(mac_handle_t mac_handle, uint8_t sessionId,
uint16_t htCapab, int value)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
if (NULL == pSession) {
@@ -9645,7 +9645,7 @@
int sme_set_ba_buff_size(mac_handle_t mac_handle, uint8_t session_id,
uint16_t buff_size)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
if (!buff_size) {
sme_err("invalid buff size %d", buff_size);
return -EINVAL;
@@ -9661,7 +9661,7 @@
int sme_send_addba_req(mac_handle_t mac_handle, uint8_t session_id, uint8_t tid,
uint16_t buff_size)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
uint16_t ba_buff = 0;
QDF_STATUS status;
struct scheduler_msg msg = {0};
@@ -9713,7 +9713,7 @@
int sme_set_no_ack_policy(mac_handle_t mac_handle, uint8_t session_id,
uint8_t val, uint8_t ac)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
uint8_t i, set_val;
struct scheduler_msg msg = {0};
QDF_STATUS status;
@@ -9751,7 +9751,7 @@
int sme_set_auto_rate_he_ltf(mac_handle_t mac_handle, uint8_t session_id,
uint8_t cfg_val)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
uint32_t set_val;
uint32_t bit_mask = 0;
int status;
@@ -9789,7 +9789,7 @@
int sme_set_auto_rate_he_sgi(mac_handle_t mac_handle, uint8_t session_id,
uint8_t cfg_val)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
uint32_t set_val;
uint32_t sgi_bit_mask = 0;
int status;
@@ -9832,7 +9832,7 @@
QDF_STATUS sme_send_rate_update_ind(mac_handle_t mac_handle,
tSirRateUpdateInd *rateUpdateParams)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status;
struct scheduler_msg msg = {0};
tSirRateUpdateInd *rate_upd = qdf_mem_malloc(sizeof(tSirRateUpdateInd));
@@ -10064,7 +10064,7 @@
QDF_STATUS sme_get_reg_info(mac_handle_t mac_handle, uint8_t chanId,
uint32_t *regInfo1, uint32_t *regInfo2)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status;
uint8_t i;
bool found = false;
@@ -10106,7 +10106,7 @@
void (*pCallbackfn)(void))
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
"%s: Plug in Auto shutdown event callback", __func__);
@@ -10134,7 +10134,7 @@
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
tSirAutoShutdownCmdParams *auto_sh_cmd;
struct scheduler_msg message = {0};
@@ -10184,7 +10184,7 @@
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
tSirChAvoidUpdateReq *cauReq;
struct scheduler_msg message = {0};
@@ -10237,7 +10237,7 @@
{
struct scheduler_msg msg = {0};
uint32_t *val;
- tpAniSirGlobal mac_ptr = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ptr = MAC_CONTEXT(mac_handle);
if (!mac_ptr) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
@@ -10327,7 +10327,7 @@
struct csr_roam_profile *profile)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -10408,7 +10408,7 @@
uint8_t dfsCacWaitStatus)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
@@ -10451,7 +10451,7 @@
struct ch_params *ch_params)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -10475,7 +10475,7 @@
{
t_thermal_mgmt *pWmaParam;
struct scheduler_msg msg = {0};
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
pWmaParam = qdf_mem_malloc(sizeof(t_thermal_mgmt));
if (!pWmaParam)
@@ -10545,7 +10545,7 @@
void sme_add_set_thermal_level_callback(mac_handle_t mac_handle,
sme_set_thermal_level_callback callback)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
mac->sme.set_thermal_level_cb = callback;
}
@@ -10560,7 +10560,7 @@
QDF_STATUS sme_set_thermal_level(mac_handle_t mac_handle, uint8_t level)
{
struct scheduler_msg msg = {0};
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&mac->sme)) {
@@ -10597,7 +10597,7 @@
QDF_STATUS status = QDF_STATUS_SUCCESS;
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
struct scheduler_msg message = {0};
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
tSirTxPowerLimit *tx_power_limit;
tx_power_limit = qdf_mem_malloc(sizeof(*tx_power_limit));
@@ -10631,7 +10631,7 @@
QDF_STATUS sme_update_connect_debug(mac_handle_t mac_handle, uint32_t set_value)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
mac->mlme_cfg->gen.debug_packet_log = set_value;
return status;
@@ -10650,7 +10650,7 @@
uint8_t sessionId,
bool disablefwd)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
int status = QDF_STATUS_SUCCESS;
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
struct scheduler_msg message = {0};
@@ -10810,7 +10810,7 @@
QDF_STATUS sme_update_dfs_scan_mode(mac_handle_t mac_handle, uint8_t sessionId,
uint8_t allowDFSChannelRoam)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
if (sessionId >= CSR_ROAM_SESSION_MAX) {
@@ -10852,7 +10852,7 @@
*/
uint8_t sme_get_dfs_scan_mode(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
return mac->mlme_cfg->lfr.roaming_dfs_channel;
}
@@ -10870,7 +10870,7 @@
tSirModifyIE *pModifyIE, eUpdateIEsType updateType)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
@@ -10894,7 +10894,7 @@
tSirUpdateIE *pUpdateIE, eUpdateIEsType updateType)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
@@ -10919,7 +10919,7 @@
enum sme_qos_wmmuptype *dscpmapping,
uint8_t sessionId)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
uint8_t i, j, peSessionId;
struct csr_roam_session *pCsrSession = NULL;
@@ -10995,7 +10995,7 @@
QDF_STATUS sme_abort_roam_scan(mac_handle_t mac_handle, uint8_t sessionId)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
if (mac->mlme_cfg->lfr.roam_scan_offload_enabled) {
/* acquire the lock for the sme object */
@@ -11034,7 +11034,7 @@
uint8_t numChannels = 0;
uint8_t i = 0;
uint32_t totValidChannels = WNI_CFG_VALID_CHANNEL_LIST_LEN;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
if (!aValidChannels || !pNumChannels) {
sme_err("Output channel list/NumChannels is NULL");
@@ -11567,7 +11567,7 @@
struct sir_wisa_params *wisa_params)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg message = {0};
struct sir_wisa_params *cds_msg_wisa_params;
@@ -11603,7 +11603,7 @@
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg message = {0};
tSirLLStatsClearReq *clear_stats_req;
@@ -11668,7 +11668,7 @@
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg message = {0};
tSirLLStatsSetReq *set_stats_req;
@@ -11782,7 +11782,7 @@
tSirLLStatsResults *rsp))
{
QDF_STATUS status;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
if (status == QDF_STATUS_SUCCESS) {
@@ -11814,7 +11814,7 @@
FL("mac_handle is not valid"));
return QDF_STATUS_E_INVAL;
}
- pmac = PMAC_STRUCT(mac_handle);
+ pmac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&pmac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -11853,7 +11853,7 @@
FL("mac_handle is not valid"));
return QDF_STATUS_E_INVAL;
}
- mac = PMAC_STRUCT(mac_handle);
+ mac = MAC_CONTEXT(mac_handle);
thresh = qdf_mem_malloc(sizeof(*thresh));
if (!thresh)
@@ -11903,7 +11903,7 @@
void *power_stats_context)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct scheduler_msg msg = {0};
status = sme_acquire_global_lock(&mac_ctx->sme);
@@ -11946,7 +11946,7 @@
bool key_mgmt_offload_enabled,
struct pmkid_mode_bits *pmkid_modes)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
status = sme_acquire_global_lock(&mac_ctx->sme);
@@ -11984,7 +11984,7 @@
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg message = {0};
status = sme_acquire_global_lock(&mac->sme);
@@ -12029,7 +12029,7 @@
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg message = {0};
status = sme_acquire_global_lock(&mac->sme);
@@ -12066,7 +12066,7 @@
struct scheduler_msg message = {0};
tSirDhcpSrvOffloadInfo *pSmeDhcpSrvInfo;
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
pSmeDhcpSrvInfo = qdf_mem_malloc(sizeof(*pSmeDhcpSrvInfo));
if (!pSmeDhcpSrvInfo)
@@ -12122,7 +12122,7 @@
uint32_t x0, uint32_t x1)
{
QDF_STATUS status;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg message = {0};
struct flashing_req_params *ledflashing;
@@ -12161,7 +12161,7 @@
QDF_STATUS sme_handle_dfs_chan_scan(mac_handle_t mac_handle, uint8_t dfs_flag)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
@@ -12194,7 +12194,7 @@
return QDF_STATUS_E_INVAL;
}
- mac = PMAC_STRUCT(mac_handle);
+ mac = MAC_CONTEXT(mac_handle);
mac->scan.fEnableDFSChnlScan = dfs_flag;
@@ -12220,7 +12220,7 @@
uint8_t session_id)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct csr_roam_session *session = CSR_GET_SESSION(mac, session_id);
uint16_t intf_channel = 0;
@@ -12262,7 +12262,7 @@
{
struct scheduler_msg msg = {0};
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct sir_stats_avg_factor *stats_factor;
stats_factor = qdf_mem_malloc(sizeof(*stats_factor));
@@ -12316,7 +12316,7 @@
{
struct scheduler_msg msg = {0};
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct sir_guard_time_request *g_time;
g_time = qdf_mem_malloc(sizeof(*g_time));
@@ -12369,7 +12369,7 @@
struct sir_wifi_start_log start_log)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg message = {0};
struct sir_wifi_start_log *req_msg;
uint32_t len;
@@ -12425,7 +12425,7 @@
*/
bool sme_neighbor_middle_of_roaming(mac_handle_t mac_handle, uint8_t sessionId)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
bool val = false;
if (CSR_IS_SESSION_VALID(mac_ctx, sessionId))
@@ -12438,7 +12438,7 @@
bool sme_is_any_session_in_middle_of_roaming(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
uint8_t session_id;
for (session_id = 0; session_id < CSR_ROAM_SESSION_MAX; session_id++) {
@@ -12588,7 +12588,7 @@
QDF_STATUS sme_update_nss(mac_handle_t mac_handle, uint8_t nss)
{
QDF_STATUS status;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
uint32_t i;
struct mlme_ht_capabilities_info *ht_cap_info;
struct csr_roam_session *csr_session;
@@ -12626,7 +12626,7 @@
*/
void sme_update_user_configured_nss(mac_handle_t mac_handle, uint8_t nss)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
mac_ctx->user_configured_nss = nss;
}
@@ -12634,7 +12634,7 @@
int sme_update_tx_bfee_supp(mac_handle_t mac_handle, uint8_t session_id,
uint8_t cfg_val)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
mac_ctx->mlme_cfg->vht_caps.vht_cap_info.su_bformee = cfg_val;
@@ -12644,7 +12644,7 @@
int sme_update_tx_bfee_nsts(mac_handle_t mac_handle, uint8_t session_id,
uint8_t usr_cfg_val, uint8_t nsts_val)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
uint8_t nsts_set_val;
mac_ctx->usr_cfg_tx_bfee_nsts = usr_cfg_val;
@@ -12666,7 +12666,7 @@
struct wma_tgt_cfg *cfg,
tDot11fIEhe_cap *he_cap_ini)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
qdf_mem_copy(&mac_ctx->he_cap_2g,
&cfg->he_cap_2g,
@@ -12689,7 +12689,7 @@
void sme_update_he_cap_nss(mac_handle_t mac_handle, uint8_t session_id,
uint8_t nss)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct csr_roam_session *csr_session;
uint32_t tx_mcs_map = 0;
uint32_t rx_mcs_map = 0;
@@ -12727,7 +12727,7 @@
int sme_update_he_mcs(mac_handle_t mac_handle, uint8_t session_id,
uint16_t he_mcs)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct csr_roam_session *csr_session;
uint16_t mcs_val = 0;
uint16_t mcs_map = HE_MCS_ALL_DISABLED;
@@ -12801,7 +12801,7 @@
void sme_set_usr_cfg_mu_edca(mac_handle_t mac_handle, bool val)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
mac_ctx->usr_cfg_mu_edca_params = val;
}
@@ -12828,7 +12828,7 @@
void sme_set_he_mu_edca_def_cfg(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
uint8_t i;
sme_debug("Set MU EDCA params to default");
@@ -12845,7 +12845,7 @@
int sme_update_he_tx_bfee_supp(mac_handle_t mac_handle, uint8_t session_id,
uint8_t cfg_val)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct csr_roam_session *session;
session = CSR_GET_SESSION(mac_ctx, session_id);
@@ -12867,7 +12867,7 @@
uint8_t session_id,
uint8_t cfg_val)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct csr_roam_session *session;
session = CSR_GET_SESSION(mac_ctx, session_id);
@@ -12891,7 +12891,7 @@
uint8_t cfg_val)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct csr_roam_session *session;
session = CSR_GET_SESSION(mac_ctx, session_id);
@@ -12915,7 +12915,7 @@
{
uint32_t om_ctrl_cmd[NUM_OM_CTRL_UPDATE_CFG_PARAMS] = {0};
QDF_STATUS status;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id);
if (!session) {
@@ -12966,7 +12966,7 @@
{
uint32_t om_ctrl_cmd[NUM_OM_CTRL_UPDATE_CFG_PARAMS] = {0};
QDF_STATUS status;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id);
if (!session) {
@@ -13014,7 +13014,7 @@
void sme_reset_he_om_ctrl(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
mac_ctx->he_om_ctrl_cfg_bw_set = false;
mac_ctx->he_om_ctrl_cfg_nss_set = false;
@@ -13062,7 +13062,7 @@
int sme_update_he_tx_bfee_nsts(mac_handle_t mac_handle, uint8_t session_id,
uint8_t cfg_val)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct csr_roam_session *session;
session = CSR_GET_SESSION(mac_ctx, session_id);
@@ -13120,7 +13120,7 @@
int sme_update_he_tx_stbc_cap(mac_handle_t mac_handle, uint8_t session_id,
int value)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct csr_roam_session *session;
uint32_t he_cap_val = 0;
@@ -13148,7 +13148,7 @@
int sme_update_he_rx_stbc_cap(mac_handle_t mac_handle, uint8_t session_id,
int value)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct csr_roam_session *session;
uint32_t he_cap_val = 0;
@@ -13176,7 +13176,7 @@
int sme_update_he_frag_supp(mac_handle_t mac_handle, uint8_t session_id,
uint16_t he_frag)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct csr_roam_session *session;
session = CSR_GET_SESSION(mac_ctx, session_id);
@@ -13198,7 +13198,7 @@
int sme_update_he_ldpc_supp(mac_handle_t mac_handle, uint8_t session_id,
uint16_t he_ldpc)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct csr_roam_session *session;
session = CSR_GET_SESSION(mac_ctx, session_id);
@@ -13240,7 +13240,7 @@
FL("mac_handle is not valid"));
return QDF_STATUS_E_INVAL;
}
- mac = PMAC_STRUCT(mac_handle);
+ mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
if (!QDF_IS_STATUS_SUCCESS(status)) {
@@ -13270,7 +13270,7 @@
*/
bool sme_is_any_session_in_connected_state(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
QDF_STATUS status;
bool ret = false;
@@ -13313,7 +13313,7 @@
struct rssi_monitor_req *input)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg message = {0};
struct rssi_monitor_req *req_msg;
@@ -13525,7 +13525,7 @@
void sme_register_hw_mode_trans_cb(mac_handle_t mac_handle,
hw_mode_transition_cb callback)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
mac->sme.sme_hw_mode_trans_cb = callback;
}
@@ -13685,7 +13685,7 @@
struct sir_antenna_mode_param *msg)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
tSmeCmd *cmd;
if (NULL == msg) {
@@ -13758,7 +13758,7 @@
bool scan_pending)
{
QDF_STATUS status;
- tpAniSirGlobal mac_ptr = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ptr = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac_ptr->sme);
@@ -13785,7 +13785,7 @@
*/
void sme_setdef_dot11mode(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
csr_set_default_dot11_mode(mac_ctx);
}
@@ -13802,7 +13802,7 @@
void sme_update_tgt_services(mac_handle_t mac_handle,
struct wma_tgt_services *cfg)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
mac_ctx->obss_scan_offload = cfg->obss_scan_offload;
sme_debug("obss_scan_offload: %d", mac_ctx->obss_scan_offload);
@@ -13834,7 +13834,7 @@
tpAniSirGlobal mac;
if (NULL != mac_handle) {
- mac = PMAC_STRUCT(mac_handle);
+ mac = MAC_CONTEXT(mac_handle);
} else {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
"%s: null mac pointer", __func__);
@@ -13863,7 +13863,7 @@
void sme_get_opclass(mac_handle_t mac_handle, uint8_t channel,
uint8_t bw_offset, uint8_t *opclass)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
/* redgm opclass table contains opclass for 40MHz low primary,
* 40MHz high primary and 20MHz. No support for 80MHz yet. So
@@ -13951,7 +13951,7 @@
uint8_t ht_smps_mode,
bool send_smps_action)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
sme_debug("SMPS enable: %d mode: %d send action: %d",
is_ht_smps_enabled, ht_smps_mode,
@@ -13976,7 +13976,7 @@
*/
bool sme_is_sta_smps_allowed(mac_handle_t mac_handle, uint8_t session_id)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct csr_roam_session *csr_session;
csr_session = CSR_GET_SESSION(mac_ctx, session_id);
@@ -14007,7 +14007,7 @@
{
struct scheduler_msg message = {0};
QDF_STATUS qdf_status;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct beacon_filter_param *filter_param;
if (!CSR_IS_SESSION_VALID(mac_ctx, session_id)) {
@@ -14052,7 +14052,7 @@
{
struct scheduler_msg message = {0};
QDF_STATUS qdf_status;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct beacon_filter_param *filter_param;
if (!CSR_IS_SESSION_VALID(mac_ctx, session_id)) {
@@ -14148,7 +14148,7 @@
void *context)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct scheduler_msg cds_msg = {0};
SME_ENTER();
@@ -14229,7 +14229,7 @@
apf_read_mem_cb callback)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
void *wma_handle;
status = sme_acquire_global_lock(&mac->sme);
@@ -14260,7 +14260,7 @@
*/
uint32_t sme_get_wni_dot11_mode(mac_handle_t mac_handle)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
return csr_translate_to_wni_cfg_dot11_mode(mac_ctx,
mac_ctx->roam.configParam.uCfgDot11Mode);
@@ -14301,7 +14301,7 @@
QDF_ASSERT(0);
return;
}
- mac = PMAC_STRUCT(mac_handle);
+ mac = MAC_CONTEXT(mac_handle);
mac->chan_info_cb = callback;
}
@@ -14381,7 +14381,7 @@
*/
void sme_set_pdev_ht_vht_ies(mac_handle_t mac_handle, bool enable2x2)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct sir_set_ht_vht_cfg *ht_vht_cfg;
QDF_STATUS status = QDF_STATUS_E_FAILURE;
@@ -14430,7 +14430,7 @@
void sme_update_vdev_type_nss(mac_handle_t mac_handle, uint8_t max_supp_nss,
enum nss_chains_band_info band)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct vdev_type_nss *vdev_nss;
struct wlan_mlme_nss_chains *nss_chains_ini_cfg =
@@ -14526,7 +14526,7 @@
*/
void sme_update_hw_dbs_capable(mac_handle_t mac_handle, uint8_t hw_dbs_capable)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
mac_ctx->hw_dbs_capable = hw_dbs_capable;
}
@@ -14546,7 +14546,7 @@
void sme_register_p2p_lo_event(mac_handle_t mac_handle, void *context,
p2p_lo_callback callback)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_E_FAILURE;
status = sme_acquire_global_lock(&mac->sme);
@@ -14568,7 +14568,7 @@
struct sir_mac_pwr_dbg_cmd *dbg_args)
{
struct scheduler_msg message = {0};
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct sir_mac_pwr_dbg_cmd *req;
int i;
@@ -14647,7 +14647,7 @@
uint8_t session_id,
uint8_t sap_operating_band)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
tSmeConfigParams *sme_config;
@@ -14707,7 +14707,7 @@
uint8_t set_value)
{
QDF_STATUS status;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct scheduler_msg msg = {0};
if (!mac_ctx->mlme_cfg->gen.optimize_ca_event) {
@@ -14743,7 +14743,7 @@
uint8_t *ie_data, uint16_t ie_len)
{
QDF_STATUS status;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct hdd_default_scan_ie *set_ie_params;
if (!ie_data)
@@ -14916,7 +14916,7 @@
bool sme_neighbor_roam_is11r_assoc(mac_handle_t mac_handle, uint8_t session_id)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
return csr_neighbor_roam_is11r_assoc(mac_ctx, session_id);
}
@@ -15021,7 +15021,7 @@
struct scan_result_list *bss_list;
tScanResultHandle result_handle = NULL;
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
scan_filter = qdf_mem_malloc(sizeof(tCsrScanResultFilter));
if (!scan_filter) {
@@ -15094,7 +15094,7 @@
QDF_STATUS status = QDF_STATUS_SUCCESS;
tScanResultHandle result_handle = NULL;
tCsrScanResultFilter *scan_filter;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
tSirBssDescription *bss_descp;
struct scan_result_list *bss_list;
uint32_t ie_len;
@@ -15189,7 +15189,7 @@
QDF_STATUS status;
struct wma_roam_invoke_cmd *fastreassoc;
struct scheduler_msg msg = {0};
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct csr_roam_session *session;
struct csr_roam_profile *roam_profile;
@@ -15423,7 +15423,7 @@
enum scan_reject_states *reason))
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -15486,7 +15486,7 @@
QDF_STATUS sme_get_rcpi(mac_handle_t mac_handle, struct sme_rcpi_req *rcpi)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg msg = {0};
struct sme_rcpi_req *rcpi_req;
@@ -15521,7 +15521,7 @@
void sme_store_pdev(mac_handle_t mac_handle, struct wlan_objmgr_pdev *pdev)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
void *wma_handle;
QDF_STATUS status;
@@ -15545,7 +15545,7 @@
congestion_cb congestion_cb)
{
QDF_STATUS status;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -15731,7 +15731,7 @@
void *context)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
tp_wma_handle wma_handle;
SME_ENTER();
@@ -15766,7 +15766,7 @@
void sme_display_disconnect_stats(mac_handle_t mac_handle, uint8_t session_id)
{
struct csr_roam_session *session;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
if (!CSR_IS_SESSION_VALID(mac_ctx, session_id)) {
sme_err("%s Invalid session id: %d", __func__, session_id);
@@ -15882,7 +15882,7 @@
uint8_t buf_len, tDot11fIERSN *rsn_ie,
bool append_ie)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
return dot11f_unpack_ie_rsn(mac_ctx, buf, buf_len, rsn_ie, append_ie);
}
@@ -15907,7 +15907,7 @@
uint8_t trans_reason,
bool is_bt_in_progress)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct wlan_mlme_mbo *mbo_cfg;
int8_t current_rssi_mcc_thres;
@@ -16065,7 +16065,7 @@
bool sme_is_conn_state_connected(mac_handle_t mac_handle, uint8_t session_id)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
return csr_is_conn_state_connected(mac_ctx, session_id);
}
@@ -16073,7 +16073,7 @@
void sme_enable_roaming_on_connected_sta(mac_handle_t mac_handle)
{
uint8_t session_id;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
QDF_STATUS status;
session_id = csr_get_roam_enabled_sta_sessionid(mac_ctx);
@@ -16115,7 +16115,7 @@
sme_err("mac_handle is null");
return 0;
}
- mac_ctx = PMAC_STRUCT(mac_handle);
+ mac_ctx = MAC_CONTEXT(mac_handle);
vdev_id = wlan_vdev_get_id(vdev);
if (!CSR_IS_SESSION_VALID(mac_ctx, vdev_id)) {
sme_err("Invalid vdev id is passed");
@@ -16148,7 +16148,7 @@
sme_err("mac_handle is null");
return CH_WIDTH_INVALID;
}
- mac_ctx = PMAC_STRUCT(mac_handle);
+ mac_ctx = MAC_CONTEXT(mac_handle);
vdev_id = wlan_vdev_get_id(vdev);
if (!CSR_IS_SESSION_VALID(mac_ctx, vdev_id)) {
sme_err("Invalid vdev id is passed");
@@ -16178,7 +16178,7 @@
uint8_t sae_status)
{
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct sir_sae_msg *sae_msg;
struct scheduler_msg sch_msg = {0};
@@ -16215,7 +16215,7 @@
bool sme_is_sta_key_exchange_in_progress(mac_handle_t mac_handle,
uint8_t session_id)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
if (!CSR_IS_SESSION_VALID(mac_ctx, session_id)) {
sme_err("Invalid session id: %d", session_id);
@@ -16229,7 +16229,7 @@
uint8_t *chan_list,
uint8_t num_channels)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
uint8_t i = 0;
uint8_t j;
bool found;
@@ -16262,7 +16262,7 @@
void sme_set_amsdu(mac_handle_t mac_handle, bool enable)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
mac_ctx->is_usr_cfg_amsdu_enabled = enable;
}
@@ -16274,7 +16274,7 @@
bool sme_find_session_by_bssid(mac_handle_t mac_handle, uint8_t *bssid)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
bool ret;
ret = csr_find_session_by_bssid(mac_ctx, bssid);
@@ -16316,7 +16316,7 @@
uint32_t vdev_id)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct scheduler_msg msg = {0};
struct sir_roam_scan_stats *req;
@@ -16355,7 +16355,7 @@
void sme_update_score_config(mac_handle_t mac_handle,
struct scoring_config *score_config)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct wlan_mlme_scoring_cfg *mlme_scoring_cfg;
mlme_scoring_cfg = &mac_ctx->mlme_cfg->scoring;
diff --git a/core/sme/src/common/sme_ft_api.c b/core/sme/src/common/sme_ft_api.c
index 9a8881a..40dca01 100644
--- a/core/sme/src/common/sme_ft_api.c
+++ b/core/sme/src/common/sme_ft_api.c
@@ -25,7 +25,7 @@
/* Initialize the FT context. */
void sme_ft_open(mac_handle_t mac_handle, uint32_t sessionId)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
QDF_STATUS status = QDF_STATUS_SUCCESS;
struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
@@ -60,7 +60,7 @@
/* Cleanup the SME FT Global context. */
void sme_ft_close(mac_handle_t mac_handle, uint32_t sessionId)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct csr_roam_session *pSession = NULL;
/* Clear the FT Context */
@@ -89,7 +89,7 @@
void sme_set_ft_pre_auth_state(mac_handle_t mac_handle, uint32_t sessionId,
bool state)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
if (pSession)
@@ -98,7 +98,7 @@
bool sme_get_ft_pre_auth_state(mac_handle_t mac_handle, uint32_t sessionId)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
if (pSession)
@@ -122,7 +122,7 @@
void sme_set_ft_ies(mac_handle_t mac_handle, uint32_t session_id,
const uint8_t *ft_ies, uint16_t ft_ies_length)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id);
QDF_STATUS status = QDF_STATUS_E_FAILURE;
@@ -284,7 +284,7 @@
bool sme_get_ftptk_state(mac_handle_t mac_handle, uint32_t sessionId)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
if (!pSession) {
@@ -297,7 +297,7 @@
void sme_set_ftptk_state(mac_handle_t mac_handle, uint32_t sessionId,
bool state)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
if (!pSession) {
@@ -310,7 +310,7 @@
QDF_STATUS sme_ft_update_key(mac_handle_t mac_handle, uint32_t sessionId,
tCsrRoamSetKey *pFTKeyInfo)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
QDF_STATUS status = QDF_STATUS_E_FAILURE;
@@ -373,7 +373,7 @@
uint8_t *ft_ies, uint32_t ft_ies_ip_len,
uint16_t *ft_ies_length)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
QDF_STATUS status = QDF_STATUS_E_FAILURE;
@@ -423,7 +423,7 @@
uint8_t *ric_ies,
uint32_t ric_ies_ip_len, uint32_t *ric_ies_length)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
QDF_STATUS status = QDF_STATUS_E_FAILURE;
@@ -475,7 +475,7 @@
/* Reset the FT context. */
void sme_ft_reset(mac_handle_t mac_handle, uint32_t sessionId)
{
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
struct csr_roam_session *pSession = NULL;
if (mac == NULL) {
diff --git a/core/sme/src/common/sme_power_save.c b/core/sme/src/common/sme_power_save.c
index 51e40bb..8915d8a 100644
--- a/core/sme/src/common/sme_power_save.c
+++ b/core/sme/src/common/sme_power_save.c
@@ -371,7 +371,7 @@
enum sme_ps_cmd command)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
status = sme_enable_sta_ps_check(mac_ctx, session_id);
if (status != QDF_STATUS_SUCCESS) {
@@ -393,7 +393,7 @@
QDF_STATUS sme_ps_timer_flush_sync(mac_handle_t mac_handle, uint8_t session_id)
{
QDF_STATUS status;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct ps_params *ps_parm;
enum ps_state ps_state;
QDF_TIMER_STATE tstate;
@@ -460,7 +460,7 @@
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
status = sme_enable_sta_ps_check(mac_ctx, session_id);
if (status != QDF_STATUS_SUCCESS)
@@ -484,7 +484,7 @@
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
status = sme_enable_sta_ps_check(mac_ctx, session_id);
if (status != QDF_STATUS_SUCCESS)
@@ -611,7 +611,7 @@
{
tpSirHostOffloadReq request_buf;
struct scheduler_msg msg = {0};
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id);
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
@@ -667,7 +667,7 @@
tpSirHostOffloadReq request,
uint8_t session_id)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
tpSirHostOffloadReq request_buf;
struct scheduler_msg msg = {0};
struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id);
@@ -741,7 +741,7 @@
QDF_STATUS sme_ps_enable_auto_ps_timer(mac_handle_t mac_handle,
uint32_t session_id, uint32_t timeout)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info;
struct ps_params *ps_param = &ps_global_info->ps_params[session_id];
QDF_STATUS qdf_status;
@@ -770,7 +770,7 @@
QDF_STATUS sme_ps_disable_auto_ps_timer(mac_handle_t mac_handle,
uint32_t session_id)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info;
struct ps_params *ps_param = &ps_global_info->ps_params[session_id];
/*
@@ -805,7 +805,7 @@
QDF_STATUS sme_ps_open_per_session(mac_handle_t mac_handle, uint32_t session_id)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info;
struct ps_params *ps_param = &ps_global_info->ps_params[session_id];
@@ -863,7 +863,7 @@
uint32_t session_id)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info;
struct ps_params *ps_param = &ps_global_info->ps_params[session_id];
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
@@ -886,7 +886,7 @@
bool sme_is_auto_ps_timer_running(mac_handle_t mac_handle,
uint32_t session_id)
{
- tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info;
struct ps_params *ps_param = &ps_global_info->ps_params[session_id];
bool status = false;
diff --git a/core/sme/src/qos/sme_qos.c b/core/sme/src/qos/sme_qos.c
index d68987b..ec919aa 100644
--- a/core/sme/src/qos/sme_qos.c
+++ b/core/sme/src/qos/sme_qos.c
@@ -681,7 +681,7 @@
{
struct sme_qos_sessioninfo *pSession;
QDF_STATUS lock_status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
enum sme_qos_statustype status;
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
@@ -755,7 +755,7 @@
uint32_t QosFlowID)
{
QDF_STATUS lock_status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
enum sme_qos_statustype status;
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
@@ -798,7 +798,7 @@
uint32_t QosFlowID)
{
QDF_STATUS lock_status = QDF_STATUS_E_FAILURE;
- tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+ tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
enum sme_qos_statustype status;
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,