Переглянути джерело

qcacld-3.0: Remove SapGlobalLock infrastructure

Change "qcacld-3.0: Remove obsolete wlansap_get_wps_state()" removed
the last consumer of the SapGlobalLock infrastructure. Since this
infrastructure is now unused, remove it.

Change-Id: I4646a7796073b259351d8cff48a424ef8741c9cf
CRs-Fixed: 2113552
Jeff Johnson 7 роки тому
батько
коміт
6c8e31255c

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

@@ -9192,12 +9192,6 @@ void hdd_sap_destroy_events(struct hdd_adapter *adapter)
 	}
 
 	qdf_event_destroy(&sap_ctx->sap_session_opened_evt);
-	if (!QDF_IS_STATUS_SUCCESS(
-		qdf_mutex_destroy(&sap_ctx->SapGlobalLock))) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-			  "wlansap_stop failed destroy lock");
-		return;
-	}
 	EXIT();
 }
 

+ 0 - 6
core/sap/src/sap_internal.h

@@ -136,8 +136,6 @@ struct sap_avoid_channels_info {
 
 struct sap_context {
 
-	qdf_mutex_t SapGlobalLock;
-
 	/* Include the current channel of AP */
 	uint32_t channel;
 	uint32_t secondary_ch;
@@ -363,10 +361,6 @@ bool
 sap_search_mac_list(struct qdf_mac_addr *macList, uint8_t num_mac,
 		 uint8_t *peerMac, uint8_t *index);
 
-QDF_STATUS sap_acquire_global_lock(struct sap_context *pSapCtx);
-
-QDF_STATUS sap_release_global_lock(struct sap_context *pSapCtx);
-
 #ifdef FEATURE_WLAN_CH_AVOID
 void sap_update_unsafe_channel_list(tHalHandle hal,
 				    struct sap_context *pSapCtx);

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

@@ -357,12 +357,6 @@ QDF_STATUS wlansap_start(void *pCtx, enum tQDF_ADAPTER_MODE mode,
 	/* Now configure the auth type in the roaming profile. To open. */
 	pSapCtx->csr_roamProfile.negotiatedAuthType = eCSR_AUTH_TYPE_OPEN_SYSTEM;        /* open is the default */
 
-	if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_create(&pSapCtx->SapGlobalLock))) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-			  "wlansap_start failed init lock");
-		return QDF_STATUS_E_FAULT;
-	}
-
 	hal = (tHalHandle) CDS_GET_HAL_CB();
 	if (!hal) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
@@ -443,12 +437,6 @@ QDF_STATUS wlansap_stop(void *pCtx)
 	ucfg_scan_unregister_requester(pmac->psoc, pSapCtx->req_id);
 	sap_free_roam_profile(&pSapCtx->csr_roamProfile);
 
-	if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_destroy(&pSapCtx->SapGlobalLock))) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-			  "wlansap_stop failed destroy lock");
-		return QDF_STATUS_E_FAULT;
-	}
-
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -1818,28 +1806,6 @@ wlan_sap_getstation_ie_information
 	return qdf_status;
 }
 
-QDF_STATUS sap_acquire_global_lock(struct sap_context *pSapCtx)
-{
-	QDF_STATUS qdf_status = QDF_STATUS_E_FAULT;
-
-	if (QDF_IS_STATUS_SUCCESS(qdf_mutex_acquire(&pSapCtx->SapGlobalLock))) {
-		qdf_status = QDF_STATUS_SUCCESS;
-	}
-
-	return qdf_status;
-}
-
-QDF_STATUS sap_release_global_lock(struct sap_context *pSapCtx)
-{
-	QDF_STATUS qdf_status = QDF_STATUS_E_FAULT;
-
-	if (QDF_IS_STATUS_SUCCESS(qdf_mutex_release(&pSapCtx->SapGlobalLock))) {
-		qdf_status = QDF_STATUS_SUCCESS;
-	}
-
-	return qdf_status;
-}
-
 /**
  * wlansap_set_wparsn_ies() - set WPA  RSN IEs
  * @pCtx: Pointer to the global cds context; a handle to SAP's control block