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

qcacmn: Revert "Fix issue that DFS NOL can't be cleared"

Replaced with "qcacmn: Do not access reg private if destroyed".

Change-Id: I636bcae59166ccd4719056c777682435a0a057bf
CRs-Fixed: 3158675
Jianmin Zhu 3 роки тому
батько
коміт
e0ace228c5

+ 0 - 8
init_deinit/dispatcher/src/dispatcher_init_deinit.c

@@ -492,12 +492,6 @@ static QDF_STATUS dispatcher_regulatory_pdev_close(struct wlan_objmgr_pdev
 	return regulatory_pdev_close(pdev);
 }
 
-static QDF_STATUS dispatcher_dfs_pdev_close(struct wlan_objmgr_pdev
-						  *pdev)
-{
-	return dfs_pdev_close(pdev);
-}
-
 #ifdef WLAN_SA_API_ENABLE
 static QDF_STATUS dispatcher_init_sa_api(void)
 {
@@ -1569,8 +1563,6 @@ QDF_STATUS dispatcher_pdev_close(struct wlan_objmgr_pdev *pdev)
 
 	QDF_BUG(QDF_STATUS_SUCCESS == dispatcher_regulatory_pdev_close(pdev));
 
-	QDF_BUG(QDF_STATUS_SUCCESS == dispatcher_dfs_pdev_close(pdev));
-
 	return QDF_STATUS_SUCCESS;
 }
 qdf_export_symbol(dispatcher_pdev_close);

+ 0 - 8
umac/dfs/dispatcher/inc/wlan_dfs_init_deinit_api.h

@@ -49,14 +49,6 @@ QDF_STATUS dfs_init(void);
  */
 QDF_STATUS dfs_deinit(void);
 
-/**
- * dfs_pdev_close() - Close dfs component
- * @pdev: Pointer to pdev structure.
- *
- * Return: Success or Failure
- */
-QDF_STATUS dfs_pdev_close(struct wlan_objmgr_pdev *pdev);
-
 /**
  * wlan_dfs_pdev_obj_create_notification() - DFS pdev object create handler.
  * @pdev: Pointer to DFS pdev object.

+ 1 - 16
umac/dfs/dispatcher/src/wlan_dfs_init_deinit_api.c

@@ -406,22 +406,6 @@ QDF_STATUS dfs_deinit(void)
 	return QDF_STATUS_SUCCESS;
 }
 
-QDF_STATUS dfs_pdev_close(struct wlan_objmgr_pdev *pdev)
-{
-	struct wlan_dfs *dfs = NULL;
-
-	if (!pdev) {
-		dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS,  "PDEV is NULL");
-		return QDF_STATUS_E_FAILURE;
-	}
-
-	dfs = wlan_pdev_get_dfs_obj(pdev);
-	if (dfs)
-		dfs_detach(dfs);
-
-	return QDF_STATUS_SUCCESS;
-}
-
 QDF_STATUS wlan_dfs_pdev_obj_create_notification(struct wlan_objmgr_pdev *pdev,
 		void *arg)
 {
@@ -544,6 +528,7 @@ QDF_STATUS wlan_dfs_pdev_obj_destroy_notification(struct wlan_objmgr_pdev *pdev,
 
 	/* DFS is NULL during unload. should we call this function before */
 	if (dfs) {
+		dfs_detach(dfs);
 		global_dfs_to_mlme.pdev_component_obj_detach(pdev,
 				WLAN_UMAC_COMP_DFS,
 				(void *)dfs);