Browse Source

qcacld-3.0: Remove eSAP_ASSOC_STA_CALLBACK_EVENT handling

Change Iea602a1da42d5eecafae1d00f2260f4930128f40 ("qcacld-3.0: Remove
eWNI_SME_GET_ASSOC_STAS_REQ handling") removed the logic that sent the
eSAP_ASSOC_STA_CALLBACK_EVENT event. Since this event is obsolete,
remove the handling code from SAP and HDD.

Change-Id: I49e169a1832845bac4e89cd832d72dec42d4ee09
CRs-Fixed: 2396058
Jeff Johnson 6 years ago
parent
commit
6ed8018b5c
3 changed files with 0 additions and 52 deletions
  1. 0 21
      core/hdd/src/wlan_hdd_hostapd.c
  2. 0 27
      core/sap/inc/sap_api.h
  3. 0 4
      core/sap/src/sap_fsm.c

+ 0 - 21
core/hdd/src/wlan_hdd_hostapd.c

@@ -1633,7 +1633,6 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 	uint8_t staId;
 	QDF_STATUS qdf_status;
 	bool bAuthRequired = true;
-	tpSap_AssocMacAddr pAssocStasArray = NULL;
 	char unknownSTAEvent[IW_CUSTOM_MAX + 1];
 	char maxAssocExceededEvent[IW_CUSTOM_MAX + 1];
 	uint8_t we_custom_start_event[64];
@@ -2365,26 +2364,6 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 		hdd_debug("WPS PBC probe req");
 		return QDF_STATUS_SUCCESS;
 
-	case eSAP_ASSOC_STA_CALLBACK_EVENT:
-		pAssocStasArray =
-			pSapEvent->sapevt.sapAssocStaListEvent.pAssocStas;
-		if (pSapEvent->sapevt.sapAssocStaListEvent.noOfAssocSta != 0) {
-			for (i = 0;
-			     i <
-			     pSapEvent->sapevt.sapAssocStaListEvent.
-			     noOfAssocSta; i++) {
-				hdd_info("Associated Sta Num %d:assocId=%d, staId=%d, staMac="
-					 MAC_ADDRESS_STR, i + 1,
-					 pAssocStasArray->assocId,
-					 pAssocStasArray->staId,
-					 MAC_ADDR_ARRAY(pAssocStasArray->staMac.
-							bytes));
-				pAssocStasArray++;
-			}
-		}
-		qdf_mem_free(pSapEvent->sapevt.sapAssocStaListEvent.pAssocStas);
-		pSapEvent->sapevt.sapAssocStaListEvent.pAssocStas = NULL;
-		return QDF_STATUS_SUCCESS;
 	case eSAP_UNKNOWN_STA_JOIN:
 		snprintf(unknownSTAEvent, IW_CUSTOM_MAX,
 			 "JOIN_UNKNOWN_STA-%02x:%02x:%02x:%02x:%02x:%02x",

+ 0 - 27
core/sap/inc/sap_api.h

@@ -140,8 +140,6 @@ typedef enum {
 	eSAP_STA_SET_KEY_EVENT,
 	/* Event sent whenever there is MIC failure detected */
 	eSAP_STA_MIC_FAILURE_EVENT,
-	/* Event sent when user called wlansap_get_assoc_stations */
-	eSAP_ASSOC_STA_CALLBACK_EVENT,
 	/* Event send on WPS PBC probe request is received */
 	eSAP_WPS_PBC_PROBE_REQ_EVENT,
 	eSAP_DISCONNECT_ALL_P2P_CLIENT,
@@ -314,29 +312,6 @@ typedef struct sap_StationMICFailureEvent_s {
 
 } tSap_StationMICFailureEvent;
 
-/*Structure to return MAC address of associated stations */
-typedef struct sap_AssocMacAddr_s {
-	struct qdf_mac_addr staMac; /* Associated station's MAC address */
-	uint8_t assocId;            /* Associated station's Association ID */
-	uint8_t staId;              /* Allocated station Id */
-	uint8_t ShortGI40Mhz;
-	uint8_t ShortGI20Mhz;
-	uint8_t Support40Mhz;
-	struct supported_rates supportedRates;
-} tSap_AssocMacAddr, *tpSap_AssocMacAddr;
-
-/*struct corresponding to SAP_ASSOC_STA_CALLBACK_EVENT */
-typedef struct sap_AssocStaListEvent_s {
-	QDF_MODULE_ID module;
-	/* module id that was passed in wlansap_get_assoc_stations API */
-	uint8_t noOfAssocSta;           /* Number of associated stations */
-	tpSap_AssocMacAddr pAssocStas;
-	/*
-	 * Pointer to pre allocated memory to obtain list of
-	 * associated stations passed in wlansap_get_assoc_stations API
-	 */
-} tSap_AssocStaListEvent;
-
 typedef struct sap_WPSPBCProbeReqEvent_s {
 	uint8_t status;
 	/* module id that was passed in wlansap_get_assoc_stations API */
@@ -417,8 +392,6 @@ typedef struct sap_Event_s {
 		tSap_StationSetKeyCompleteEvent sapStationSetKeyCompleteEvent;
 		/*SAP_STA_MIC_FAILURE_EVENT */
 		tSap_StationMICFailureEvent sapStationMICFailureEvent;
-		/*SAP_ASSOC_STA_CALLBACK_EVENT */
-		tSap_AssocStaListEvent sapAssocStaListEvent;
 		/*eSAP_WPS_PBC_PROBE_REQ_EVENT */
 		tSap_WPSPBCProbeReqEvent sapPBCProbeReqEvent;
 		tSap_SendActionCnf sapActionCnf;

+ 0 - 4
core/sap/src/sap_fsm.c

@@ -143,7 +143,6 @@ static uint8_t *sap_hdd_event_to_string(eSapHddEvent event)
 	CASE_RETURN_STRING(eSAP_STA_DISASSOC_EVENT);
 	CASE_RETURN_STRING(eSAP_STA_SET_KEY_EVENT);
 	CASE_RETURN_STRING(eSAP_STA_MIC_FAILURE_EVENT);
-	CASE_RETURN_STRING(eSAP_ASSOC_STA_CALLBACK_EVENT);
 	CASE_RETURN_STRING(eSAP_WPS_PBC_PROBE_REQ_EVENT);
 	CASE_RETURN_STRING(eSAP_DISCONNECT_ALL_P2P_CLIENT);
 	CASE_RETURN_STRING(eSAP_MAC_TRIG_STOP_BSS_EVENT);
@@ -1636,9 +1635,6 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx,
 			     SIR_CIPHER_SEQ_CTR_SIZE);
 		break;
 
-	case eSAP_ASSOC_STA_CALLBACK_EVENT:
-		break;
-
 	case eSAP_WPS_PBC_PROBE_REQ_EVENT:
 
 		if (!csr_roaminfo) {