Bläddra i källkod

qcacld-3.0: Refine API wlansap_cleanup_cac_timer()

See change "qcacld-3.0: Refine API wlansap_open()" for the API history.
Update wlansap_cleanup_cac_timer() to use the true struct pointer type.
And since this removes that last usage of CDS_GET_SAP_CB(), remove the
now obsolete macro.

Change-Id: I35338df7dc8cf74cb491d5c901200d685b40a55e
CRs-Fixed: 2116267
Jeff Johnson 7 år sedan
förälder
incheckning
14ec0689da
3 ändrade filer med 3 tillägg och 7 borttagningar
  1. 1 1
      core/sap/inc/sap_api.h
  2. 0 3
      core/sap/src/sap_internal.h
  3. 2 3
      core/sap/src/sap_module.c

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

@@ -1392,7 +1392,7 @@ void sap_dfs_set_current_channel(void *sap_ctx);
  *
  * Return: None
  */
-void wlansap_cleanup_cac_timer(void *sap_ctx);
+void wlansap_cleanup_cac_timer(struct sap_context *sap_ctx);
 
 #ifdef __cplusplus
 }

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

@@ -61,9 +61,6 @@ extern "C" {
 /* Used to enable or disable security on the BT-AMP link */
 #define WLANSAP_SECURITY_ENABLED_STATE true
 
-/* When MBSSID feature is enabled, SAP context is directly passed to SAP APIs */
-#define CDS_GET_SAP_CB(ctx) (ctx)
-
 #define CDS_GET_HAL_CB() cds_get_context(QDF_MODULE_ID_PE)
 /* MAC Address length */
 #define ANI_EAPOL_KEY_RSN_NONCE_SIZE      32

+ 2 - 3
core/sap/src/sap_module.c

@@ -2856,13 +2856,12 @@ QDF_STATUS wlansap_set_invalid_session(struct sap_context *sap_ctx)
 	return QDF_STATUS_SUCCESS;
 }
 
-void wlansap_cleanup_cac_timer(void *sap_ctx)
+void wlansap_cleanup_cac_timer(struct sap_context *sap_ctx)
 {
 	tHalHandle hal;
 	tpAniSirGlobal pmac;
-	struct sap_context *psap_ctx = CDS_GET_SAP_CB(sap_ctx);
 
-	if (!psap_ctx) {
+	if (!sap_ctx) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			FL("Invalid SAP context"));
 		return;