Browse Source

qcacmn: Invoke PDEV/VDEV MLME Deinit APIs in previous order

Ib62a46688400d5d9c2ff45c17dc41d5f0b7f58d0 modified the pdev/vdev
mlme obj destroy API call flow to right order. This causes issue
in smart monitor vap bringup with SON config.

To enable smart monitor VAP bringup, Invoke PDEV/VDEV MLME Deinit
APIs in previous order temporarily until the root cause for
non working of right order is found.

Change-Id: I021778b14601d0e8a918721dccada020710b1278
Sridhar Selvaraj 4 years ago
parent
commit
2395159d7f

+ 1 - 1
umac/mlme/mlme_objmgr/dispatcher/src/wlan_pdev_mlme_main.c

@@ -83,9 +83,9 @@ static QDF_STATUS mlme_pdev_obj_destroy_handler(struct wlan_objmgr_pdev *pdev,
 		return QDF_STATUS_SUCCESS;
 	}
 
+	mlme_pdev_ops_ext_hdl_destroy(pdev_mlme);
 	wlan_objmgr_pdev_component_obj_detach(pdev, WLAN_UMAC_COMP_MLME,
 					      (void *)pdev_mlme);
-	mlme_pdev_ops_ext_hdl_destroy(pdev_mlme);
 
 	wlan_minidump_remove(pdev_mlme, sizeof(*pdev_mlme),
 			     wlan_pdev_get_psoc(pdev),

+ 3 - 6
umac/mlme/mlme_objmgr/dispatcher/src/wlan_vdev_mlme_main.c

@@ -160,14 +160,11 @@ static QDF_STATUS mlme_vdev_obj_destroy_handler(struct wlan_objmgr_vdev *vdev,
 		return QDF_STATUS_SUCCESS;
 	}
 
-	wlan_objmgr_vdev_component_obj_detach(vdev, WLAN_UMAC_COMP_MLME,
-					      vdev_mlme);
-
-	mlme_vdev_ops_ext_hdl_destroy(vdev_mlme);
-
 	wlan_cm_deinit(vdev_mlme);
-
 	mlme_vdev_sm_destroy(vdev_mlme);
+	mlme_vdev_ops_ext_hdl_destroy(vdev_mlme);
+	wlan_objmgr_vdev_component_obj_detach(vdev, WLAN_UMAC_COMP_MLME,
+					      vdev_mlme);
 
 	wlan_minidump_remove(vdev_mlme, sizeof(*vdev_mlme),
 			     wlan_vdev_get_psoc(vdev),