qcacmn: Use enum type policy_mgr_con_mode instead of enum QDF_OPMODE

Use enum type policy_mgr_con_mode instead of enum QDF_OPMODE.

Change-Id: Ia7a6bb5e05c6dac650dc6386734462547365a4eb
CRs-Fixed: 2214003

os_if/linux/scan/src/wlan_cfg80211_scan.c

@@ -253,10 +253,10 @@ static void wlan_cfg80211_pno_callback(struct wlan_objmgr_vdev *vdev,
 static bool wlan_cfg80211_is_ap_go_present(struct wlan_objmgr_psoc *psoc)
 {
 	return policy_mgr_mode_specific_connection_count(psoc,
-							  QDF_SAP_MODE,
+							  PM_SAP_MODE,
 							  NULL) ||
 		policy_mgr_mode_specific_connection_count(psoc,
-							  QDF_P2P_GO_MODE,
+							  PM_P2P_GO_MODE,
 							  NULL);
 }
 
@@ -1325,9 +1325,9 @@ int wlan_cfg80211_scan(struct wlan_objmgr_pdev *pdev,
 #ifdef WLAN_POLICY_MGR_ENABLE
 		bool ap_or_go_present =
 			policy_mgr_mode_specific_connection_count(
-			     psoc, QDF_SAP_MODE, NULL) ||
+			     psoc, PM_SAP_MODE, NULL) ||
 			     policy_mgr_mode_specific_connection_count(
-			     psoc, QDF_P2P_GO_MODE, NULL);
+			     psoc, PM_P2P_GO_MODE, NULL);
 #endif
 
 		for (i = 0; i < request->n_channels; i++) {

umac/cmn_services/policy_mgr/inc/wlan_policy_mgr_public_struct.h

@@ -219,6 +219,7 @@ enum policy_mgr_conc_priority_mode {
  * @PM_P2P_CLIENT_MODE: P2P client mode
  * @PM_P2P_GO_MODE: P2P Go mode
  * @PM_IBSS_MODE: IBSS mode
+ * @PM_NDI_MODE: NDI mode
  * @PM_MAX_NUM_OF_MODE: max value place holder
  */
 enum policy_mgr_con_mode {
@@ -227,6 +228,7 @@ enum policy_mgr_con_mode {
 	PM_P2P_CLIENT_MODE,
 	PM_P2P_GO_MODE,
 	PM_IBSS_MODE,
+	PM_NDI_MODE,
 	PM_MAX_NUM_OF_MODE
 };
 

umac/scan/dispatcher/src/wlan_scan_ucfg_api.c

@@ -278,11 +278,11 @@ static void ucfg_scan_update_pno_dwell_time(struct wlan_objmgr_vdev *vdev,
 		return;
 
 	sap_or_p2p_present = policy_mgr_mode_specific_connection_count(
-				psoc, QDF_SAP_MODE, NULL) ||
+				psoc, PM_SAP_MODE, NULL) ||
 				policy_mgr_mode_specific_connection_count(
-				psoc, QDF_P2P_GO_MODE, NULL) ||
+				psoc, PM_P2P_GO_MODE, NULL) ||
 				policy_mgr_mode_specific_connection_count(
-				psoc, QDF_P2P_CLIENT_MODE, NULL);
+				psoc, PM_P2P_CLIENT_MODE, NULL);
 
 	if (sap_or_p2p_present) {
 		req->active_dwell_time = scan_def->conc_active_dwell;
@@ -593,15 +593,15 @@ static void ucfg_scan_req_update_concurrency_params(
 		return;
 
 	ap_present = policy_mgr_mode_specific_connection_count(
-				psoc, QDF_SAP_MODE, NULL);
+				psoc, PM_SAP_MODE, NULL);
 	go_present = policy_mgr_mode_specific_connection_count(
-				psoc, QDF_P2P_GO_MODE, NULL);
+				psoc, PM_P2P_GO_MODE, NULL);
 	p2p_cli_present = policy_mgr_mode_specific_connection_count(
-				psoc, QDF_P2P_CLIENT_MODE, NULL);
+				psoc, PM_P2P_CLIENT_MODE, NULL);
 	sta_active = policy_mgr_mode_specific_connection_count(
-				psoc, QDF_STA_MODE, NULL);
+				psoc, PM_STA_MODE, NULL);
 	ndi_present = policy_mgr_mode_specific_connection_count(
-				psoc, QDF_NDI_MODE, NULL);
+				psoc, PM_NDI_MODE, NULL);
 
 	if (policy_mgr_get_connection_count(psoc)) {
 		if (req->scan_req.scan_f_passive)
@@ -700,7 +700,7 @@ static void ucfg_scan_req_update_concurrency_params(
 		uint8_t ap_chan;
 		struct wlan_objmgr_pdev *pdev = wlan_vdev_get_pdev(vdev);
 
-		ap_chan = policy_mgr_get_channel(psoc, QDF_SAP_MODE, NULL);
+		ap_chan = policy_mgr_get_channel(psoc, PM_SAP_MODE, NULL);
 		/*
 		 * P2P/STA scan while SoftAP is sending beacons.
 		 * Max duration of CTS2self is 32 ms, which limits the
@@ -1718,7 +1718,7 @@ ucfg_scan_get_vdev_status(struct wlan_objmgr_vdev *vdev)
 
 	if (!vdev) {
 		scm_err("null vdev");
-		return QDF_STATUS_E_NULL_VALUE;
+		return SCAN_NOT_IN_PROGRESS;
 	}
 	status = wlan_serialization_vdev_scan_status(vdev);