Browse Source

qcacmn: Replace session_id in plm_req_params

In struct plm_req_params the legacy identifier session_id is currently
used to identify the vdev of interest. To align with the converged
nomenclature rename this to vdev_id.

This is co-dependent with I3c5192d31caa05c8fe7157382680318b6671257f
("qcacld-3.0: Use vdev_id in plm_req_params").

Change-Id: I1554febcfb641059a82349aad904c54b62250111
CRs-Fixed: 2405067
Jeff Johnson 6 years ago
parent
commit
b696669760
2 changed files with 4 additions and 4 deletions
  1. 2 2
      wmi/inc/wmi_unified_roam_param.h
  2. 2 2
      wmi/src/wmi_unified_roam_tlv.c

+ 2 - 2
wmi/inc/wmi_unified_roam_param.h

@@ -232,7 +232,7 @@ struct roam_scan_filter_params {
  * @mac_addr: MC dest addr
  * @plm_num_ch: channel numbers
  * @plm_ch_list: channel list
- * @session_id: session id
+ * @vdev_id: vdev id
  * @enable:  enable/disable
  */
 struct plm_req_params {
@@ -249,7 +249,7 @@ struct plm_req_params {
 	uint8_t plm_num_ch;
 	/* channel numbers */
 	uint8_t plm_ch_list[WMI_CFG_VALID_CHANNEL_LIST_LEN];
-	uint8_t session_id;
+	uint8_t vdev_id;
 	bool enable;
 };
 

+ 2 - 2
wmi/src/wmi_unified_roam_tlv.c

@@ -564,7 +564,7 @@ static QDF_STATUS send_plm_stop_cmd_tlv(wmi_unified_t wmi_handle,
 		       WMITLV_GET_STRUCT_TLVLEN
 				(wmi_vdev_plmreq_stop_cmd_fixed_param));
 
-	cmd->vdev_id = plm->session_id;
+	cmd->vdev_id = plm->vdev_id;
 
 	cmd->meas_token = plm->meas_token;
 	WMI_LOGD("vdev %d meas token %d", cmd->vdev_id, cmd->meas_token);
@@ -619,7 +619,7 @@ static QDF_STATUS send_plm_start_cmd_tlv(wmi_unified_t wmi_handle,
 		       WMITLV_GET_STRUCT_TLVLEN
 			       (wmi_vdev_plmreq_start_cmd_fixed_param));
 
-	cmd->vdev_id = plm->session_id;
+	cmd->vdev_id = plm->vdev_id;
 
 	cmd->meas_token = plm->meas_token;
 	cmd->dialog_token = plm->diag_token;