lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: remove legacy roc struct/functions

Browse Source 
After p2p componentized, the legacy roc data struct and
functions are not needed. Remove below data struct and
functions:
lim_remain_on_chn_rsp
lim_process_remain_on_chnl_req
lim_process_remain_on_chn_timeout
lim_send_p2p_action_frame
lim_send_sme_roc_rsp
struct sir_roc_rsp
struct sSirRemainOnChnReq
tSirRemainOnChnReq *gpLimRemainOnChanReq

Change-Id: Ie1644bf973e8aba30f44e0750f97b21ec31deb69
CRs-Fixed: 2367914
This commit is contained in:
Liangwei Dong 2018-12-16 23:56:50 -05:00 committed by nshrivas
parent b32cb26dee
commit d7c5e01a75
8 changed files with 7 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/mac/inc/ani_global.h
View File

@ -676,7 +676,6 @@ typedef struct sAniSirLim {
tLimWscIeInfo wscIeInfo;
struct pe_session *gpSession; /* Pointer to session table */
tSirRemainOnChnReq *gpLimRemainOnChanReq; /* hold remain on chan request in this buf */
qdf_mutex_t lim_frame_register_lock;
qdf_list_t gLimMgmtFrameRegistratinQueue;
uint32_t tdls_frm_session_id;

29
core/mac/inc/sir_api.h
View File

@ -360,35 +360,6 @@ typedef struct sSirSupportedRates {
#endif
} tSirSupportedRates, *tpSirSupportedRates;
typedef struct sSirRemainOnChnReq {
uint16_t messageType;
uint16_t length;
uint8_t sessionId;
struct qdf_mac_addr selfMacAddr;
uint8_t chnNum;
uint8_t phyMode;
uint32_t duration;
uint8_t isProbeRequestAllowed;
uint32_t scan_id;
uint8_t probeRspIe[1];
} tSirRemainOnChnReq, *tpSirRemainOnChnReq;
/**
* struct sir_roc_rsp - Structure to store the remain on channel response
* @message_type: Message Type
* @length: Message Length
* @session_id: SME session Id
* @scan_id : scan identifier
* @status: result status
*/
struct sir_roc_rsp {
uint16_t message_type;
uint16_t length;
uint8_t session_id;
uint32_t scan_id;
tSirResultCodes status;
};
typedef struct sSirRegisterMgmtFrame {
uint16_t messageType;
uint16_t length;

15
core/mac/src/pe/include/lim_api.h
View File

@ -327,21 +327,6 @@ QDF_STATUS pe_mc_process_handler(struct scheduler_msg *msg);
-----------------------------------------------------------------*/
void pe_free_msg(struct mac_context *mac, struct scheduler_msg *pMsg);
/*--------------------------------------------------------------------------
\brief lim_remain_on_chn_rsp() - API for sending remain on channel response.
LIM calls this api to send the remain on channel response to SME.
\param mac - Pointer to Global MAC structure
\param status - status of the response
\param data - pointer to msg
\return void
--------------------------------------------------------------------------*/
void lim_remain_on_chn_rsp(struct mac_context *mac, QDF_STATUS status, uint32_t *data);
/**
* lim_process_abort_scan_ind() - abort the scan which is presently being run
*

3
core/mac/src/pe/lim/lim_api.c
View File

@ -485,9 +485,6 @@ void lim_cleanup(struct mac_context *mac)
pe_deregister_mgmt_rx_frm_callback(mac);
qdf_mem_free(mac->lim.gpLimRemainOnChanReq);
mac->lim.gpLimRemainOnChanReq = NULL;
/* free up preAuth table */
if (mac->lim.gLimPreAuthTimerTable.pTable != NULL) {
for (i = 0; i < mac->lim.gLimPreAuthTimerTable.numEntry; i++)

9
core/mac/src/pe/lim/lim_process_probe_req_frame.c
View File

@ -259,15 +259,6 @@ lim_process_probe_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
if (mac_ctx->lim.gLimProbeRespDisableFlag)
return;
/*
* Don't send probe response if P2P go is scanning till scan
* come to idle state.
*/
if ((session->pePersona == QDF_P2P_GO_MODE) &&
mac_ctx->lim.gpLimRemainOnChanReq) {
pe_debug("GO is scanning, don't send probersp on diff chnl");
return;
}
mac_hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info);
if (LIM_IS_AP_ROLE(session) ||
(LIM_IS_IBSS_ROLE(session) &&

24
core/mac/src/pe/lim/lim_send_management_frames.c
View File

@ -665,17 +665,13 @@ lim_send_probe_rsp_mgmt_frame(struct mac_context *mac_ctx,
&frm->WAPI);
#endif /* defined(FEATURE_WLAN_WAPI) */
if (mac_ctx->lim.gpLimRemainOnChanReq)
bytes += (mac_ctx->lim.gpLimRemainOnChanReq->length -
sizeof(tSirRemainOnChnReq));
else
/*
* Only use CFG for non-listen mode. This CFG is not working for
* concurrency. In listening mode, probe rsp IEs is passed in
* the message from SME to PE.
*/
addn_ie_present =
(pe_session->addIeParams.probeRespDataLen != 0);
/*
* Only use CFG for non-listen mode. This CFG is not working for
* concurrency. In listening mode, probe rsp IEs is passed in
* the message from SME to PE.
*/
addn_ie_present =
(pe_session->addIeParams.probeRespDataLen != 0);
if (addn_ie_present) {
@ -779,12 +775,6 @@ lim_send_probe_rsp_mgmt_frame(struct mac_context *mac_ctx,
pe_debug("Sending Probe Response frame to");
lim_print_mac_addr(mac_ctx, peer_macaddr, LOGD);
if (mac_ctx->lim.gpLimRemainOnChanReq)
qdf_mem_copy(frame + sizeof(tSirMacMgmtHdr) + payload,
mac_ctx->lim.gpLimRemainOnChanReq->probeRspIe,
(mac_ctx->lim.gpLimRemainOnChanReq->length -
sizeof(tSirRemainOnChnReq)));
if (addn_ie_present)
qdf_mem_copy(frame + sizeof(tSirMacMgmtHdr) + payload,
&add_ie[0], addn_ie_len);

5
core/mac/src/pe/lim/lim_types.h
View File

@ -928,9 +928,6 @@ void lim_wpspbc_close(struct mac_context *mac, struct pe_session *pe_session);
#define LIM_WPS_OVERLAP_TIMER_MS 10000
void lim_process_remain_on_chn_timeout(struct mac_context *mac);
void lim_send_p2p_action_frame(struct mac_context *mac, struct scheduler_msg *pMsg);
void lim_process_disassoc_ack_timeout(struct mac_context *mac);
void lim_process_deauth_ack_timeout(struct mac_context *mac);
QDF_STATUS lim_send_disassoc_cnf(struct mac_context *mac);
@ -968,8 +965,6 @@ typedef struct sSetLinkCbackParams {
void *cbackDataPtr;
} tSetLinkCbackParams;
int lim_process_remain_on_chnl_req(struct mac_context *mac, uint32_t *pMsg);
void lim_remain_on_chn_rsp(struct mac_context *mac, QDF_STATUS status, uint32_t *data);
void lim_send_sme_disassoc_deauth_ntf(struct mac_context *mac_ctx,
QDF_STATUS status, uint32_t *ctx);

14
core/mac/src/pe/lim/lim_utils.c
View File

@ -4037,20 +4037,6 @@ void lim_update_sta_run_time_ht_switch_chnl_params(struct mac_context *mac,
return;
}
/*
* Do not try to switch channel if RoC is in progress. RoC code path
* uses mac->lim.gpLimRemainOnChanReq to notify the upper layers that
* the device has started listening on the channel requested as part of
* RoC, if we set mac->lim.gpLimRemainOnChanReq to NULL as we do below
* then the upper layers will think that the channel change is not
* successful and the RoC from the upper layer perspective will never
* end...
*/
if (mac->lim.gpLimRemainOnChanReq) {
pe_debug("RoC is in progress");
return;
}
if (pe_session->ch_switch_in_progress == true) {
pe_debug("ch switch is in progress, ignore HT IE BW update");
return;