qcacld-3.0: Replace session_id with vdev_id in hdd_adapter (5/5)

Originally struct hdd_adapter only used the legacy term session_id to
reference a session. To align with converged naming it is desirable to
change this to vdev_id.  In order to ease the transition change
Id92b1a7bb9721564ba01184809fec98be2143545 ("qcacld-3.0: Alias vdev_id
to session_id in hdd_adapter") replaced the session_id field with a
union that contains both a session_id and a vdev_id field. This allows
vdev_id and session_id to both be used to access the same data item.

To continue the transition replace the session_id field references
with vdev_in in the following files:
- wlan_hdd_active_tos.c
- wlan_hdd_apf.c
- wlan_hdd_cfg.c
- wlan_hdd_debugfs_offload.c
- wlan_hdd_debugfs_roam.c
- wlan_hdd_disa.c
- wlan_hdd_ext_scan.c
- wlan_hdd_ipa.c
- wlan_hdd_lpass.c
- wlan_hdd_nan_datapath.c
- wlan_hdd_nud_tracking.c
- wlan_hdd_object_manager.c
- wlan_hdd_ocb.c
- wlan_hdd_oemdata.c
- wlan_hdd_p2p.c
- wlan_hdd_p2p_listen_offload.c
- wlan_hdd_packet_filter.c
- wlan_hdd_power.c
- wlan_hdd_regulatory.c
- wlan_hdd_sap_cond_chan_switch.c
- wlan_hdd_scan.c
- wlan_hdd_spectralscan.c
- wlan_hdd_subnet_detect.c
- wlan_hdd_sysfs.c
- wlan_hdd_tdls.c
- wlan_hdd_tsf.c
- wlan_hdd_wmm.c
- wlan_hdd_wowl.c

Change-Id: Ia3a884afc57f40ddbe99d740eecf05ec6ff44155
CRs-Fixed: 2393157

core/hdd/src/wlan_hdd_active_tos.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-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
@@ -138,7 +138,7 @@ hdd_set_limit_off_chan_for_tos(struct hdd_adapter *adapter,
 
 	ucfg_scan_cfg_get_conc_max_resttime(hdd_ctx->psoc, &rest_conc_time);
 	status = sme_send_limit_off_channel_params(hdd_ctx->mac_handle,
-					adapter->session_id,
+					adapter->vdev_id,
 					is_tos_active,
 					max_off_chan_time,
 					rest_conc_time,

core/hdd/src/wlan_hdd_apf.c

@@ -264,7 +264,7 @@ static int hdd_set_reset_apf_offload(struct hdd_context *hdd_ctx,
 
 	apf_set_offload.current_length = prog_len;
 	nla_memcpy(apf_set_offload.program, tb[APF_PROGRAM], prog_len);
-	apf_set_offload.session_id = adapter->session_id;
+	apf_set_offload.session_id = adapter->vdev_id;
 
 	hdd_debug("APF set instructions");
 	QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_DEBUG,
@@ -327,7 +327,7 @@ hdd_enable_disable_apf(struct hdd_adapter *adapter, bool apf_enable)
 	hdd_enter();
 
 	status = sme_set_apf_enable_disable(hdd_adapter_get_mac_handle(adapter),
-					    adapter->session_id, apf_enable);
+					    adapter->vdev_id, apf_enable);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		hdd_err("Unable to post sme apf enable/disable message (status-%d)",
 				status);
@@ -361,7 +361,7 @@ hdd_apf_write_memory(struct hdd_adapter *adapter, struct nlattr **tb)
 	hdd_enter();
 
 
-	write_mem_params.vdev_id = adapter->session_id;
+	write_mem_params.vdev_id = adapter->vdev_id;
 	if (adapter->apf_context.apf_enabled) {
 		hdd_err("Cannot get/set when APF interpreter is enabled");
 		return -EINVAL;
@@ -513,7 +513,7 @@ static int hdd_apf_read_memory(struct hdd_adapter *adapter, struct nlattr **tb)
 		return -EINVAL;
 	}
 
-	read_mem_params.vdev_id = adapter->session_id;
+	read_mem_params.vdev_id = adapter->vdev_id;
 
 	/* Read APF work memory offset */
 	if (!tb[APF_CURRENT_OFFSET]) {

core/hdd/src/wlan_hdd_cfg.c

@@ -1776,7 +1776,7 @@ hdd_set_nss_params(struct hdd_adapter *adapter,
 
 	if (!hdd_is_vdev_in_conn_state(adapter)) {
 		hdd_debug("Vdev (id %d) not in connected/started state, cannot accept command",
-				adapter->session_id);
+				adapter->vdev_id);
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -1786,7 +1786,7 @@ hdd_set_nss_params(struct hdd_adapter *adapter,
 	if (QDF_IS_STATUS_ERROR(
 		sme_nss_chains_update(mac_handle,
 				      &user_cfg,
-				      adapter->session_id)))
+				      adapter->vdev_id)))
 		return QDF_STATUS_E_FAILURE;
 
 	/* Check TDLS status and update antenna mode */
@@ -1954,7 +1954,7 @@ skip_ht_cap_update:
 		status = false;
 		hdd_err("Could not get MCS SET from CFG");
 	}
-	sme_update_he_cap_nss(mac_handle, adapter->session_id, nss);
+	sme_update_he_cap_nss(mac_handle, adapter->vdev_id, nss);
 #undef WLAN_HDD_RX_MCS_ALL_NSTREAM_RATES
 
 	if (QDF_STATUS_SUCCESS != sme_update_nss(mac_handle, nss))

core/hdd/src/wlan_hdd_debugfs_offload.c

@@ -1,9 +1,5 @@
-
 /*
- * Copyright (c) 2018 The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
+ * Copyright (c) 2018-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
@@ -70,7 +66,7 @@ wlan_hdd_mc_addr_list_info_debugfs(struct hdd_context *hdd_ctx,
 	}
 
 	status = ucfg_pmo_get_mc_addr_list(hdd_ctx->psoc,
-					   adapter->session_id,
+					   adapter->vdev_id,
 					   &mc_addr_list);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		ret = scnprintf(buf, buf_avail_len,

core/hdd/src/wlan_hdd_debugfs_roam.c

@@ -1,8 +1,5 @@
 /*
- * Copyright (c) 2018 The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
+ * Copyright (c) 2018-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
@@ -144,7 +141,7 @@ wmi_roam_scan_stats_res *hdd_get_roam_scan_stats(struct hdd_context *hdd_ctx,
 
 	status = sme_get_roam_scan_stats(hdd_ctx->mac_handle,
 					 hdd_roam_scan_stats_cb,
-					 context, adapter->session_id);
+					 context, adapter->vdev_id);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		hdd_err("roam scan stats request failed");
 		goto cleanup;

core/hdd/src/wlan_hdd_disa.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-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
@@ -184,7 +184,7 @@ hdd_fill_encrypt_decrypt_params(struct disa_encrypt_decrypt_req_params
 		return -EINVAL;
 	}
 
-	encrypt_decrypt_params->vdev_id = adapter->session_id;
+	encrypt_decrypt_params->vdev_id = adapter->vdev_id;
 	hdd_debug("vdev_id: %d", encrypt_decrypt_params->vdev_id);
 
 	if (!tb[QCA_WLAN_VENDOR_ATTR_ENCRYPTION_TEST_NEEDS_DECRYPTION]) {

core/hdd/src/wlan_hdd_ext_scan.c

@@ -1656,7 +1656,7 @@ __wlan_hdd_cfg80211_extscan_get_capabilities(struct wiphy *wiphy,
 	}
 
 	params.request_id = nla_get_u32(tb[id]);
-	params.vdev_id = adapter->session_id;
+	params.vdev_id = adapter->vdev_id;
 	hdd_debug("Req Id %d Vdev Id %d", params.request_id, params.vdev_id);
 
 	context = &ext_scan_context;
@@ -1773,7 +1773,7 @@ __wlan_hdd_cfg80211_extscan_get_cached_results(struct wiphy *wiphy,
 	}
 
 	params.request_id = nla_get_u32(tb[id]);
-	params.vdev_id = adapter->session_id;
+	params.vdev_id = adapter->vdev_id;
 
 	/* Parse and fetch flush parameter */
 	id = QCA_WLAN_VENDOR_ATTR_EXTSCAN_GET_CACHED_SCAN_RESULTS_CONFIG_PARAM_FLUSH;
@@ -1983,7 +1983,7 @@ __wlan_hdd_cfg80211_extscan_set_bssid_hotlist(struct wiphy *wiphy,
 			params->num_ap, WMI_WLAN_EXTSCAN_MAX_HOTLIST_APS);
 		goto fail;
 	}
-	params->vdev_id = adapter->session_id;
+	params->vdev_id = adapter->vdev_id;
 	hdd_debug("Number of AP %d vdev Id %d",
 		  params->num_ap, params->vdev_id);
 
@@ -2190,7 +2190,7 @@ __wlan_hdd_cfg80211_extscan_set_significant_change(struct wiphy *wiphy,
 		goto fail;
 	}
 
-	params->vdev_id = adapter->session_id;
+	params->vdev_id = adapter->vdev_id;
 	hdd_debug("Number of AP %d Vdev Id %d",
 		  params->num_ap, params->vdev_id);
 
@@ -3085,7 +3085,7 @@ __wlan_hdd_cfg80211_extscan_start(struct wiphy *wiphy,
 	}
 
 	params->request_id = nla_get_u32(tb[id]);
-	params->vdev_id = adapter->session_id;
+	params->vdev_id = adapter->vdev_id;
 
 	/* Parse and fetch base period */
 	id = QCA_WLAN_VENDOR_ATTR_EXTSCAN_SCAN_CMD_PARAMS_BASE_PERIOD;
@@ -3282,7 +3282,7 @@ __wlan_hdd_cfg80211_extscan_stop(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 	params.request_id = nla_get_u32(tb[id]);
-	params.vdev_id = adapter->session_id;
+	params.vdev_id = adapter->vdev_id;
 	hdd_debug("Req Id %d Vdev Id %d",
 		  params.request_id, params.vdev_id);
 
@@ -3396,7 +3396,7 @@ __wlan_hdd_cfg80211_extscan_reset_bssid_hotlist(struct wiphy *wiphy,
 	}
 
 	params.request_id = nla_get_u32(tb[id]);
-	params.vdev_id = adapter->session_id;
+	params.vdev_id = adapter->vdev_id;
 	hdd_debug("Req Id %d vdev Id %d", params.request_id, params.vdev_id);
 
 	context = &ext_scan_context;
@@ -3510,7 +3510,7 @@ __wlan_hdd_cfg80211_extscan_reset_significant_change(struct wiphy *wiphy,
 	}
 
 	params.request_id = nla_get_u32(tb[id]);
-	params.vdev_id = adapter->session_id;
+	params.vdev_id = adapter->vdev_id;
 	hdd_debug("Req Id %d Vdev Id %d", params.request_id, params.vdev_id);
 
 	context = &ext_scan_context;
@@ -3775,7 +3775,7 @@ static int __wlan_hdd_cfg80211_set_epno_list(struct wiphy *wiphy,
 	req_msg->request_id = nla_get_u32(tb[id]);
 	hdd_debug("Req Id %u", req_msg->request_id);
 
-	req_msg->vdev_id = adapter->session_id;
+	req_msg->vdev_id = adapter->vdev_id;
 	hdd_debug("Vdev Id %d", req_msg->vdev_id);
 
 	if (num_networks) {
@@ -4094,7 +4094,7 @@ static int __wlan_hdd_cfg80211_set_passpoint_list(struct wiphy *wiphy,
 	}
 	req_msg->request_id = nla_get_u32(tb[id]);
 
-	req_msg->vdev_id = adapter->session_id;
+	req_msg->vdev_id = adapter->vdev_id;
 	hdd_debug("Req Id %u Vdev Id %d",
 		  req_msg->request_id, req_msg->vdev_id);
 
@@ -4200,7 +4200,7 @@ static int __wlan_hdd_cfg80211_reset_passpoint_list(struct wiphy *wiphy,
 	}
 	req_msg->request_id = nla_get_u32(tb[id]);
 
-	req_msg->vdev_id = adapter->session_id;
+	req_msg->vdev_id = adapter->vdev_id;
 	hdd_debug("Req Id %u Vdev Id %d",
 		  req_msg->request_id, req_msg->vdev_id);
 

core/hdd/src/wlan_hdd_ipa.c

@@ -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
@@ -158,7 +158,7 @@ void hdd_ipa_set_tx_flow_info(void)
 				adapter->tx_flow_hi_watermark_offset =
 				   hdd_ctx->config->tx_flow_hi_watermark_offset;
 				cdp_fc_ll_set_tx_pause_q_depth(soc,
-						adapter->session_id,
+						adapter->vdev_id,
 						hdd_ctx->config->
 						tx_flow_max_queue_depth);
 				hdd_info("MODE %d,CH %d,LWM %d,HWM %d,TXQDEP %d",
@@ -184,7 +184,7 @@ void hdd_ipa_set_tx_flow_info(void)
 					adapter->
 					tx_flow_hi_watermark_offset = 0;
 					cdp_fc_ll_set_tx_pause_q_depth(soc,
-						adapter->session_id,
+						adapter->vdev_id,
 						hdd_ctx->config->
 						tx_hbw_flow_max_queue_depth);
 					hdd_info("SCC: MODE %s(%d), CH %d, LWM %d, HWM %d, TXQDEP %d",

core/hdd/src/wlan_hdd_lpass.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-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
@@ -107,7 +107,7 @@ static int wlan_hdd_gen_wlan_status_pack(struct wlan_status_data *data,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->session_id))
+	if (wlan_hdd_validate_session_id(adapter->vdev_id))
 		return -EINVAL;
 
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
@@ -135,7 +135,7 @@ static int wlan_hdd_gen_wlan_status_pack(struct wlan_status_data *data,
 
 	sme_get_country_code(hdd_ctx->mac_handle, data->country_code, &buflen);
 	data->is_on = is_on;
-	data->vdev_id = adapter->session_id;
+	data->vdev_id = adapter->vdev_id;
 	data->vdev_mode = adapter->device_mode;
 	if (sta_ctx) {
 		data->is_connected = is_connected;

core/hdd/src/wlan_hdd_nan_datapath.c

@@ -210,11 +210,11 @@ static int hdd_ndi_start_bss(struct hdd_adapter *adapter,
 	roam_profile->EncryptionType.encryptionType[0] = eCSR_ENCRYPT_TYPE_NONE;
 
 	mac_handle = hdd_adapter_get_mac_handle(adapter);
-	status = sme_roam_connect(mac_handle, adapter->session_id,
+	status = sme_roam_connect(mac_handle, adapter->vdev_id,
 				  roam_profile, &roam_id);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		hdd_err("NDI sme_RoamConnect session %d failed with status %d -> NotConnected",
-			adapter->session_id, status);
+			adapter->vdev_id, status);
 		/* change back to NotConnected */
 		hdd_conn_set_connection_state(adapter,
 					      eConnectionState_NotConnected);
@@ -324,7 +324,7 @@ void hdd_ndp_event_handler(struct hdd_adapter *adapter,
 					NAN_DATAPATH_RSP_STATUS_SUCCESS);
 			hdd_debug("posting ndi create status: %d to umac",
 				success);
-			os_if_nan_post_ndi_create_rsp(psoc, adapter->session_id,
+			os_if_nan_post_ndi_create_rsp(psoc, adapter->vdev_id,
 							success);
 			return;
 		case eCSR_ROAM_RESULT_NDI_DELETE_RSP:
@@ -332,7 +332,7 @@ void hdd_ndp_event_handler(struct hdd_adapter *adapter,
 					NAN_DATAPATH_RSP_STATUS_SUCCESS);
 			hdd_debug("posting ndi delete status: %d to umac",
 				success);
-			os_if_nan_post_ndi_delete_rsp(psoc, adapter->session_id,
+			os_if_nan_post_ndi_delete_rsp(psoc, adapter->vdev_id,
 							success);
 			return;
 		default:
@@ -461,7 +461,7 @@ int hdd_init_nan_data_mode(struct hdd_adapter *adapter)
 		hdd_err("unable to get vht_enable2x2");
 
 	sme_set_pdev_ht_vht_ies(mac_handle, bval);
-	sme_set_vdev_ies_per_band(mac_handle, adapter->session_id);
+	sme_set_vdev_ies_per_band(mac_handle, adapter->vdev_id);
 
 	hdd_roam_profile_init(adapter);
 	hdd_register_wext(wlan_dev);
@@ -484,7 +484,7 @@ int hdd_init_nan_data_mode(struct hdd_adapter *adapter)
 
 	set_bit(WMM_INIT_DONE, &adapter->event_flags);
 
-	ret_val = wma_cli_set_command((int)adapter->session_id,
+	ret_val = wma_cli_set_command((int)adapter->vdev_id,
 			(int)WMI_PDEV_PARAM_BURST_ENABLE,
 			(int)HDD_ENABLE_SIFS_BURST_DEFAULT,
 			PDEV_CMD);

core/hdd/src/wlan_hdd_nud_tracking.c

@@ -255,7 +255,7 @@ static void __hdd_nud_failure_work(void *data)
 	qdf_mutex_release(&adapter->disconnection_status_lock);
 
 	hdd_debug("Disconnecting STA with session id: %d",
-		  adapter->session_id);
+		  adapter->vdev_id);
 	/* Issue Disconnect */
 	status = wlan_hdd_disconnect(adapter, eCSR_DISCONNECT_REASON_DEAUTH);
 	if (0 != status) {

core/hdd/src/wlan_hdd_object_manager.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-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
@@ -283,7 +283,7 @@ int hdd_objmgr_create_and_store_vdev(struct wlan_objmgr_pdev *pdev,
 
 	qdf_spin_lock_bh(&adapter->vdev_lock);
 	adapter->vdev = vdev;
-	adapter->session_id = wlan_vdev_get_id(vdev);
+	adapter->vdev_id = wlan_vdev_get_id(vdev);
 	qdf_spin_unlock_bh(&adapter->vdev_lock);
 
 	return 0;
@@ -306,7 +306,7 @@ int hdd_objmgr_release_and_destroy_vdev(struct hdd_adapter *adapter)
 	qdf_spin_lock_bh(&adapter->vdev_lock);
 	vdev = adapter->vdev;
 	adapter->vdev = NULL;
-	adapter->session_id = HDD_SESSION_ID_INVALID;
+	adapter->vdev_id = HDD_SESSION_ID_INVALID;
 	qdf_spin_unlock_bh(&adapter->vdev_lock);
 
 	QDF_BUG(vdev);

core/hdd/src/wlan_hdd_ocb.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-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
@@ -240,7 +240,7 @@ static int hdd_ocb_register_sta(struct hdd_adapter *adapter)
 	txrx_ops.rx.rx = hdd_rx_packet_cbk;
 	cdp_vdev_register(soc,
 		(struct cdp_vdev *)cdp_get_vdev_from_vdev_id(soc,
-		(struct cdp_pdev *)pdev, adapter->session_id),
+		(struct cdp_pdev *)pdev, adapter->vdev_id),
 		adapter, (struct cdp_ctrl_objmgr_vdev *)adapter->vdev,
 		&txrx_ops);
 	txrx_ops.rx.stats_rx = hdd_tx_rx_collect_connectivity_stats_info;
@@ -488,7 +488,7 @@ static int __iw_set_dot11p_channel_sched(struct net_device *dev,
 	}
 
 	/* Identify the vdev interface */
-	config->vdev_id = adapter->session_id;
+	config->vdev_id = adapter->vdev_id;
 
 	/* Release all the mac addresses used for OCB */
 	for (i = 0; i < adapter->ocb_mac_addr_count; i++) {
@@ -852,7 +852,7 @@ static int __wlan_hdd_cfg80211_ocb_set_config(struct wiphy *wiphy,
 	    config->channels, nla_data(channel_array), channel_count);
 
 	/* Identify the vdev interface */
-	config->vdev_id = adapter->session_id;
+	config->vdev_id = adapter->vdev_id;
 
 	/* Release all the mac addresses used for OCB */
 	for (i = 0; i < adapter->ocb_mac_addr_count; i++) {
@@ -980,7 +980,7 @@ static int __wlan_hdd_cfg80211_ocb_set_utc_time(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (!wma_is_vdev_up(adapter->session_id)) {
+	if (!wma_is_vdev_up(adapter->vdev_id)) {
 		hdd_err("The device has not been started");
 		return -EINVAL;
 	}
@@ -1021,7 +1021,7 @@ static int __wlan_hdd_cfg80211_ocb_set_utc_time(struct wiphy *wiphy,
 		hdd_err("qdf_mem_malloc failed");
 		return -ENOMEM;
 	}
-	utc->vdev_id = adapter->session_id;
+	utc->vdev_id = adapter->vdev_id;
 	qdf_mem_copy(utc->utc_time, nla_data(utc_attr), SIZE_UTC_TIME);
 	qdf_mem_copy(utc->time_error, nla_data(time_error_attr),
 		SIZE_UTC_TIME_ERROR);
@@ -1093,7 +1093,7 @@ __wlan_hdd_cfg80211_ocb_start_timing_advert(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (!wma_is_vdev_up(adapter->session_id)) {
+	if (!wma_is_vdev_up(adapter->vdev_id)) {
 		hdd_err("The device has not been started");
 		return -EINVAL;
 	}
@@ -1103,7 +1103,7 @@ __wlan_hdd_cfg80211_ocb_start_timing_advert(struct wiphy *wiphy,
 		hdd_err("qdf_mem_malloc failed");
 		return -ENOMEM;
 	}
-	timing_advert->vdev_id = adapter->session_id;
+	timing_advert->vdev_id = adapter->vdev_id;
 
 	/* Parse the netlink message */
 	if (wlan_cfg80211_nla_parse(tb,
@@ -1210,7 +1210,7 @@ __wlan_hdd_cfg80211_ocb_stop_timing_advert(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (!wma_is_vdev_up(adapter->session_id)) {
+	if (!wma_is_vdev_up(adapter->vdev_id)) {
 		hdd_err("The device has not been started");
 		return -EINVAL;
 	}
@@ -1220,7 +1220,7 @@ __wlan_hdd_cfg80211_ocb_stop_timing_advert(struct wiphy *wiphy,
 		hdd_err("qdf_mem_malloc failed");
 		return -ENOMEM;
 	}
-	timing_advert->vdev_id = adapter->session_id;
+	timing_advert->vdev_id = adapter->vdev_id;
 
 	/* Parse the netlink message */
 	if (wlan_cfg80211_nla_parse(tb,
@@ -1392,7 +1392,7 @@ __wlan_hdd_cfg80211_ocb_get_tsf_timer(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (!wma_is_vdev_up(adapter->session_id)) {
+	if (!wma_is_vdev_up(adapter->vdev_id)) {
 		hdd_err("The device has not been started");
 		return -EINVAL;
 	}
@@ -1404,7 +1404,7 @@ __wlan_hdd_cfg80211_ocb_get_tsf_timer(struct wiphy *wiphy,
 	}
 	cookie = osif_request_cookie(request);
 
-	tsf_request.vdev_id = adapter->session_id;
+	tsf_request.vdev_id = adapter->vdev_id;
 	status = ucfg_ocb_get_tsf_timer(adapter->vdev, &tsf_request,
 					hdd_ocb_get_tsf_timer_callback,
 					cookie);
@@ -1615,7 +1615,7 @@ static int __wlan_hdd_cfg80211_dcc_get_stats(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (!wma_is_vdev_up(adapter->session_id)) {
+	if (!wma_is_vdev_up(adapter->vdev_id)) {
 		hdd_err("The device has not been started");
 		return -EINVAL;
 	}
@@ -1655,7 +1655,7 @@ static int __wlan_hdd_cfg80211_dcc_get_stats(struct wiphy *wiphy,
 	}
 	cookie = osif_request_cookie(request);
 
-	dcc_request.vdev_id = adapter->session_id;
+	dcc_request.vdev_id = adapter->vdev_id;
 	dcc_request.channel_count = channel_count;
 	dcc_request.request_array_len = request_array_len;
 	dcc_request.request_array = request_array;
@@ -1750,7 +1750,7 @@ static int __wlan_hdd_cfg80211_dcc_clear_stats(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (!wma_is_vdev_up(adapter->session_id)) {
+	if (!wma_is_vdev_up(adapter->vdev_id)) {
 		hdd_err("The device has not been started");
 		return -EINVAL;
 	}
@@ -1770,7 +1770,7 @@ static int __wlan_hdd_cfg80211_dcc_clear_stats(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (ucfg_ocb_dcc_clear_stats(adapter->vdev, adapter->session_id,
+	if (ucfg_ocb_dcc_clear_stats(adapter->vdev, adapter->vdev_id,
 		nla_get_u32(
 			tb[QCA_WLAN_VENDOR_ATTR_DCC_CLEAR_STATS_BITMAP])) !=
 			QDF_STATUS_SUCCESS) {
@@ -1881,7 +1881,7 @@ static int __wlan_hdd_cfg80211_dcc_update_ndl(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (!wma_is_vdev_up(adapter->session_id)) {
+	if (!wma_is_vdev_up(adapter->vdev_id)) {
 		hdd_err("The device has not been started");
 		return -EINVAL;
 	}
@@ -1927,7 +1927,7 @@ static int __wlan_hdd_cfg80211_dcc_update_ndl(struct wiphy *wiphy,
 	cookie = osif_request_cookie(request);
 
 	/* Copy the parameters to the request structure. */
-	dcc_request.vdev_id = adapter->session_id;
+	dcc_request.vdev_id = adapter->vdev_id;
 	dcc_request.channel_count = channel_count;
 	dcc_request.dcc_ndl_chan_list_len = ndl_channel_array_len;
 	dcc_request.dcc_ndl_chan_list = ndl_channel_array;

core/hdd/src/wlan_hdd_oemdata.c

@@ -97,10 +97,10 @@ static int populate_oem_data_cap(struct hdd_adapter *adapter,
 	data_cap->allowed_dwell_time_max = neighbor_scan_max_chan_time;
 	data_cap->curr_dwell_time_min =
 		sme_get_neighbor_scan_min_chan_time(hdd_ctx->mac_handle,
-						    adapter->session_id);
+						    adapter->vdev_id);
 	data_cap->curr_dwell_time_max =
 		sme_get_neighbor_scan_max_chan_time(hdd_ctx->mac_handle,
-						    adapter->session_id);
+						    adapter->vdev_id);
 	data_cap->supported_bands = band_capability;
 
 	/* request for max num of channels */
@@ -223,7 +223,7 @@ static void send_oem_reg_rsp_nlink_msg(void)
 		deviceMode = buf++;
 		vdevId = buf++;
 		*deviceMode = adapter->device_mode;
-		*vdevId = adapter->session_id;
+		*vdevId = adapter->vdev_id;
 		(*numInterfaces)++;
 		hdd_debug("numInterfaces: %d, deviceMode: %d, vdevId: %d",
 			  *numInterfaces, *deviceMode,

core/hdd/src/wlan_hdd_p2p.c

@@ -145,7 +145,7 @@ static int __wlan_hdd_cfg80211_remain_on_channel(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->session_id))
+	if (wlan_hdd_validate_session_id(adapter->vdev_id))
 		return -EINVAL;
 
 	/* Disable NAN Discovery if enabled */
@@ -191,7 +191,7 @@ __wlan_hdd_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->session_id))
+	if (wlan_hdd_validate_session_id(adapter->vdev_id))
 		return -EINVAL;
 
 	status = wlan_cfg80211_cancel_roc(adapter->vdev, cookie);
@@ -237,7 +237,7 @@ static int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->session_id))
+	if (wlan_hdd_validate_session_id(adapter->vdev_id))
 		return -EINVAL;
 
 	ret = wlan_hdd_validate_context(hdd_ctx);
@@ -262,7 +262,7 @@ static int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
 			   wlan_vdev_get_id(adapter->vdev), 0);
 
 		qdf_status = sme_send_mgmt_tx(hdd_ctx->mac_handle,
-					      adapter->session_id, buf, len);
+					      adapter->vdev_id, buf, len);
 
 		if (QDF_IS_STATUS_SUCCESS(qdf_status))
 			return 0;
@@ -326,7 +326,7 @@ static int __wlan_hdd_cfg80211_mgmt_tx_cancel_wait(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->session_id))
+	if (wlan_hdd_validate_session_id(adapter->vdev_id))
 		return -EINVAL;
 
 	status = wlan_cfg80211_mgmt_tx_cancel(adapter->vdev, cookie);
@@ -413,7 +413,7 @@ int hdd_set_p2p_noa(struct net_device *dev, uint8_t *command)
 	}
 	noa.interval = MS_TO_TU_MUS(interval);
 	noa.count = count;
-	noa.vdev_id = adapter->session_id;
+	noa.vdev_id = adapter->vdev_id;
 
 	hdd_debug("P2P_PS_ATTR:oppPS %d ctWindow %d duration %d "
 		  "interval %d count %d single noa duration %d "
@@ -524,7 +524,7 @@ int hdd_set_p2p_opps(struct net_device *dev, uint8_t *command)
 		noa.interval = 0;
 		noa.count = 0;
 		noa.ps_selection = P2P_POWER_SAVE_TYPE_OPPORTUNISTIC;
-		noa.vdev_id = adapter->session_id;
+		noa.vdev_id = adapter->vdev_id;
 
 		hdd_debug("P2P_PS_ATTR: oppPS %d ctWindow %d duration %d interval %d count %d single noa duration %d PsSelection %x",
 			noa.opp_ps, noa.ct_window,
@@ -551,7 +551,7 @@ int hdd_set_p2p_ps(struct net_device *dev, void *msgData)
 	noa.count = pappnoa->count;
 	noa.single_noa_duration = pappnoa->single_noa_duration;
 	noa.ps_selection = pappnoa->psSelection;
-	noa.vdev_id = adapter->session_id;
+	noa.vdev_id = adapter->vdev_id;
 
 	return wlan_hdd_set_power_save(adapter, &noa);
 }
@@ -655,11 +655,11 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy,
 	}
 
 	adapter = hdd_get_adapter(hdd_ctx, QDF_STA_MODE);
-	if (adapter && !wlan_hdd_validate_session_id(adapter->session_id)) {
+	if (adapter && !wlan_hdd_validate_session_id(adapter->vdev_id)) {
 		if (ucfg_scan_get_vdev_status(adapter->vdev) !=
 				SCAN_NOT_IN_PROGRESS) {
 			wlan_abort_scan(hdd_ctx->pdev, INVAL_PDEV_ID,
-					adapter->session_id, INVALID_SCAN_ID,
+					adapter->vdev_id, INVALID_SCAN_ID,
 					false);
 			hdd_debug("Abort Scan while adding virtual interface");
 		}
@@ -831,7 +831,7 @@ int __wlan_hdd_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev)
 
 	qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
 		   TRACE_CODE_HDD_DEL_VIRTUAL_INTF,
-		   adapter->session_id, adapter->device_mode);
+		   adapter->vdev_id, adapter->device_mode);
 
 	hdd_debug("Device_mode %s(%d)",
 		  qdf_opmode_str(adapter->device_mode), adapter->device_mode);
@@ -997,11 +997,11 @@ void __hdd_indicate_mgmt_frame(struct hdd_adapter *adapter,
 	if (hdd_is_qos_action_frame(pb_frames, frm_len))
 		sme_update_dsc_pto_up_mapping(hdd_ctx->mac_handle,
 					      adapter->dscp_to_up_map,
-					      adapter->session_id);
+					      adapter->vdev_id);
 
 	/* Indicate Frame Over Normal Interface */
 	hdd_debug("Indicate Frame over NL80211 sessionid : %d, idx :%d",
-		   adapter->session_id, adapter->dev->ifindex);
+		   adapter->vdev_id, adapter->dev->ifindex);
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
 	cfg80211_rx_mgmt(adapter->dev->ieee80211_ptr,
@@ -1297,7 +1297,7 @@ int wlan_hdd_set_mcc_p2p_quota(struct hdd_adapter *adapter,
 
 
 		set_value = set_second_connection_operating_channel(
-			hdd_ctx, set_value, adapter->session_id);
+			hdd_ctx, set_value, adapter->vdev_id);
 
 
 		ret = wlan_hdd_send_p2p_quota(adapter, set_value);

core/hdd/src/wlan_hdd_p2p_listen_offload.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-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
@@ -175,7 +175,7 @@ static int __wlan_hdd_cfg80211_p2p_lo_start(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	params.vdev_id = adapter->session_id;
+	params.vdev_id = adapter->vdev_id;
 	params.freq = nla_get_u32(tb
 		[QCA_WLAN_VENDOR_ATTR_P2P_LISTEN_OFFLOAD_CHANNEL]);
 	if ((params.freq != 2412) && (params.freq != 2437) &&
@@ -280,7 +280,7 @@ static int wlan_hdd_listen_offload_stop(struct hdd_adapter *adapter)
 		return -EINVAL;
 	}
 
-	vdev_id = (uint32_t)adapter->session_id;
+	vdev_id = (uint32_t)adapter->vdev_id;
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	psoc = hdd_ctx->psoc;
 	if (!psoc) {

core/hdd/src/wlan_hdd_packet_filter.c

@@ -51,7 +51,7 @@ int hdd_enable_default_pkt_filters(struct hdd_adapter *adapter)
 			packet_filter_default_rules[i].filter_id = filter_id;
 			wlan_hdd_set_filter(hdd_ctx,
 					    &packet_filter_default_rules[i],
-					    adapter->session_id);
+					    adapter->vdev_id);
 			filter_id++;
 		}
 		filters = filters >> 1;
@@ -90,7 +90,7 @@ int hdd_disable_default_pkt_filters(struct hdd_adapter *adapter)
 			packet_filter_default_rules.filter_id = filter_id;
 			wlan_hdd_set_filter(hdd_ctx,
 					    &packet_filter_default_rules,
-					    adapter->session_id);
+					    adapter->vdev_id);
 			filter_id++;
 		}
 		filters = filters >> 1;

core/hdd/src/wlan_hdd_power.c

@@ -257,7 +257,7 @@ static int __wlan_hdd_ipv6_changed(struct notifier_block *nb,
 		}
 
 		hdd_debug("invoking sme_dhcp_done_ind");
-		sme_dhcp_done_ind(hdd_ctx->mac_handle, adapter->session_id);
+		sme_dhcp_done_ind(hdd_ctx->mac_handle, adapter->vdev_id);
 		schedule_work(&adapter->ipv6_notifier_work);
 	}
 
@@ -410,7 +410,7 @@ void hdd_enable_ns_offload(struct hdd_adapter *adapter,
 		goto out;
 
 	ns_req->psoc = psoc;
-	ns_req->vdev_id = adapter->session_id;
+	ns_req->vdev_id = adapter->vdev_id;
 	ns_req->trigger = trigger;
 	ns_req->count = 0;
 
@@ -719,7 +719,7 @@ static int hdd_set_grat_arp_keepalive(struct hdd_adapter *adapter)
 
 	qdf_copy_macaddr(&req.bssid, &sta_ctx->conn_info.bssId);
 	ucfg_mlme_get_sta_keep_alive_period(hdd_ctx->psoc, &req.timePeriod);
-	req.sessionId = adapter->session_id;
+	req.sessionId = adapter->vdev_id;
 
 	hdd_debug("Setting gratuitous ARP keepalive; ipv4_addr:%u.%u.%u.%u",
 		 req.hostIpv4Addr[0], req.hostIpv4Addr[1],
@@ -783,7 +783,7 @@ static void __hdd_ipv4_notifier_work_queue(struct work_struct *work)
 
 	ifa = hdd_lookup_ifaddr(adapter);
 	if (ifa && hdd_ctx->is_fils_roaming_supported)
-		sme_send_hlp_ie_info(hdd_ctx->mac_handle, adapter->session_id,
+		sme_send_hlp_ie_info(hdd_ctx->mac_handle, adapter->vdev_id,
 				     roam_profile, ifa->ifa_local);
 exit:
 	hdd_exit();
@@ -842,7 +842,7 @@ static int __wlan_hdd_ipv4_changed(struct notifier_block *nb,
 			goto exit;
 		}
 		hdd_debug("invoking sme_dhcp_done_ind");
-		sme_dhcp_done_ind(hdd_ctx->mac_handle, adapter->session_id);
+		sme_dhcp_done_ind(hdd_ctx->mac_handle, adapter->vdev_id);
 
 		if (!ucfg_pmo_is_arp_offload_enabled(hdd_ctx->psoc)) {
 			hdd_debug("Offload not enabled");
@@ -918,7 +918,7 @@ void hdd_enable_arp_offload(struct hdd_adapter *adapter,
 		goto out;
 
 	arp_req->psoc = psoc;
-	arp_req->vdev_id = adapter->session_id;
+	arp_req->vdev_id = adapter->vdev_id;
 	arp_req->trigger = trigger;
 
 	ifa = hdd_get_ipv4_local_interface(adapter);
@@ -989,7 +989,7 @@ void hdd_enable_mc_addr_filtering(struct hdd_adapter *adapter,
 		goto out;
 
 	status = ucfg_pmo_enable_mc_addr_filtering_in_fwr(hdd_ctx->psoc,
-							  adapter->session_id,
+							  adapter->vdev_id,
 							  trigger);
 	if (QDF_IS_STATUS_ERROR(status))
 		hdd_err("failed to enable mc list; status:%d", status);
@@ -1013,7 +1013,7 @@ void hdd_disable_mc_addr_filtering(struct hdd_adapter *adapter,
 		goto out;
 
 	status = ucfg_pmo_disable_mc_addr_filtering_in_fwr(hdd_ctx->psoc,
-							   adapter->session_id,
+							   adapter->vdev_id,
 							   trigger);
 	if (QDF_IS_STATUS_ERROR(status))
 		hdd_err("failed to disable mc list; status:%d", status);
@@ -1046,14 +1046,14 @@ void hdd_disable_and_flush_mc_addr_list(struct hdd_adapter *adapter,
 
 	/* disable mc list first because the mc list is cached in PMO */
 	status = ucfg_pmo_disable_mc_addr_filtering_in_fwr(hdd_ctx->psoc,
-							   adapter->session_id,
+							   adapter->vdev_id,
 							   trigger);
 	if (QDF_IS_STATUS_ERROR(status))
 		hdd_err("failed to disable mc list; status:%d", status);
 
 flush_mc_list:
 	status = ucfg_pmo_flush_mc_addr_list(hdd_ctx->psoc,
-					     adapter->session_id);
+					     adapter->vdev_id);
 	if (QDF_IS_STATUS_ERROR(status))
 		hdd_err("failed to flush mc list; status:%d", status);
 
@@ -1080,7 +1080,7 @@ static void hdd_update_conn_state_mask(struct hdd_adapter *adapter,
 
 	if (connState == eConnectionState_Associated ||
 			connState == eConnectionState_IbssConnected)
-		*conn_state_mask |= (1 << adapter->session_id);
+		*conn_state_mask |= (1 << adapter->vdev_id);
 }
 
 /**
@@ -1113,7 +1113,7 @@ hdd_suspend_wlan(void)
 	}
 
 	hdd_for_each_adapter(hdd_ctx, adapter) {
-		if (wlan_hdd_validate_session_id(adapter->session_id))
+		if (wlan_hdd_validate_session_id(adapter->vdev_id))
 			continue;
 
 		/* stop all TX queues before suspend */
@@ -1172,7 +1172,7 @@ static int hdd_resume_wlan(void)
 
 	/*loop through all adapters. Concurrency */
 	hdd_for_each_adapter(hdd_ctx, adapter) {
-		if (wlan_hdd_validate_session_id(adapter->session_id))
+		if (wlan_hdd_validate_session_id(adapter->vdev_id))
 			continue;
 
 		/* Disable supported OffLoads */
@@ -1343,7 +1343,7 @@ static void hdd_send_default_scan_ies(struct hdd_context *hdd_ctx)
 		    adapter->device_mode == QDF_P2P_DEVICE_MODE) &&
 		    adapter->scan_info.default_scan_ies) {
 			sme_set_default_scan_ie(hdd_ctx->mac_handle,
-				      adapter->session_id,
+				      adapter->vdev_id,
 				      adapter->scan_info.default_scan_ies,
 				      adapter->scan_info.default_scan_ies_len);
 		}
@@ -1492,7 +1492,7 @@ int wlan_hdd_set_powersave(struct hdd_adapter *adapter,
 		    QDF_P2P_CLIENT_MODE == adapter->device_mode) {
 			hdd_debug("Disabling Auto Power save timer");
 			status = sme_ps_disable_auto_ps_timer(mac_handle,
-						adapter->session_id);
+						adapter->vdev_id);
 			if (status != QDF_STATUS_SUCCESS)
 				goto end;
 		}
@@ -1507,13 +1507,13 @@ int wlan_hdd_set_powersave(struct hdd_adapter *adapter,
 			 */
 			if (timeout) {
 				status = sme_ps_enable_auto_ps_timer(mac_handle,
-							    adapter->session_id,
+							    adapter->vdev_id,
 							    timeout);
 				if (status != QDF_STATUS_SUCCESS)
 					goto end;
 			} else {
 				status = sme_ps_enable_disable(mac_handle,
-						adapter->session_id,
+						adapter->vdev_id,
 						SME_PS_ENABLE);
 				if (status != QDF_STATUS_SUCCESS)
 					goto end;
@@ -1529,7 +1529,7 @@ int wlan_hdd_set_powersave(struct hdd_adapter *adapter,
 		 * this means we are disconnected
 		 */
 		status = sme_ps_disable_auto_ps_timer(mac_handle,
-					adapter->session_id);
+					adapter->vdev_id);
 
 		if (status != QDF_STATUS_SUCCESS)
 			goto end;
@@ -1537,7 +1537,7 @@ int wlan_hdd_set_powersave(struct hdd_adapter *adapter,
 		ucfg_mlme_is_bmps_enabled(hdd_ctx->psoc, &is_bmps_enabled);
 		if (is_bmps_enabled)
 			status = sme_ps_enable_disable(mac_handle,
-						       adapter->session_id,
+						       adapter->vdev_id,
 						       SME_PS_DISABLE);
 	}
 
@@ -1733,7 +1733,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy,
 	 * until CAC is done for a SoftAP which is in started state.
 	 */
 	hdd_for_each_adapter(hdd_ctx, adapter) {
-		if (wlan_hdd_validate_session_id(adapter->session_id))
+		if (wlan_hdd_validate_session_id(adapter->vdev_id))
 			continue;
 
 		if (QDF_SAP_MODE == adapter->device_mode) {
@@ -1774,7 +1774,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy,
 		scan_info = &adapter->scan_info;
 
 		if (sme_neighbor_middle_of_roaming(mac_handle,
-		    adapter->session_id) ||
+		    adapter->vdev_id) ||
 		    hdd_is_roaming_in_progress(hdd_ctx)) {
 			hdd_err("Roaming in progress, do not allow suspend");
 			wlan_hdd_inc_suspend_stats(hdd_ctx,
@@ -1783,15 +1783,15 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy,
 		}
 
 		wlan_abort_scan(hdd_ctx->pdev, INVAL_PDEV_ID,
-				adapter->session_id, INVALID_SCAN_ID, false);
+				adapter->vdev_id, INVALID_SCAN_ID, false);
 	}
 
 	/* flush any pending powersave timers */
 	hdd_for_each_adapter(hdd_ctx, adapter) {
-		if (wlan_hdd_validate_session_id(adapter->session_id))
+		if (wlan_hdd_validate_session_id(adapter->vdev_id))
 			continue;
 
-		sme_ps_timer_flush_sync(mac_handle, adapter->session_id);
+		sme_ps_timer_flush_sync(mac_handle, adapter->vdev_id);
 	}
 
 	/*
@@ -1893,7 +1893,7 @@ static void hdd_stop_dhcp_ind(struct hdd_adapter *adapter)
 	hdd_debug("DHCP stop indicated through power save");
 	sme_dhcp_stop_ind(hdd_ctx->mac_handle, adapter->device_mode,
 			  adapter->mac_addr.bytes,
-			  adapter->session_id);
+			  adapter->vdev_id);
 	hdd_allow_suspend(WIFI_POWER_EVENT_WAKELOCK_DHCP);
 	qdf_runtime_pm_allow_suspend(&hdd_ctx->runtime_context.connect);
 }
@@ -1917,7 +1917,7 @@ static void hdd_start_dhcp_ind(struct hdd_adapter *adapter)
 				    WIFI_POWER_EVENT_WAKELOCK_DHCP);
 	sme_dhcp_start_ind(hdd_ctx->mac_handle, adapter->device_mode,
 			   adapter->mac_addr.bytes,
-			   adapter->session_id);
+			   adapter->vdev_id);
 }
 
 /**
@@ -1951,12 +1951,12 @@ static int __wlan_hdd_cfg80211_set_power_mgmt(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->session_id))
+	if (wlan_hdd_validate_session_id(adapter->vdev_id))
 		return -EINVAL;
 
 	qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
 		   TRACE_CODE_HDD_CFG80211_SET_POWER_MGMT,
-		   adapter->session_id, timeout);
+		   adapter->vdev_id, timeout);
 
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	status = wlan_hdd_validate_context(hdd_ctx);
@@ -2146,7 +2146,7 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy,
 		return status;
 
 	/* Validate adapter sessionId */
-	status = wlan_hdd_validate_session_id(adapter->session_id);
+	status = wlan_hdd_validate_session_id(adapter->vdev_id);
 	if (status)
 		return status;
 
@@ -2172,7 +2172,7 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy,
 
 	qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
 		   TRACE_CODE_HDD_CFG80211_GET_TXPOWER,
-		   adapter->session_id, adapter->device_mode);
+		   adapter->vdev_id, adapter->device_mode);
 
 	wlan_hdd_get_tx_power(adapter, dbm);
 	hdd_debug("power: %d", *dbm);
@@ -2231,7 +2231,7 @@ int hdd_set_qpower_config(struct hdd_context *hddctx,
 			qpower = PS_LEGACY_DEEPSLEEP;
 		hdd_info("Qpower disabled, %d", qpower);
 	}
-	status = wma_set_qpower_config(adapter->session_id, qpower);
+	status = wma_set_qpower_config(adapter->vdev_id, qpower);
 	if (status != QDF_STATUS_SUCCESS) {
 		hdd_err("failed to configure qpower: %d", status);
 		return -EINVAL;

core/hdd/src/wlan_hdd_regulatory.c

@@ -812,7 +812,7 @@ int hdd_reg_set_band(struct net_device *dev, u8 ui_band)
 	mac_handle = hdd_ctx->mac_handle;
 	hdd_for_each_adapter(hdd_ctx, adapter) {
 		wlan_abort_scan(hdd_ctx->pdev, INVAL_PDEV_ID,
-				adapter->session_id, INVALID_SCAN_ID, false);
+				adapter->vdev_id, INVALID_SCAN_ID, false);
 		connectedBand = hdd_conn_get_connected_band(
 				WLAN_HDD_GET_STATION_CTX_PTR(adapter));
 
@@ -837,7 +837,7 @@ int hdd_reg_set_band(struct net_device *dev, u8 ui_band)
 
 			status = sme_roam_disconnect(
 					mac_handle,
-					adapter->session_id,
+					adapter->vdev_id,
 					eCSR_DISCONNECT_REASON_UNSPECIFIED);
 
 			if (QDF_STATUS_SUCCESS != status) {

core/hdd/src/wlan_hdd_sap_cond_chan_switch.c

@@ -331,7 +331,7 @@ int wlan_hdd_request_pre_cac(uint8_t channel)
 	 */
 	status = policy_mgr_update_and_wait_for_connection_update(
 					hdd_ctx->psoc,
-					ap_adapter->session_id,
+					ap_adapter->vdev_id,
 					pre_cac_chan,
 					POLICY_MGR_UPDATE_REASON_PRE_CAC);
 	if (QDF_IS_STATUS_ERROR(status)) {

core/hdd/src/wlan_hdd_scan.c

@@ -481,7 +481,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->session_id))
+	if (wlan_hdd_validate_session_id(adapter->vdev_id))
 		return -EINVAL;
 
 	status = wlan_hdd_validate_context(hdd_ctx);
@@ -490,9 +490,9 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
 
 	qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
 		   TRACE_CODE_HDD_CFG80211_SCAN,
-		   adapter->session_id, request->n_channels);
+		   adapter->vdev_id, request->n_channels);
 
-	if (!sme_is_session_id_valid(hdd_ctx->mac_handle, adapter->session_id))
+	if (!sme_is_session_id_valid(hdd_ctx->mac_handle, adapter->vdev_id))
 		return -EINVAL;
 
 	qdf_status = ucfg_mlme_get_self_recovery(hdd_ctx->psoc, &self_recovery);
@@ -1243,7 +1243,7 @@ int wlan_hdd_scan_abort(struct hdd_adapter *adapter)
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
 	wlan_abort_scan(hdd_ctx->pdev, INVAL_PDEV_ID,
-			adapter->session_id, INVALID_SCAN_ID, true);
+			adapter->vdev_id, INVALID_SCAN_ID, true);
 
 	return 0;
 }
@@ -1277,7 +1277,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->session_id))
+	if (wlan_hdd_validate_session_id(adapter->vdev_id))
 		return -EINVAL;
 
 	if (adapter->device_mode != QDF_STA_MODE) {
@@ -1352,7 +1352,7 @@ int wlan_hdd_sched_scan_stop(struct net_device *dev)
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->session_id))
+	if (wlan_hdd_validate_session_id(adapter->vdev_id))
 		return -EINVAL;
 
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
@@ -1495,7 +1495,7 @@ static void __wlan_hdd_cfg80211_abort_scan(struct wiphy *wiphy,
 		return;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->session_id))
+	if (wlan_hdd_validate_session_id(adapter->vdev_id))
 		return;
 
 	ret = wlan_hdd_validate_context(hdd_ctx);

core/hdd/src/wlan_hdd_spectralscan.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-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
@@ -69,7 +69,7 @@ static int __wlan_hdd_cfg80211_spectral_scan_start(struct wiphy *wiphy,
 	}
 
 	adapter = WLAN_HDD_GET_PRIV_PTR(dev);
-	if (wlan_hdd_validate_session_id(adapter->session_id))
+	if (wlan_hdd_validate_session_id(adapter->vdev_id))
 		return -EINVAL;
 
 	ret = wlan_cfg80211_spectral_scan_config_and_start(wiphy,

core/hdd/src/wlan_hdd_subnet_detect.c

@@ -147,7 +147,7 @@ static int __wlan_hdd_cfg80211_set_gateway_params(struct wiphy *wiphy,
 
 	req.max_retries = 3;
 	req.timeout = 100;   /* in milliseconds */
-	req.session_id = adapter->session_id;
+	req.session_id = adapter->vdev_id;
 
 	hdd_debug("Configuring gateway for session %d", req.session_id);
 	hdd_debug("mac:%pM, ipv4:%pI4 (type %d), ipv6:%pI6c (type %d)",

core/hdd/src/wlan_hdd_sysfs.c

@@ -363,7 +363,7 @@ static ssize_t __show_beacon_reception_stats(struct device *dev, char *buf)
 	cookie = osif_request_cookie(request);
 
 	status = sme_beacon_debug_stats_req(hdd_ctx->mac_handle,
-					    adapter->session_id,
+					    adapter->vdev_id,
 					   hdd_beacon_debugstats_cb,
 					   cookie);
 	if (QDF_IS_STATUS_ERROR(status)) {

core/hdd/src/wlan_hdd_tdls.c

@@ -472,12 +472,12 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->session_id))
+	if (wlan_hdd_validate_session_id(adapter->vdev_id))
 		return -EINVAL;
 
 	qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
 		   TRACE_CODE_HDD_CFG80211_TDLS_MGMT,
-		   adapter->session_id, action_code);
+		   adapter->vdev_id, action_code);
 
 	if (wlan_hdd_validate_context(hdd_ctx))
 		return -EINVAL;
@@ -623,7 +623,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->session_id))
+	if (wlan_hdd_validate_session_id(adapter->vdev_id))
 		return -EINVAL;
 
 	cfg_tdls_get_support_enable(hdd_ctx->psoc, &tdls_support);
@@ -635,7 +635,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
 
 	qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
 		   TRACE_CODE_HDD_CFG80211_TDLS_OPER,
-		   adapter->session_id, oper);
+		   adapter->vdev_id, oper);
 
 	if (NULL == peer) {
 		hdd_err("Invalid arguments");

core/hdd/src/wlan_hdd_tsf.c

@@ -204,8 +204,8 @@ static int hdd_tsf_reset_gpio(struct hdd_adapter *adapter)
 {
 	int ret;
 
-	ret = wma_cli_set_command((int)adapter->session_id,
-			(int)GEN_PARAM_RESET_TSF_GPIO, adapter->session_id,
+	ret = wma_cli_set_command((int)adapter->vdev_id,
+			(int)GEN_PARAM_RESET_TSF_GPIO, adapter->vdev_id,
 			GEN_CMD);
 
 	if (ret != 0) {
@@ -296,9 +296,9 @@ static enum hdd_tsf_op_result hdd_capture_tsf_internal(
 
 	buf[0] = TSF_RETURN;
 	init_completion(&tsf_sync_get_completion_evt);
-	ret = wma_cli_set_command((int)adapter->session_id,
+	ret = wma_cli_set_command((int)adapter->vdev_id,
 				  (int)GEN_PARAM_CAPTURE_TSF,
-				  adapter->session_id, GEN_CMD);
+				  adapter->vdev_id, GEN_CMD);
 	if (QDF_STATUS_SUCCESS != ret) {
 		hdd_err("cap tsf fail");
 		buf[0] = TSF_CAPTURE_FAIL;

core/hdd/src/wlan_hdd_wmm.c

@@ -162,7 +162,7 @@ static void hdd_wmm_enable_tl_uapsd(struct hdd_wmm_qos_context *pQosContext)
 					   pAc->wmmAcTspecInfo.ts_info.tid,
 					   pAc->wmmAcTspecInfo.ts_info.up,
 					   service_interval, suspension_interval,
-					   direction, psb, adapter->session_id,
+					   direction, psb, adapter->vdev_id,
 					   hdd_ctx->config->DelayedTriggerFrmInt);
 
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
@@ -201,7 +201,7 @@ static void hdd_wmm_disable_tl_uapsd(struct hdd_wmm_qos_context *pQosContext)
 		status =
 			sme_disable_uapsd_for_ac((WLAN_HDD_GET_STATION_CTX_PTR
 							     (adapter))->conn_info.staId[0],
-						    acType, adapter->session_id);
+						    acType, adapter->vdev_id);
 
 		if (!QDF_IS_STATUS_SUCCESS(status)) {
 			hdd_err("Failed to disable U-APSD for AC=%d", acType);
@@ -1370,7 +1370,7 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work)
 	if (qosInfo.ts_info.ack_policy ==
 	    SME_QOS_WMM_TS_ACK_POLICY_HT_IMMEDIATE_BLOCK_ACK) {
 		if (!sme_qos_is_ts_info_ack_policy_valid(mac_handle, &qosInfo,
-							 adapter->session_id)) {
+							 adapter->vdev_id)) {
 			qosInfo.ts_info.ack_policy =
 				SME_QOS_WMM_TS_ACK_POLICY_NORMAL_ACK;
 		}
@@ -1382,7 +1382,7 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work)
 
 #ifndef WLAN_MDM_CODE_REDUCTION_OPT
 	smeStatus = sme_qos_setup_req(mac_handle,
-				      adapter->session_id,
+				      adapter->vdev_id,
 				      &qosInfo,
 				      hdd_wmm_sme_callback,
 				      pQosContext,
@@ -2051,7 +2051,7 @@ QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *adapter,
 				adapter))->conn_info.staId[0],
 				SME_AC_VO, 7, 7, srv_value, sus_value,
 				SME_QOS_WMM_TS_DIR_BOTH, 1,
-				adapter->session_id,
+				adapter->vdev_id,
 				hdd_ctx->config->DelayedTriggerFrmInt);
 
 		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(status));
@@ -2076,7 +2076,7 @@ QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *adapter,
 				adapter))->conn_info.staId[0],
 				SME_AC_VI, 5, 5, srv_value, sus_value,
 				SME_QOS_WMM_TS_DIR_BOTH, 1,
-				adapter->session_id,
+				adapter->vdev_id,
 				hdd_ctx->config->DelayedTriggerFrmInt);
 
 		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(status));
@@ -2101,7 +2101,7 @@ QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *adapter,
 				adapter))->conn_info.staId[0],
 				SME_AC_BK, 2, 2, srv_value, sus_value,
 				SME_QOS_WMM_TS_DIR_BOTH, 1,
-				adapter->session_id,
+				adapter->vdev_id,
 				hdd_ctx->config->DelayedTriggerFrmInt);
 
 		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(status));
@@ -2126,7 +2126,7 @@ QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *adapter,
 				adapter))->conn_info.staId[0],
 				SME_AC_BE, 3, 3, srv_value, sus_value,
 				SME_QOS_WMM_TS_DIR_BOTH, 1,
-				adapter->session_id,
+				adapter->vdev_id,
 				hdd_ctx->config->DelayedTriggerFrmInt);
 
 		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(status));
@@ -2134,7 +2134,7 @@ QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *adapter,
 
 	status = sme_update_dsc_pto_up_mapping(hdd_ctx->mac_handle,
 					       adapter->dscp_to_up_map,
-					       adapter->session_id);
+					       adapter->vdev_id);
 
 	if (!QDF_IS_STATUS_SUCCESS(status))
 		hdd_wmm_init(adapter);
@@ -2214,7 +2214,7 @@ QDF_STATUS hdd_wmm_connect(struct hdd_adapter *adapter,
 			if (!roam_info->fReassocReq &&
 			    !sme_neighbor_roam_is11r_assoc(
 						mac_handle,
-						adapter->session_id) &&
+						adapter->vdev_id) &&
 			    !sme_roam_is_ese_assoc(roam_info)) {
 				adapter->hdd_wmm_status.wmmAcStatus[ac].
 					wmmAcTspecValid = false;
@@ -2396,7 +2396,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(struct hdd_adapter *adapter,
 
 #ifndef WLAN_MDM_CODE_REDUCTION_OPT
 	smeStatus = sme_qos_setup_req(mac_handle,
-				      adapter->session_id,
+				      adapter->vdev_id,
 				      pTspec,
 				      hdd_wmm_sme_callback,
 				      pQosContext,
@@ -2509,7 +2509,7 @@ hdd_wlan_wmm_status_e hdd_wmm_delts(struct hdd_adapter *adapter,
 		 handle, qosFlowId, acType, pQosContext);
 
 #ifndef WLAN_MDM_CODE_REDUCTION_OPT
-	smeStatus = sme_qos_release_req(mac_handle, adapter->session_id,
+	smeStatus = sme_qos_release_req(mac_handle, adapter->vdev_id,
 					qosFlowId);
 
 	hdd_debug("SME flow %d released, SME status %d", qosFlowId, smeStatus);

core/hdd/src/wlan_hdd_wowl.c

@@ -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
@@ -104,7 +104,7 @@ bool hdd_add_wowl_ptrn(struct hdd_adapter *adapter, const char *ptrn)
 	int i, empty_slot, len, offset;
 	QDF_STATUS status;
 	const char *temp;
-	uint8_t sessionId = adapter->session_id;
+	uint8_t sessionId = adapter->vdev_id;
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	uint8_t num_filters;
 	bool invalid_ptrn = false;
@@ -321,7 +321,7 @@ bool hdd_add_wowl_ptrn_debugfs(struct hdd_adapter *adapter, uint8_t pattern_idx,
 {
 	struct pmo_wow_add_pattern localPattern;
 	QDF_STATUS qdf_ret_status;
-	uint8_t session_id = adapter->session_id;
+	uint8_t session_id = adapter->vdev_id;
 	uint16_t pattern_len, mask_len, i;
 
 	if (pattern_idx > (WOWL_MAX_PTRNS_ALLOWED - 1)) {