Jelajahi Sumber

qcacld-3.0: Remove obsolete wlansap_get_wps_state()

Currently in hdd_hostapd_sap_event_cb() when processing the
eSAP_STA_ASSOC_EVENT and eSAP_STA_REASSOC_EVENT events a call is made
to wlansap_get_wps_state(). This is a legacy call inherited from a
version of the driver that supported in-driver WPS. But now that WPS
is handled by hostapd this functionality is obsolete and should be
removed.

Change-Id: Ia52d9554ed4b3a44726a4cac268eae77856cbd18
CRs-Fixed: 2113551
Jeff Johnson 7 tahun lalu
induk
melakukan
8b8d03d533
3 mengubah file dengan 1 tambahan dan 57 penghapusan
  1. 1 6
      core/hdd/src/wlan_hdd_hostapd.c
  2. 0 1
      core/sap/inc/sap_api.h
  3. 0 50
      core/sap/src/sap_module.c

+ 1 - 6
core/hdd/src/wlan_hdd_hostapd.c

@@ -1343,7 +1343,6 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 	int i = 0;
 	uint8_t staId;
 	QDF_STATUS qdf_status;
-	bool bWPSState;
 	bool bAuthRequired = true;
 	tpSap_AssocMacAddr pAssocStasArray = NULL;
 	char unknownSTAEvent[IW_CUSTOM_MAX + 1];
@@ -1827,10 +1826,6 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 		       MAC_ADDR_ARRAY(wrqu.addr.sa_data));
 		we_event = IWEVREGISTERED;
 
-		wlansap_get_wps_state(
-			WLAN_HDD_GET_SAP_CTX_PTR(pHostapdAdapter),
-			&bWPSState);
-
 		if ((eCSR_ENCRYPT_TYPE_NONE == pHddApCtx->ucEncryptType) ||
 		    (eCSR_ENCRYPT_TYPE_WEP40_STATICKEY ==
 		     pHddApCtx->ucEncryptType)
@@ -1839,7 +1834,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 			bAuthRequired = false;
 		}
 
-		if (bAuthRequired || bWPSState == true) {
+		if (bAuthRequired) {
 			qdf_status = hdd_softap_register_sta(
 						pHostapdAdapter,
 						true,

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

@@ -788,7 +788,6 @@ void sap_cleanup_channel_list(void *sapContext);
  */
 bool sap_is_auto_channel_select(void *pvos_gctx);
 
-QDF_STATUS wlansap_get_wps_state(void *p_cds_gctx, bool *pbWPSState);
 void *wlansap_open(void);
 QDF_STATUS wlansap_global_init(void);
 QDF_STATUS wlansap_global_deinit(void);

+ 0 - 50
core/sap/src/sap_module.c

@@ -1818,56 +1818,6 @@ wlan_sap_getstation_ie_information
 	return qdf_status;
 }
 
-/**
- * wlansap_get_wps_state() - get WPS session state
- * @pCtx: Pointer to the global cds context; a handle to SAP's control block
- *        can be extracted from its context. When MBSSID feature is enabled,
- *        SAP context is directly passed to SAP APIs.
- * @pbWPSState: Pointer to variable to indicate if device is in
- *              WPS Registration state
- *
- * This api function provides for Ap App/HDD to check if WPS session in process.
- *
- * Return: The QDF_STATUS code associated with performing the operation
- *         QDF_STATUS_SUCCESS:  Success
- */
-QDF_STATUS wlansap_get_wps_state(void *pCtx, bool *bWPSState)
-{
-	struct sap_context *pSapCtx = NULL;
-	void *hHal = NULL;
-
-	pSapCtx = CDS_GET_SAP_CB(pCtx);
-	if (NULL == pSapCtx) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-			  "%s: Invalid SAP pointer from pCtx",
-			  __func__);
-		return QDF_STATUS_E_FAULT;
-	}
-
-	hHal = CDS_GET_HAL_CB();
-	if (NULL == hHal) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-			  "%s: Invalid HAL pointer from p_cds_gctx",
-			  __func__);
-		return QDF_STATUS_E_FAULT;
-	}
-
-	if (sap_acquire_global_lock(pSapCtx) == QDF_STATUS_SUCCESS) {
-		if (pSapCtx->APWPSIEs.SirWPSProbeRspIE.
-		    FieldPresent &
-		    SIR_WPS_PROBRSP_SELECTEDREGISTRA_PRESENT)
-			*bWPSState = true;
-		else
-			*bWPSState = false;
-
-		sap_release_global_lock(pSapCtx);
-
-		return QDF_STATUS_SUCCESS;
-	} else
-		return QDF_STATUS_E_FAULT;
-
-}
-
 QDF_STATUS sap_acquire_global_lock(struct sap_context *pSapCtx)
 {
 	QDF_STATUS qdf_status = QDF_STATUS_E_FAULT;