qcacld-3.0: Rename session_id with vdev_id to avoid confusion

Rename session_id with vdev_id in
policy_mgr_check_for_session_conc() to avoid confusion.

Change-Id: I9449395043f3f8d4e632f38770405febb1e227ab
CRs-Fixed: 3439906

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h

@@ -667,7 +667,7 @@ bool policy_mgr_is_pcl_weightage_required(struct wlan_objmgr_psoc *psoc);
  * policy_mgr_check_for_session_conc() - Check if concurrency is
  * allowed for a session
  * @psoc: PSOC object information
- * @session_id: Session ID
+ * @vdev_id: Vdev ID
  * @ch_freq: Channel frequency
  *
  * Checks if connection is allowed for a given session_id
@@ -675,12 +675,12 @@ bool policy_mgr_is_pcl_weightage_required(struct wlan_objmgr_psoc *psoc);
  * True if the concurrency is allowed, false otherwise
  */
 bool policy_mgr_check_for_session_conc(struct wlan_objmgr_psoc *psoc,
-				       uint8_t session_id, uint32_t ch_freq);
+				       uint8_t vdev_id, uint32_t ch_freq);
 
 /**
  * policy_mgr_handle_conc_multiport() - to handle multiport concurrency
  * @psoc: PSOC object information
- * @session_id: Session ID
+ * @vdev_id: Vdev ID
  * @ch_freq: Channel frequency
  * @reason: reason for connection update
  * @request_id: Request id provided by the requester, can be used while
@@ -693,7 +693,7 @@ bool policy_mgr_check_for_session_conc(struct wlan_objmgr_psoc *psoc,
  */
 QDF_STATUS
 policy_mgr_handle_conc_multiport(struct wlan_objmgr_psoc *psoc,
-				 uint8_t session_id, uint32_t ch_freq,
+				 uint8_t vdev_id, uint32_t ch_freq,
 				 enum policy_mgr_conn_update_reason reason,
 				 uint32_t request_id);
 

components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c

@@ -1444,7 +1444,7 @@ QDF_STATUS policy_mgr_next_actions(
 
 QDF_STATUS
 policy_mgr_handle_conc_multiport(struct wlan_objmgr_psoc *psoc,
-				 uint8_t session_id, uint32_t ch_freq,
+				 uint8_t vdev_id, uint32_t ch_freq,
 				 enum policy_mgr_conn_update_reason reason,
 				 uint32_t request_id)
 {
@@ -1452,12 +1452,11 @@ policy_mgr_handle_conc_multiport(struct wlan_objmgr_psoc *psoc,
 	uint8_t num_cxn_del = 0;
 	struct policy_mgr_conc_connection_info info = {0};
 
-	policy_mgr_store_and_del_conn_info_by_vdev_id(psoc, session_id,
+	policy_mgr_store_and_del_conn_info_by_vdev_id(psoc, vdev_id,
 						      &info, &num_cxn_del);
 
-	if (!policy_mgr_check_for_session_conc(psoc, session_id, ch_freq)) {
-		policy_mgr_err("Conc not allowed for the session %d",
-			session_id);
+	if (!policy_mgr_check_for_session_conc(psoc, vdev_id, ch_freq)) {
+		policy_mgr_err("Conc not allowed for the vdev %d", vdev_id);
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -1465,7 +1464,7 @@ policy_mgr_handle_conc_multiport(struct wlan_objmgr_psoc *psoc,
 	if (!QDF_IS_STATUS_SUCCESS(status))
 		policy_mgr_err("clearing event failed");
 
-	status = policy_mgr_current_connections_update(psoc, session_id,
+	status = policy_mgr_current_connections_update(psoc, vdev_id,
 						       ch_freq, reason,
 						       request_id);
 	if (QDF_STATUS_E_FAILURE == status)

components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c

@@ -7634,7 +7634,7 @@ bool policy_mgr_is_mcc_in_24G(struct wlan_objmgr_psoc *psoc)
 }
 
 bool policy_mgr_check_for_session_conc(struct wlan_objmgr_psoc *psoc,
-				       uint8_t session_id, uint32_t ch_freq)
+				       uint8_t vdev_id, uint32_t ch_freq)
 {
 	enum policy_mgr_con_mode mode;
 	bool ret;
@@ -7650,7 +7650,7 @@ bool policy_mgr_check_for_session_conc(struct wlan_objmgr_psoc *psoc,
 
 	if (pm_ctx->hdd_cbacks.get_mode_for_non_connected_vdev) {
 		mode = pm_ctx->hdd_cbacks.get_mode_for_non_connected_vdev(
-			psoc, session_id);
+			psoc, vdev_id);
 		if (PM_MAX_NUM_OF_MODE == mode) {
 			policy_mgr_err("Invalid mode");
 			return false;
@@ -7663,13 +7663,13 @@ bool policy_mgr_check_for_session_conc(struct wlan_objmgr_psoc *psoc,
 		return false;
 	}
 
-	vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc, session_id,
+	vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc, vdev_id,
 						    WLAN_POLICY_MGR_ID);
 
 	/* Take care of 160MHz and 80+80Mhz later */
 	conc_ext_flags = policy_mgr_get_conc_ext_flags(vdev, false);
 	ret = policy_mgr_allow_concurrency(psoc, mode, ch_freq, HW_MODE_20_MHZ,
-					   conc_ext_flags, session_id);
+					   conc_ext_flags, vdev_id);
 	if (vdev)
 		wlan_objmgr_vdev_release_ref(vdev, WLAN_POLICY_MGR_ID);