From a171ad234e0294d1de920fff6d78f603f5b356c2 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 22 Feb 2019 21:26:31 -0800 Subject: [PATCH] qcacmn: Replace session_id in roam_offload_scan_rssi_params In struct roam_offload_scan_rssi_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 Ifb2282b8977ad1fb999e8460c0d276343793a0c6 ("qcacld-3.0: Use vdev_id in roam_offload_scan_rssi_params"). Change-Id: Ifbbca30b9aca9688931ac0f4e4f703c28ad0ad32 CRs-Fixed: 2404094 --- wmi/inc/wmi_unified_roam_param.h | 4 ++-- wmi/src/wmi_unified_roam_tlv.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wmi/inc/wmi_unified_roam_param.h b/wmi/inc/wmi_unified_roam_param.h index 42ca5853a6..b348f7d86e 100644 --- a/wmi/inc/wmi_unified_roam_param.h +++ b/wmi/inc/wmi_unified_roam_param.h @@ -72,7 +72,7 @@ struct rssi_monitor_param { * @hi_rssi_scan_rssi_delta: 5G scan rssi change threshold value * @hi_rssi_scan_rssi_ub: 5G scan upper bound * @raise_rssi_thresh_5g: flag to determine penalty and boost thresholds - * @session_id: vdev id + * @vdev_id: vdev id * @penalty_threshold_5g: RSSI threshold below which 5GHz RSSI is penalized * @boost_threshold_5g: RSSI threshold above which 5GHz RSSI is favored * @raise_factor_5g: factor by which 5GHz RSSI is boosted @@ -105,7 +105,7 @@ struct roam_offload_scan_rssi_params { uint32_t hi_rssi_scan_rssi_delta; int32_t hi_rssi_scan_rssi_ub; int raise_rssi_thresh_5g; - uint8_t session_id; + uint8_t vdev_id; uint32_t penalty_threshold_5g; uint32_t boost_threshold_5g; uint8_t raise_factor_5g; diff --git a/wmi/src/wmi_unified_roam_tlv.c b/wmi/src/wmi_unified_roam_tlv.c index afb99e5355..1c25a303c3 100644 --- a/wmi/src/wmi_unified_roam_tlv.c +++ b/wmi/src/wmi_unified_roam_tlv.c @@ -202,7 +202,7 @@ static QDF_STATUS send_roam_scan_offload_rssi_thresh_cmd_tlv(wmi_unified_t wmi_h WMITLV_GET_STRUCT_TLVLEN (wmi_roam_scan_rssi_threshold_fixed_param)); /* fill in threshold values */ - rssi_threshold_fp->vdev_id = roam_req->session_id; + rssi_threshold_fp->vdev_id = roam_req->vdev_id; rssi_threshold_fp->roam_scan_rssi_thresh = roam_req->rssi_thresh; rssi_threshold_fp->roam_rssi_thresh_diff = roam_req->rssi_thresh_diff; rssi_threshold_fp->hirssi_scan_max_count =