From 1b59312656ce5502844b3514513562efc4307a51 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Wed, 6 Feb 2019 13:10:30 -0800 Subject: [PATCH] qcacld-3.0: Remove eWNI_SME_GET_ASSOC_STAS_REQ handling Change I050383ce7e922fe4e42e1f5c4d2a8260dddbd4bb ("qcacld-3.0: Remove csr_send_mb_get_associated_stas_req_msg()") removed the logic that sent the eWNI_SME_GET_ASSOC_STAS_REQ message. Since this message is obsolete, remove the handling code from LIM. Change-Id: Iea602a1da42d5eecafae1d00f2260f4930128f40 CRs-Fixed: 2396057 --- core/mac/inc/sir_api.h | 11 -- core/mac/inc/wni_api.h | 2 +- .../src/pe/lim/lim_process_message_queue.c | 1 - .../src/pe/lim/lim_process_sme_req_messages.c | 106 ------------------ .../src/sys/legacy/src/utils/src/mac_trace.c | 1 - 5 files changed, 1 insertion(+), 120 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 49a70e5567..cec6a65c1d 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -1746,17 +1746,6 @@ struct lim_scan_channel_status { channel_status_list[SIR_MAX_SUPPORTED_CHANNEL_LIST]; }; -typedef struct sSirSmeGetAssocSTAsReq { - uint16_t messageType; /* eWNI_SME_GET_ASSOC_STAS_REQ */ - uint16_t length; - struct qdf_mac_addr bssid; /* BSSID */ - uint16_t modId; - void *pUsrContext; - void *pSapEventCallback; - /* Pointer to allocated mem passed in wlansap_get_assoc_stations API */ - void *pAssocStasArray; -} tSirSmeGetAssocSTAsReq, *tpSirSmeGetAssocSTAsReq; - typedef struct sSmeMaxAssocInd { uint16_t mesgType; /* eWNI_SME_MAX_ASSOC_EXCEEDED */ uint16_t mesgLen; diff --git a/core/mac/inc/wni_api.h b/core/mac/inc/wni_api.h index 26bfffb6d4..c37968250f 100644 --- a/core/mac/inc/wni_api.h +++ b/core/mac/inc/wni_api.h @@ -73,7 +73,7 @@ enum eWniMsgTypes { eWNI_SME_GET_STATISTICS_REQ = SIR_SME_MSG_TYPES_BEGIN + 33, eWNI_SME_GET_STATISTICS_RSP = SIR_SME_MSG_TYPES_BEGIN + 34, eWNI_SME_GET_RSSI_REQ = SIR_SME_MSG_TYPES_BEGIN + 35, - eWNI_SME_GET_ASSOC_STAS_REQ = SIR_SME_MSG_TYPES_BEGIN + 36, + /* unused SIR_SME_MSG_TYPES_BEGIN + 36, */ eWNI_SME_WPS_PBC_PROBE_REQ_IND = SIR_SME_MSG_TYPES_BEGIN + 37, eWNI_SME_UPPER_LAYER_ASSOC_CNF = SIR_SME_MSG_TYPES_BEGIN + 38, eWNI_SME_SESSION_UPDATE_PARAM = SIR_SME_MSG_TYPES_BEGIN + 39, diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c index e26e88b02c..332a759cb6 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -1609,7 +1609,6 @@ static void lim_process_messages(struct mac_context *mac_ctx, case eWNI_SME_ASSOC_CNF: case eWNI_SME_ADDTS_REQ: case eWNI_SME_DELTS_REQ: - case eWNI_SME_GET_ASSOC_STAS_REQ: case eWNI_SME_SESSION_UPDATE_PARAM: case eWNI_SME_CHNG_MCC_BEACON_INTERVAL: case eWNI_SME_NEIGHBOR_REPORT_REQ_IND: diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index af13a162bf..4d007646a8 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -2754,109 +2754,6 @@ end: return; } -/** - * lim_process_sme_get_assoc_sta_info() - process sme assoc sta req - * - * @mac_ctx: Pointer to Global MAC structure - * @msg_buf: pointer to the SME message buffer - * - * This function is called to process SME_GET_ASSOC_STAS_REQ message - * from HDD or upper layer application. - * - * Return: None - */ - -static void lim_process_sme_get_assoc_sta_info(struct mac_context *mac_ctx, - uint32_t *msg_buf) -{ - tSirSmeGetAssocSTAsReq get_assoc_stas_req; - tpDphHashNode sta_ds = NULL; - struct pe_session *session_entry = NULL; - tSap_Event sap_event; - tpWLAN_SAPEventCB sap_event_cb = NULL; - tpSap_AssocMacAddr assoc_sta_tmp = NULL; - uint8_t session_id = CSR_SESSION_ID_INVALID; - uint8_t assoc_id = 0; - uint8_t sta_cnt = 0; - - if (msg_buf == NULL) { - pe_err("Buffer is Pointing to NULL"); - return; - } - - qdf_mem_copy(&get_assoc_stas_req, msg_buf, - sizeof(struct sSirSmeGetAssocSTAsReq)); - /* - * Get Associated stations from PE. - * Find PE session Entry - */ - session_entry = pe_find_session_by_bssid(mac_ctx, - get_assoc_stas_req.bssid.bytes, - &session_id); - if (session_entry == NULL) { - pe_err("session does not exist for given bssId"); - goto lim_assoc_sta_end; - } - - if (!LIM_IS_AP_ROLE(session_entry)) { - pe_err("Received unexpected message in state %X, in role %X", - session_entry->limSmeState, - GET_LIM_SYSTEM_ROLE(session_entry)); - goto lim_assoc_sta_end; - } - /* Retrieve values obtained in the request message */ - sap_event_cb = (tpWLAN_SAPEventCB)get_assoc_stas_req.pSapEventCallback; - assoc_sta_tmp = (tpSap_AssocMacAddr)get_assoc_stas_req.pAssocStasArray; - - if (NULL == assoc_sta_tmp) - goto lim_assoc_sta_end; - for (assoc_id = 0; assoc_id < session_entry->dph.dphHashTable.size; - assoc_id++) { - sta_ds = dph_get_hash_entry(mac_ctx, assoc_id, - &session_entry->dph.dphHashTable); - if (NULL == sta_ds) - continue; - if (sta_ds->valid) { - qdf_mem_copy((uint8_t *) &assoc_sta_tmp->staMac, - (uint8_t *) &sta_ds->staAddr, - QDF_MAC_ADDR_SIZE); - assoc_sta_tmp->assocId = (uint8_t) sta_ds->assocId; - assoc_sta_tmp->staId = (uint8_t) sta_ds->staIndex; - - qdf_mem_copy(&assoc_sta_tmp->supportedRates, - &sta_ds->supportedRates, - sizeof(sta_ds->supportedRates)); - assoc_sta_tmp->ShortGI40Mhz = sta_ds->htShortGI40Mhz; - assoc_sta_tmp->ShortGI20Mhz = sta_ds->htShortGI20Mhz; - assoc_sta_tmp->Support40Mhz = - sta_ds->htDsssCckRate40MHzSupport; - - pe_debug("dph Station Number = %d", - sta_cnt + 1); - pe_debug("MAC = " MAC_ADDRESS_STR, - MAC_ADDR_ARRAY(sta_ds->staAddr)); - pe_debug("Association Id: %d Station Index: %d", - sta_ds->assocId, sta_ds->staIndex); - assoc_sta_tmp++; - sta_cnt++; - } - } -lim_assoc_sta_end: - /* - * Call hdd callback with sap event to send the list of - * associated stations from PE - */ - if (sap_event_cb != NULL) { - sap_event.sapHddEventCode = eSAP_ASSOC_STA_CALLBACK_EVENT; - sap_event.sapevt.sapAssocStaListEvent.module = - QDF_MODULE_ID_PE; - sap_event.sapevt.sapAssocStaListEvent.noOfAssocSta = sta_cnt; - sap_event.sapevt.sapAssocStaListEvent.pAssocStas = - (tpSap_AssocMacAddr)get_assoc_stas_req.pAssocStasArray; - sap_event_cb(&sap_event, get_assoc_stas_req.pUsrContext); - } -} - /** * __lim_counter_measures() * @@ -4958,9 +4855,6 @@ bool lim_process_sme_req_messages(struct mac_context *mac, bufConsumed = false; break; #endif /* FEATURE_WLAN_ESE */ - case eWNI_SME_GET_ASSOC_STAS_REQ: - lim_process_sme_get_assoc_sta_info(mac, pMsgBuf); - break; case eWNI_SME_SESSION_UPDATE_PARAM: __lim_process_sme_session_update(mac, pMsgBuf); break; diff --git a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c index d9c4e86784..f47bb453cf 100644 --- a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c +++ b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c @@ -252,7 +252,6 @@ uint8_t *mac_trace_get_sme_msg_string(uint16_t sme_msg) CASE_RETURN_STRING(eWNI_SME_GET_STATISTICS_REQ); CASE_RETURN_STRING(eWNI_SME_GET_STATISTICS_RSP); CASE_RETURN_STRING(eWNI_SME_GET_RSSI_REQ); - CASE_RETURN_STRING(eWNI_SME_GET_ASSOC_STAS_REQ); CASE_RETURN_STRING(eWNI_SME_WPS_PBC_PROBE_REQ_IND); CASE_RETURN_STRING(eWNI_SME_UPPER_LAYER_ASSOC_CNF); CASE_RETURN_STRING(eWNI_SME_SESSION_UPDATE_PARAM);