From 9963d87b8ea4af1e27b740b15d7d9ff9cd1e1fd3 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 22 Feb 2019 15:53:51 -0800 Subject: [PATCH] qcacmn: Replace session_id in gateway_update_req_param In struct gateway_update_req_param 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 I2d24a54e80931a944580e968a841679d2da7b2a1 ("qcacld-3.0: Use vdev_id in gateway_update_req_param"). Change-Id: I84b28aa734b570f0a7834fbac7d27e9c66b8b026 CRs-Fixed: 2404012 --- wmi/inc/wmi_unified_roam_param.h | 6 +++--- wmi/src/wmi_unified_roam_tlv.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wmi/inc/wmi_unified_roam_param.h b/wmi/inc/wmi_unified_roam_param.h index d9985354598a..6a93044fc397 100644 --- a/wmi/inc/wmi_unified_roam_param.h +++ b/wmi/inc/wmi_unified_roam_param.h @@ -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 @@ -26,7 +26,7 @@ /** * struct gateway_update_req_param - gateway parameter update request * @request_id: request id - * @session_id: session id + * @vdev_id: vdev id * @max_retries: Max ARP/NS retry attempts * @timeout: Retry interval * @ipv4_addr_type: on ipv4 network @@ -37,7 +37,7 @@ */ struct gateway_update_req_param { uint32_t request_id; - uint32_t session_id; + uint32_t vdev_id; uint32_t max_retries; uint32_t timeout; uint32_t ipv4_addr_type; diff --git a/wmi/src/wmi_unified_roam_tlv.c b/wmi/src/wmi_unified_roam_tlv.c index b0e122c703ca..d5930c584e27 100644 --- a/wmi/src/wmi_unified_roam_tlv.c +++ b/wmi/src/wmi_unified_roam_tlv.c @@ -52,7 +52,7 @@ static QDF_STATUS send_set_gateway_params_cmd_tlv(wmi_unified_t wmi_handle, WMITLV_GET_STRUCT_TLVLEN( wmi_roam_subnet_change_config_fixed_param)); - cmd->vdev_id = req->session_id; + cmd->vdev_id = req->vdev_id; qdf_mem_copy(&cmd->inet_gw_ip_v4_addr, req->ipv4_addr, QDF_IPV4_ADDR_SIZE); qdf_mem_copy(&cmd->inet_gw_ip_v6_addr, req->ipv6_addr,