qcacld-3.0: Refine API wlansap_dfs_send_csa_ie_request()

See change "qcacld-3.0: Refine API wlansap_open()" for the API
history.  Update wlansap_dfs_send_csa_ie_request() to use the
true struct pointer type.

Change-Id: I7abb2cdefab70e6c7997f438221a7f0aa4c8e3af
CRs-Fixed: 2116267
This commit is contained in:
Jeff Johnson
2017-09-25 18:50:01 -07:00
committed by snandini
parent ed4ed172fc
commit bfeafc6ba7
3 changed files with 19 additions and 30 deletions

View File

@@ -1247,7 +1247,18 @@ QDF_STATUS wlansap_de_register_mgmt_frame(struct sap_context *pSapCtx,
QDF_STATUS wlansap_channel_change_request(void *p_cds_gctx, QDF_STATUS wlansap_channel_change_request(void *p_cds_gctx,
uint8_t tArgetChannel); uint8_t tArgetChannel);
QDF_STATUS wlansap_start_beacon_req(void *pSapCtx); QDF_STATUS wlansap_start_beacon_req(void *pSapCtx);
QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx);
/**
* wlansap_dfs_send_csa_ie_request() - Send CSA IE
* @sap_ctx: Pointer to the SAP context
*
* This API is used to send channel switch announcement request to PE
*
* Return: The QDF_STATUS code associated with performing the operation
* QDF_STATUS_SUCCESS: Success
*/
QDF_STATUS wlansap_dfs_send_csa_ie_request(struct sap_context *sap_ctx);
QDF_STATUS wlansap_get_dfs_ignore_cac(tHalHandle hHal, uint8_t *pIgnore_cac); QDF_STATUS wlansap_get_dfs_ignore_cac(tHalHandle hHal, uint8_t *pIgnore_cac);
QDF_STATUS wlansap_set_dfs_ignore_cac(tHalHandle hHal, uint8_t ignore_cac); QDF_STATUS wlansap_set_dfs_ignore_cac(tHalHandle hHal, uint8_t ignore_cac);
QDF_STATUS wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, QDF_STATUS wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal,

View File

@@ -3472,8 +3472,8 @@ static QDF_STATUS sap_fsm_state_started(struct sap_context *sap_ctx,
FL("sapdfs: Sending CSAIE for sapctx[%pK]"), FL("sapdfs: Sending CSAIE for sapctx[%pK]"),
temp_sap_ctx); temp_sap_ctx);
qdf_status = wlansap_dfs_send_csa_ie_request( qdf_status =
(void *) temp_sap_ctx); wlansap_dfs_send_csa_ie_request(temp_sap_ctx);
} }
} }
} else if (eSAP_CHANNEL_SWITCH_ANNOUNCEMENT_START == msg) { } else if (eSAP_CHANNEL_SWITCH_ANNOUNCEMENT_START == msg) {
@@ -3493,8 +3493,7 @@ static QDF_STATUS sap_fsm_state_started(struct sap_context *sap_ctx,
persona, sap_ctx->sessionId); persona, sap_ctx->sessionId);
if ((QDF_SAP_MODE == persona) || (QDF_P2P_GO_MODE == persona)) if ((QDF_SAP_MODE == persona) || (QDF_P2P_GO_MODE == persona))
qdf_status = wlansap_dfs_send_csa_ie_request( qdf_status = wlansap_dfs_send_csa_ie_request(sap_ctx);
(void *) sap_ctx);
} else { } else {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
FL("in state %s, invalid event msg %d"), FL("in state %s, invalid event msg %d"),

View File

@@ -1961,34 +1961,13 @@ QDF_STATUS wlansap_start_beacon_req(void *pSapCtx)
return QDF_STATUS_E_FAULT; return QDF_STATUS_E_FAULT;
} }
/*========================================================================== QDF_STATUS wlansap_dfs_send_csa_ie_request(struct sap_context *sap_ctx)
FUNCTION wlansap_dfs_send_csa_ie_request
DESCRIPTION
This API is used to send channel switch announcement request to PE
DEPENDENCIES
NA.
PARAMETERS
IN
pSapCtx: Pointer to cds global context structure
RETURN VALUE
The QDF_STATUS code associated with performing the operation
QDF_STATUS_SUCCESS: Success
SIDE EFFECTS
============================================================================*/
QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx)
{ {
struct sap_context *sapContext = NULL;
QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
void *hHal = NULL; void *hHal = NULL;
tpAniSirGlobal pMac = NULL; tpAniSirGlobal pMac = NULL;
sapContext = pSapCtx;
if (NULL == sapContext) { if (NULL == sap_ctx) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
"%s: Invalid SAP pointer", __func__); "%s: Invalid SAP pointer", __func__);
return QDF_STATUS_E_FAULT; return QDF_STATUS_E_FAULT;
@@ -1997,7 +1976,7 @@ QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx)
hHal = CDS_GET_HAL_CB(); hHal = CDS_GET_HAL_CB();
if (NULL == hHal) { if (NULL == hHal) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
"%s: Invalid HAL pointer from p_cds_gctx", __func__); "%s: Invalid HAL pointer", __func__);
return QDF_STATUS_E_FAULT; return QDF_STATUS_E_FAULT;
} }
pMac = PMAC_STRUCT(hHal); pMac = PMAC_STRUCT(hHal);
@@ -2016,7 +1995,7 @@ QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx)
pMac->sap.SapDfsInfo.new_ch_params.sec_ch_offset); pMac->sap.SapDfsInfo.new_ch_params.sec_ch_offset);
qdf_ret_status = sme_roam_csa_ie_request(hHal, qdf_ret_status = sme_roam_csa_ie_request(hHal,
sapContext->bssid, sap_ctx->bssid,
pMac->sap.SapDfsInfo.target_channel, pMac->sap.SapDfsInfo.target_channel,
pMac->sap.SapDfsInfo.csaIERequired, pMac->sap.SapDfsInfo.csaIERequired,
&pMac->sap.SapDfsInfo.new_ch_params); &pMac->sap.SapDfsInfo.new_ch_params);