qcacmn: Rename sme_session_id in struct add_ts_param (1/2)

The sme_session_id field in struct add_ts_param is poorly named since
that is legacy MCL nomenclature, so there is a desire to rename it to
vdev_id to align with the converged nomenclature. As the first phase
of renaming introduce a union so that both the old and new name can be
used by legacy projects, but otherwise only use the new name within
the qcacmn project.

Change-Id: I93743c3b1e3180589a3af83ed9e51d8dc95324d9
CRs-Fixed: 2384156
This commit is contained in:
Jeff Johnson 2019-01-20 14:22:42 -08:00 • committed by nshrivas
commit 7929ba9084
3 changed files with 8 additions and 5 deletions

View file

@ -2334,7 +2334,7 @@ struct mac_tspec_ie {
* @sessionId: session id
* @tsm_interval: TSM interval period passed from UMAC to WMI
* @setRICparams: RIC parameters
* @sme_session_id: sme session id
* @vdev_id: vdev id
*/
struct add_ts_param {
uint16_t staIdx;
@ -2348,7 +2348,10 @@ struct add_ts_param {
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
uint8_t setRICparams;
#endif /* WLAN_FEATURE_ROAM_OFFLOAD */
union {
uint8_t sme_session_id;
uint8_t vdev_id;
};
};
/**

View file

@ -712,9 +712,9 @@ static QDF_STATUS send_set_ric_req_cmd_tlv(wmi_unified_t wmi_handle,
WMITLV_TAG_STRUC_wmi_ric_request_fixed_param,
WMITLV_GET_STRUCT_TLVLEN(wmi_ric_request_fixed_param));
if (is_add_ts)
cmd->vdev_id = ((struct add_ts_param *) msg)->sme_session_id;
cmd->vdev_id = ((struct add_ts_param *)msg)->vdev_id;
else
cmd->vdev_id = ((struct del_ts_params *) msg)->sessionId;
cmd->vdev_id = ((struct del_ts_params *)msg)->sessionId;
cmd->num_ric_request = 1;
cmd->is_add_ric = is_add_ts;

View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2018 The Linux Foundation. All rights reserved.
* Copyright (c) 2013-2019 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@ -1685,7 +1685,7 @@ static QDF_STATUS send_add_ts_cmd_tlv(wmi_unified_t wmi_handle,
WMITLV_TAG_STRUC_wmi_vdev_wmm_addts_cmd_fixed_param,
WMITLV_GET_STRUCT_TLVLEN
(wmi_vdev_wmm_addts_cmd_fixed_param));
cmd->vdev_id = msg->sme_session_id;
cmd->vdev_id = msg->vdev_id;
cmd->ac = msg->tspec.tsinfo.traffic.userPrio;
cmd->medium_time_us = msg->tspec.mediumTime * 32;
cmd->downgrade_type = WMM_AC_DOWNGRADE_DROP;