qcacld-3.0: Replace session_id with vdev_id in hdd_adapter (4/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_assoc.c
- wlan_hdd_hostapd_wext.c
- wlan_hdd_softap_tx_rx.c
- wlan_hdd_stats.c
- wlan_hdd_tx_power.c
- wlan_hdd_tx_rx.c

Change-Id: I8f35530e6c9331c57f6c2ef0245b324b9a96ef20
CRs-Fixed: 2393155

core/hdd/src/wlan_hdd_assoc.c

@@ -383,15 +383,15 @@ struct hdd_adapter *hdd_get_sta_connection_in_progress(
 			if (eConnectionState_Connecting ==
 			    hdd_sta_ctx->conn_info.connState) {
 				hdd_debug("vdev_id %d: Connection is in progress",
-					  adapter->session_id);
+					  adapter->vdev_id);
 				return adapter;
 			} else if ((eConnectionState_Associated ==
 				   hdd_sta_ctx->conn_info.connState) &&
 				   sme_is_sta_key_exchange_in_progress(
 							hdd_ctx->mac_handle,
-							adapter->session_id)) {
+							adapter->vdev_id)) {
 				hdd_debug("vdev_id %d: Key exchange is in progress",
-					  adapter->session_id);
+					  adapter->vdev_id);
 				return adapter;
 			}
 		}
@@ -407,7 +407,7 @@ void hdd_abort_ongoing_sta_connection(struct hdd_context *hdd_ctx)
 	sta_adapter = hdd_get_sta_connection_in_progress(hdd_ctx);
 	if (sta_adapter) {
 		hdd_debug("Disconnecting STA on vdev: %d",
-			  sta_adapter->session_id);
+			  sta_adapter->vdev_id);
 		status = wlan_hdd_disconnect(sta_adapter,
 					     eCSR_DISCONNECT_REASON_DEAUTH);
 		if (QDF_IS_STATUS_ERROR(status)) {
@@ -429,7 +429,7 @@ static int hdd_remove_beacon_filter(struct hdd_adapter *adapter)
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
 	status = sme_remove_beacon_filter(hdd_ctx->mac_handle,
-					  adapter->session_id);
+					  adapter->vdev_id);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		hdd_err("sme_remove_beacon_filter() failed");
 		return -EFAULT;
@@ -456,7 +456,7 @@ static int hdd_add_beacon_filter(struct hdd_adapter *adapter)
 				(unsigned long int *)ie_map);
 
 	status = sme_add_beacon_filter(hdd_ctx->mac_handle,
-				       adapter->session_id, ie_map);
+				       adapter->vdev_id, ie_map);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		hdd_err("sme_add_beacon_filter() failed");
 		return -EFAULT;
@@ -1135,7 +1135,7 @@ static void hdd_send_ft_event(struct hdd_adapter *adapter)
 	qdf_mem_zero(ftIe, DOT11F_IE_FTINFO_MAX_LEN);
 	qdf_mem_zero(ricIe, DOT11F_IE_RICDESCRIPTOR_MAX_LEN);
 
-	sme_get_rici_es(mac_handle, adapter->session_id, (u8 *) ricIe,
+	sme_get_rici_es(mac_handle, adapter->vdev_id, (u8 *) ricIe,
 			DOT11F_IE_RICDESCRIPTOR_MAX_LEN, &ric_ies_length);
 	if (ric_ies_length == 0)
 		hdd_warn("Do not send RIC IEs as length is 0");
@@ -1144,7 +1144,7 @@ static void hdd_send_ft_event(struct hdd_adapter *adapter)
 	ftEvent.ric_ies_len = ric_ies_length;
 	hdd_debug("RIC IEs is of length %d", (int)ric_ies_length);
 
-	sme_get_ft_pre_auth_response(mac_handle, adapter->session_id,
+	sme_get_ft_pre_auth_response(mac_handle, adapter->vdev_id,
 				     (u8 *) ftIe, DOT11F_IE_FTINFO_MAX_LEN,
 				     &auth_resp_len);
 
@@ -1153,7 +1153,7 @@ static void hdd_send_ft_event(struct hdd_adapter *adapter)
 		return;
 	}
 
-	sme_set_ft_pre_auth_state(mac_handle, adapter->session_id, true);
+	sme_set_ft_pre_auth_state(mac_handle, adapter->vdev_id, true);
 
 	ftEvent.target_ap = ftIe;
 
@@ -1177,7 +1177,7 @@ static void hdd_send_ft_event(struct hdd_adapter *adapter)
 
 	/* Sme needs to send the RIC IEs first */
 	str_len = strlcpy(buff, "RIC=", IW_CUSTOM_MAX);
-	sme_get_rici_es(mac_handle, adapter->session_id,
+	sme_get_rici_es(mac_handle, adapter->vdev_id,
 			(u8 *) &(buff[str_len]), (IW_CUSTOM_MAX - str_len),
 			&ric_ies_length);
 	if (ric_ies_length == 0) {
@@ -1190,7 +1190,7 @@ static void hdd_send_ft_event(struct hdd_adapter *adapter)
 	/* Sme needs to provide the Auth Resp */
 	qdf_mem_zero(buff, IW_CUSTOM_MAX);
 	str_len = strlcpy(buff, "AUTH=", IW_CUSTOM_MAX);
-	sme_get_ft_pre_auth_response(mac_handle, adapter->session_id,
+	sme_get_ft_pre_auth_response(mac_handle, adapter->vdev_id,
 				     (u8 *) &buff[str_len],
 				     (IW_CUSTOM_MAX - str_len), &auth_resp_len);
 
@@ -1347,7 +1347,7 @@ static void hdd_send_association_event(struct net_device *dev,
 	if (NULL != pCsrRoamInfo)
 		if (pCsrRoamInfo->roamSynchInProgress) {
 			/* Update tdls module about the disconnection event */
-			hdd_notify_sta_disconnect(adapter->session_id,
+			hdd_notify_sta_disconnect(adapter->vdev_id,
 						 true, false,
 						 adapter->vdev);
 		}
@@ -1362,7 +1362,7 @@ static void hdd_send_association_event(struct net_device *dev,
 
 		if (!hdd_is_roam_sync_in_progress(pCsrRoamInfo)) {
 			policy_mgr_incr_active_session(hdd_ctx->psoc,
-				adapter->device_mode, adapter->session_id);
+				adapter->device_mode, adapter->vdev_id);
 			hdd_green_ap_start_state_mc(hdd_ctx,
 						    adapter->device_mode, true);
 		}
@@ -1420,12 +1420,12 @@ static void hdd_send_association_event(struct net_device *dev,
 		hdd_send_peer_status_ind_to_app(&peerMacAddr,
 						ePeerConnected,
 						pCsrRoamInfo->timingMeasCap,
-						adapter->session_id, &chan_info,
+						adapter->vdev_id, &chan_info,
 						adapter->device_mode);
 
 #ifdef FEATURE_WLAN_TDLS
 		/* Update tdls module about connection event */
-		hdd_notify_sta_connect(adapter->session_id,
+		hdd_notify_sta_connect(adapter->vdev_id,
 				       pCsrRoamInfo->tdls_chan_swit_prohibited,
 				       pCsrRoamInfo->tdls_prohibited,
 				       adapter->vdev);
@@ -1437,7 +1437,7 @@ static void hdd_send_association_event(struct net_device *dev,
 		adapter->prev_tx_packets = adapter->stats.tx_packets;
 		adapter->prev_rx_packets = adapter->stats.rx_packets;
 		cdp_get_intra_bss_fwd_pkts_count(
-			cds_get_context(QDF_MODULE_ID_SOC), adapter->session_id,
+			cds_get_context(QDF_MODULE_ID_SOC), adapter->vdev_id,
 			&adapter->prev_fwd_tx_packets,
 			&adapter->prev_fwd_rx_packets);
 		spin_unlock_bh(&hdd_ctx->bus_bw_lock);
@@ -1446,7 +1446,7 @@ static void hdd_send_association_event(struct net_device *dev,
 	} else if (eConnectionState_IbssConnected ==    /* IBss Associated */
 			sta_ctx->conn_info.connState) {
 		policy_mgr_update_connection_info(hdd_ctx->psoc,
-				adapter->session_id);
+				adapter->vdev_id);
 		memcpy(wrqu.ap_addr.sa_data, sta_ctx->conn_info.bssId.bytes,
 				ETH_ALEN);
 		hdd_debug("wlan: new IBSS peer connection to BSSID " MAC_ADDRESS_STR,
@@ -1455,7 +1455,7 @@ static void hdd_send_association_event(struct net_device *dev,
 		hdd_debug("wlan: disconnected");
 		memset(wrqu.ap_addr.sa_data, '\0', ETH_ALEN);
 		policy_mgr_decr_session_set_pcl(hdd_ctx->psoc,
-				adapter->device_mode, adapter->session_id);
+				adapter->device_mode, adapter->vdev_id);
 		hdd_green_ap_start_state_mc(hdd_ctx, adapter->device_mode,
 					    false);
 
@@ -1471,14 +1471,14 @@ static void hdd_send_association_event(struct net_device *dev,
 			/* send peer status indication to oem app */
 			hdd_send_peer_status_ind_to_app(&peerMacAddr,
 							ePeerDisconnected, 0,
-							adapter->session_id,
+							adapter->vdev_id,
 							NULL,
 							adapter->device_mode);
 		}
 
 		hdd_lpass_notify_disconnect(adapter);
 		/* Update tdls module about the disconnection event */
-		hdd_notify_sta_disconnect(adapter->session_id,
+		hdd_notify_sta_disconnect(adapter->vdev_id,
 					  false,
 					  false,
 					  adapter->vdev);
@@ -1723,7 +1723,7 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
 		ucfg_ipa_wlan_evt(hdd_ctx->pdev, adapter->dev,
 				  adapter->device_mode,
 				  sta_ctx->conn_info.staId[0],
-				  adapter->session_id,
+				  adapter->vdev_id,
 				  WLAN_IPA_STA_DISCONNECT,
 				  sta_ctx->conn_info.bssId.bytes);
 
@@ -1732,7 +1732,7 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
 #endif
 
 	DPTRACE(qdf_dp_trace_mgmt_pkt(QDF_DP_TRACE_MGMT_PACKET_RECORD,
-				adapter->session_id,
+				adapter->vdev_id,
 				QDF_TRACE_DEFAULT_PDEV_ID,
 				QDF_PROTO_TYPE_MGMT, QDF_PROTO_MGMT_DISASSOC));
 
@@ -1800,7 +1800,7 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
 
 	hdd_wmm_adapter_clear(adapter);
 	mac_handle = hdd_ctx->mac_handle;
-	sme_ft_reset(mac_handle, adapter->session_id);
+	sme_ft_reset(mac_handle, adapter->vdev_id);
 	if (hdd_remove_beacon_filter(adapter) != 0)
 		hdd_err("hdd_remove_beacon_filter() failed");
 
@@ -1877,7 +1877,7 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
 	if ((QDF_STA_MODE == adapter->device_mode) ||
 	    (QDF_P2P_CLIENT_MODE == adapter->device_mode)) {
 		sme_ps_disable_auto_ps_timer(mac_handle,
-					     adapter->session_id);
+					     adapter->vdev_id);
 		adapter->send_mode_change = true;
 	}
 	wlan_hdd_clear_link_layer_stats(adapter);
@@ -1984,7 +1984,7 @@ QDF_STATUS hdd_change_peer_state(struct hdd_adapter *adapter,
 
 		err = sme_set_peer_authorized(peer_mac_addr,
 				hdd_set_peer_authorized_event,
-				adapter->session_id);
+				adapter->vdev_id);
 		if (err != QDF_STATUS_SUCCESS) {
 			hdd_err("Failed to set the peer state to authorized");
 			return QDF_STATUS_E_FAULT;
@@ -2116,7 +2116,7 @@ QDF_STATUS hdd_roam_register_sta(struct hdd_adapter *adapter,
 
 	adapter->txrx_vdev = (void *)cdp_get_vdev_from_vdev_id(soc,
 				(struct cdp_pdev *)pdev,
-				adapter->session_id);
+				adapter->vdev_id);
 	if (!adapter->txrx_vdev) {
 		hdd_err("%s find vdev fail", __func__);
 		return QDF_STATUS_E_FAILURE;
@@ -2334,7 +2334,7 @@ static void hdd_send_re_assoc_event(struct net_device *dev,
 	 */
 	if (!hdd_is_roam_sync_in_progress(pCsrRoamInfo)) {
 		policy_mgr_decr_session_set_pcl(hdd_ctx->psoc,
-				adapter->device_mode, adapter->session_id);
+				adapter->device_mode, adapter->vdev_id);
 		hdd_green_ap_start_state_mc(hdd_ctx, adapter->device_mode,
 					    false);
 	}
@@ -2354,7 +2354,7 @@ static void hdd_send_re_assoc_event(struct net_device *dev,
 							NL80211_BAND_5GHZ);
 	chan = ieee80211_get_channel(adapter->wdev.wiphy, freq);
 
-	sme_roam_get_connect_profile(hdd_ctx->mac_handle, adapter->session_id,
+	sme_roam_get_connect_profile(hdd_ctx->mac_handle, adapter->vdev_id,
 				     &roam_profile);
 
 	bss = hdd_cfg80211_get_bss(adapter->wdev.wiphy,
@@ -2512,7 +2512,7 @@ static int hdd_change_sta_state_authenticated(struct hdd_adapter *adapter,
 	if ((QDF_STA_MODE == adapter->device_mode) ||
 	    (QDF_P2P_CLIENT_MODE == adapter->device_mode)) {
 		sme_ps_enable_auto_ps_timer(hdd_ctx->mac_handle,
-					    adapter->session_id,
+					    adapter->vdev_id,
 					    timeout);
 	}
 
@@ -2584,7 +2584,7 @@ static void hdd_change_peer_state_after_set_key(struct hdd_adapter *adapter,
 		 * case of 11R roaming.
 		 */
 		if (sme_neighbor_roam_is11r_assoc(adapter->hdd_ctx->mac_handle,
-						  adapter->session_id))
+						  adapter->vdev_id))
 			hdd_sta_ctx->conn_info.ptk_installed = true;
 	} else {
 		hdd_sta_ctx->conn_info.ptk_installed = true;
@@ -2896,7 +2896,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 			ucfg_ipa_wlan_evt(hdd_ctx->pdev, adapter->dev,
 					  adapter->device_mode,
 					  roam_info->staId,
-					  adapter->session_id,
+					  adapter->vdev_id,
 					  WLAN_IPA_STA_CONNECT,
 					  roam_info->bssid.bytes);
 
@@ -2923,14 +2923,14 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 				hdd_err("Disconnecting...");
 				sme_roam_disconnect(
 					mac_handle,
-					adapter->session_id,
+					adapter->vdev_id,
 					eCSR_DISCONNECT_REASON_UNSPECIFIED);
 			}
 			return QDF_STATUS_E_FAILURE;
 		}
 
 		DPTRACE(qdf_dp_trace_mgmt_pkt(QDF_DP_TRACE_MGMT_PACKET_RECORD,
-			adapter->session_id,
+			adapter->vdev_id,
 			QDF_TRACE_DEFAULT_PDEV_ID,
 			QDF_PROTO_TYPE_MGMT, QDF_PROTO_MGMT_ASSOC));
 
@@ -2972,7 +2972,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 					hdd_debug("Disconnecting...");
 					sme_roam_disconnect(
 					   mac_handle,
-					   adapter->session_id,
+					   adapter->vdev_id,
 					   eCSR_DISCONNECT_REASON_UNSPECIFIED);
 				}
 				return QDF_STATUS_E_FAILURE;
@@ -3073,7 +3073,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 						policy_mgr_decr_session_set_pcl(
 							hdd_ctx->psoc,
 							adapter->device_mode,
-							adapter->session_id);
+							adapter->vdev_id);
 						hdd_green_ap_start_state_mc(
 							hdd_ctx,
 							adapter->device_mode,
@@ -3098,7 +3098,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 							pConnectedProfile->SSID.length);
 
 						cdp_hl_fc_set_td_limit(soc,
-						adapter->session_id,
+						adapter->vdev_id,
 						sta_ctx->
 						conn_info.operationChannel);
 
@@ -3120,10 +3120,10 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 					}
 					if (sme_get_ftptk_state
 						    (mac_handle,
-						    adapter->session_id)) {
+						    adapter->vdev_id)) {
 						sme_set_ftptk_state
 							(mac_handle,
-							adapter->session_id,
+							adapter->vdev_id,
 							false);
 						roam_info->fAuthRequired =
 							false;
@@ -3147,7 +3147,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 					hdd_debug("ft_carrier_on is %d, sending connect indication",
 						 ft_carrier_on);
 					cdp_hl_fc_set_td_limit(soc,
-					adapter->session_id,
+					adapter->vdev_id,
 					sta_ctx->conn_info.operationChannel);
 					hdd_connect_result(dev,
 							   roam_info->
@@ -3168,12 +3168,12 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 				 * connect result.
 				 */
 				sme_roam_get_wpa_rsn_req_ie(mac_handle,
-							    adapter->session_id,
+							    adapter->vdev_id,
 							    &reqRsnLength,
 							    reqRsnIe);
 
 				sme_roam_get_wpa_rsn_rsp_ie(mac_handle,
-							    adapter->session_id,
+							    adapter->vdev_id,
 							    &rspRsnLength,
 							    rspRsnIe);
 				if (!hddDisconInProgress) {
@@ -3206,7 +3206,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 								   roam_info->statusCode);
 					}
 					cdp_hl_fc_set_td_limit(soc,
-					adapter->session_id,
+					adapter->vdev_id,
 					sta_ctx->conn_info.operationChannel);
 				}
 			}
@@ -3239,11 +3239,11 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 			 */
 			sme_roam_get_wpa_rsn_req_ie(
 						mac_handle,
-						adapter->session_id,
+						adapter->vdev_id,
 						&reqRsnLength, reqRsnIe);
 
 			cdp_hl_fc_set_td_limit(soc,
-				adapter->session_id,
+				adapter->vdev_id,
 				sta_ctx->conn_info.operationChannel);
 			hdd_send_re_assoc_event(dev, adapter, roam_info,
 						reqRsnIe, reqRsnLength);
@@ -3579,13 +3579,13 @@ static void hdd_roam_ibss_indication_handler(struct hdd_adapter *adapter,
 		}
 		if (eCSR_ROAM_RESULT_IBSS_STARTED == roamResult) {
 			policy_mgr_incr_active_session(hdd_ctx->psoc,
-				adapter->device_mode, adapter->session_id);
+				adapter->device_mode, adapter->vdev_id);
 			hdd_green_ap_start_state_mc(hdd_ctx,
 						    adapter->device_mode, true);
 		} else if (eCSR_ROAM_RESULT_IBSS_JOIN_SUCCESS == roamResult ||
 				eCSR_ROAM_RESULT_IBSS_COALESCED == roamResult) {
 			policy_mgr_update_connection_info(hdd_ctx->psoc,
-					adapter->session_id);
+					adapter->vdev_id);
 		}
 		break;
 	}
@@ -3825,7 +3825,7 @@ static QDF_STATUS wlan_hdd_set_key_helper(struct hdd_adapter *adapter,
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
 	return sme_roam_set_key(hdd_ctx->mac_handle,
-				adapter->session_id,
+				adapter->vdev_id,
 				&sta_ctx->ibss_enc_key,
 				roam_id);
 }
@@ -4019,7 +4019,7 @@ QDF_STATUS hdd_roam_register_tdlssta(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);
 	adapter->tx_fn = txrx_ops.tx.tx;
@@ -4570,11 +4570,11 @@ static void hdd_roam_channel_switch_handler(struct hdd_adapter *adapter,
 	mac_handle_t mac_handle = hdd_adapter_get_mac_handle(adapter);
 
 	hdd_debug("channel switch for session:%d to channel:%d",
-		adapter->session_id, roam_info->chan_info.chan_id);
+		adapter->vdev_id, roam_info->chan_info.chan_id);
 
 	/* Enable Roaming on STA interface which was disabled before CSA */
 	if (adapter->device_mode == QDF_STA_MODE)
-		sme_start_roaming(mac_handle, adapter->session_id,
+		sme_start_roaming(mac_handle, adapter->vdev_id,
 				  REASON_DRIVER_ENABLED);
 
 	chan_change.chan = roam_info->chan_info.chan_id;
@@ -4602,7 +4602,7 @@ static void hdd_roam_channel_switch_handler(struct hdd_adapter *adapter,
 	policy_mgr_check_concurrent_intf_and_restart_sap(hdd_ctx->psoc);
 
 	status = policy_mgr_set_hw_mode_on_channel_switch(hdd_ctx->psoc,
-		adapter->session_id);
+		adapter->vdev_id);
 	if (QDF_IS_STATUS_ERROR(status))
 		hdd_debug("set hw mode change not done");
 }
@@ -4642,7 +4642,7 @@ hdd_sme_roam_callback(void *pContext, struct csr_roam_info *roam_info,
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_RX_SME_MSG,
-				 adapter->session_id, roamStatus));
+				 adapter->vdev_id, roamStatus));
 
 	switch (roamStatus) {
 	/*
@@ -4653,14 +4653,14 @@ hdd_sme_roam_callback(void *pContext, struct csr_roam_info *roam_info,
 	 */
 	case eCSR_ROAM_FT_REASSOC_FAILED:
 		hdd_err("Reassoc Failed with roamStatus: %d roamResult: %d SessionID: %d",
-			 roamStatus, roamResult, adapter->session_id);
+			 roamStatus, roamResult, adapter->vdev_id);
 		qdf_ret_status =
 			hdd_dis_connect_handler(adapter, roam_info, roamId,
 						roamStatus, roamResult);
 		sta_ctx->ft_carrier_on = false;
 		sta_ctx->hdd_reassoc_scenario = false;
 		hdd_debug("hdd_reassoc_scenario set to: %d, ReAssoc Failed, session: %d",
-			  sta_ctx->hdd_reassoc_scenario, adapter->session_id);
+			  sta_ctx->hdd_reassoc_scenario, adapter->vdev_id);
 		break;
 
 	case eCSR_ROAM_FT_START:
@@ -4686,7 +4686,7 @@ hdd_sme_roam_callback(void *pContext, struct csr_roam_info *roam_info,
 		sta_ctx->ft_carrier_on = true;
 		sta_ctx->hdd_reassoc_scenario = true;
 		hdd_debug("hdd_reassoc_scenario set to: %d, due to eCSR_ROAM_FT_START, session: %d",
-			  sta_ctx->hdd_reassoc_scenario, adapter->session_id);
+			  sta_ctx->hdd_reassoc_scenario, adapter->vdev_id);
 		break;
 	case eCSR_ROAM_NAPI_OFF:
 		hdd_debug("After Roam Synch Comp: NAPI Serialize OFF");
@@ -4802,7 +4802,7 @@ hdd_sme_roam_callback(void *pContext, struct csr_roam_info *roam_info,
 			sta_ctx->hdd_reassoc_scenario = false;
 			hdd_debug("hdd_reassoc_scenario set to: %d, set key complete, session: %d",
 				  sta_ctx->hdd_reassoc_scenario,
-				  adapter->session_id);
+				  adapter->vdev_id);
 		}
 	}
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
@@ -4964,10 +4964,10 @@ hdd_sme_roam_callback(void *pContext, struct csr_roam_info *roam_info,
 		if (roamResult == eCSR_ROAM_RESULT_NOT_ASSOCIATED) {
 			hdd_debug("Decrement session of disassociated AP device_mode %d sessionId %d",
 				  adapter->device_mode,
-				  adapter->session_id);
+				  adapter->vdev_id);
 			policy_mgr_decr_session_set_pcl(hdd_ctx->psoc,
 							adapter->device_mode,
-							adapter->session_id);
+							adapter->vdev_id);
 		}
 		break;
 

core/hdd/src/wlan_hdd_hostapd_wext.c

@@ -216,7 +216,7 @@ static int __iw_softap_set_two_ints_getnone(struct net_device *dev,
 	case QCSAP_PARAM_SET_TXRX_STATS:
 	{
 		ret = cds_get_datapath_handles(&soc, &pdev, &vdev,
-				 adapter->session_id);
+				 adapter->vdev_id);
 		if (ret != 0) {
 			hdd_err("Invalid Handles");
 			break;
@@ -253,7 +253,7 @@ static int __iw_softap_set_two_ints_getnone(struct net_device *dev,
 	case QCSAP_ENABLE_FW_PROFILE:
 		hdd_debug("QCSAP_ENABLE_FW_PROFILE: %d %d",
 		       value[1], value[2]);
-		ret = wma_cli_set2_command(adapter->session_id,
+		ret = wma_cli_set2_command(adapter->vdev_id,
 				 WMI_WLAN_PROFILE_ENABLE_PROFILE_ID_CMDID,
 					value[1], value[2], DBG_CMD);
 		break;
@@ -261,7 +261,7 @@ static int __iw_softap_set_two_ints_getnone(struct net_device *dev,
 	case QCSAP_SET_FW_PROFILE_HIST_INTVL:
 		hdd_debug("QCSAP_SET_FW_PROFILE_HIST_INTVL: %d %d",
 		       value[1], value[2]);
-		ret = wma_cli_set2_command(adapter->session_id,
+		ret = wma_cli_set2_command(adapter->vdev_id,
 					WMI_WLAN_PROFILE_SET_HIST_INTVL_CMDID,
 					value[1], value[2], DBG_CMD);
 		break;
@@ -280,7 +280,7 @@ static int __iw_softap_set_two_ints_getnone(struct net_device *dev,
 		hdd_info("QCSAP_SET_BA_AGEING_TIMEOUT: AC[%d] timeout[%d]",
 			 value[1], value[2]);
 		ret = cds_get_datapath_handles(&soc, &pdev, &vdev,
-					       adapter->session_id);
+					       adapter->vdev_id);
 		if (ret != 0) {
 			hdd_err("Invalid Handles");
 			break;
@@ -436,7 +436,7 @@ static int hdd_set_peer_rate(struct hdd_adapter *adapter, int set_value)
 	}
 
 	status = sme_set_peer_param(peer_mac, WMI_PEER_PARAM_FIXED_RATE,
-				    rc, adapter->session_id);
+				    rc, adapter->vdev_id);
 	if (status != QDF_STATUS_SUCCESS) {
 		hdd_err("Failed to set peer fixed rate - status: %d", status);
 		return -EIO;
@@ -567,7 +567,7 @@ static __iw_softap_setparam(struct net_device *dev,
 		wlan_hdd_disable_roaming(adapter);
 
 		status = sme_update_session_param(mac_handle,
-				adapter->session_id,
+				adapter->vdev_id,
 				SIR_PARAM_SSID_HIDDEN, set_value);
 		if (QDF_STATUS_SUCCESS != status) {
 			hdd_err("QCSAP_PARAM_HIDE_SSID failed");
@@ -606,7 +606,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCSAP_PARAM_SET_TXRX_FW_STATS:
 	{
 		hdd_debug("QCSAP_PARAM_SET_TXRX_FW_STATS val %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMA_VDEV_TXRX_FWSTATS_ENABLE_CMDID,
 					  set_value, VDEV_CMD);
 		break;
@@ -616,7 +616,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCSAP_DBGLOG_LOG_LEVEL:
 	{
 		hdd_debug("QCSAP_DBGLOG_LOG_LEVEL val %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_DBGLOG_LOG_LEVEL,
 					  set_value, DBG_CMD);
 		break;
@@ -625,7 +625,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCSAP_DBGLOG_VAP_ENABLE:
 	{
 		hdd_debug("QCSAP_DBGLOG_VAP_ENABLE val %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_DBGLOG_VAP_ENABLE,
 					  set_value, DBG_CMD);
 		break;
@@ -634,7 +634,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCSAP_DBGLOG_VAP_DISABLE:
 	{
 		hdd_debug("QCSAP_DBGLOG_VAP_DISABLE val %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_DBGLOG_VAP_DISABLE,
 					  set_value, DBG_CMD);
 		break;
@@ -643,7 +643,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCSAP_DBGLOG_MODULE_ENABLE:
 	{
 		hdd_debug("QCSAP_DBGLOG_MODULE_ENABLE val %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_DBGLOG_MODULE_ENABLE,
 					  set_value, DBG_CMD);
 		break;
@@ -652,7 +652,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCSAP_DBGLOG_MODULE_DISABLE:
 	{
 		hdd_debug("QCSAP_DBGLOG_MODULE_DISABLE val %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_DBGLOG_MODULE_DISABLE,
 					  set_value, DBG_CMD);
 		break;
@@ -661,7 +661,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCSAP_DBGLOG_MOD_LOG_LEVEL:
 	{
 		hdd_debug("QCSAP_DBGLOG_MOD_LOG_LEVEL val %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_DBGLOG_MOD_LOG_LEVEL,
 					  set_value, DBG_CMD);
 		break;
@@ -670,7 +670,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCSAP_DBGLOG_TYPE:
 	{
 		hdd_debug("QCSAP_DBGLOG_TYPE val %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_DBGLOG_TYPE,
 					  set_value, DBG_CMD);
 		break;
@@ -678,7 +678,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCSAP_DBGLOG_REPORT_ENABLE:
 	{
 		hdd_debug("QCSAP_DBGLOG_REPORT_ENABLE val %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_DBGLOG_REPORT_ENABLE,
 					  set_value, DBG_CMD);
 		break;
@@ -701,7 +701,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCASAP_TXRX_FWSTATS_RESET:
 	{
 		hdd_debug("WE_TXRX_FWSTATS_RESET val %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMA_VDEV_TXRX_FWSTATS_RESET_CMDID,
 					  set_value, VDEV_CMD);
 		break;
@@ -709,7 +709,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCSAP_PARAM_RTSCTS:
 	{
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_VDEV_PARAM_ENABLE_RTSCTS,
 					  set_value, VDEV_CMD);
 		if (ret) {
@@ -775,7 +775,7 @@ static __iw_softap_setparam(struct net_device *dev,
 		}
 		hdd_debug("SET_HT_RATE val %d rix %d preamble %x nss %d",
 		       set_value, rix, preamble, nss);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_VDEV_PARAM_FIXED_RATE,
 					  set_value, VDEV_CMD);
 		break;
@@ -805,7 +805,7 @@ static __iw_softap_setparam(struct net_device *dev,
 		hdd_debug("SET_VHT_RATE val %d rix %d preamble %x nss %d",
 		       set_value, rix, preamble, nss);
 
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_VDEV_PARAM_FIXED_RATE,
 					  set_value, VDEV_CMD);
 		break;
@@ -821,7 +821,7 @@ static __iw_softap_setparam(struct net_device *dev,
 		 *
 		 * SGI is same for 20MHZ and 40MHZ.
 		 */
-		ret = sme_update_ht_config(mac_handle, adapter->session_id,
+		ret = sme_update_ht_config(mac_handle, adapter->vdev_id,
 					   WNI_CFG_HT_CAP_INFO_SHORT_GI_20MHZ,
 					   set_value);
 		if (ret)
@@ -832,7 +832,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCSAP_SET_AMPDU:
 	{
 		hdd_debug("QCSAP_SET_AMPDU %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  GEN_VDEV_PARAM_AMPDU,
 					  set_value, GEN_CMD);
 		break;
@@ -841,7 +841,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCSAP_SET_AMSDU:
 	{
 		hdd_debug("QCSAP_SET_AMSDU %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  GEN_VDEV_PARAM_AMSDU,
 					  set_value, GEN_CMD);
 		break;
@@ -849,7 +849,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCSAP_GTX_HT_MCS:
 	{
 		hdd_debug("WMI_VDEV_PARAM_GTX_HT_MCS %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_VDEV_PARAM_GTX_HT_MCS,
 					  set_value, GTX_CMD);
 		break;
@@ -858,7 +858,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCSAP_GTX_VHT_MCS:
 	{
 		hdd_debug("WMI_VDEV_PARAM_GTX_VHT_MCS %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_VDEV_PARAM_GTX_VHT_MCS,
 						set_value, GTX_CMD);
 		break;
@@ -867,7 +867,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCSAP_GTX_USRCFG:
 	{
 		hdd_debug("WMI_VDEV_PARAM_GTX_USR_CFG %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_VDEV_PARAM_GTX_USR_CFG,
 					  set_value, GTX_CMD);
 		break;
@@ -876,7 +876,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCSAP_GTX_THRE:
 	{
 		hdd_debug("WMI_VDEV_PARAM_GTX_THRE %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_VDEV_PARAM_GTX_THRE,
 					  set_value, GTX_CMD);
 		break;
@@ -885,7 +885,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCSAP_GTX_MARGIN:
 	{
 		hdd_debug("WMI_VDEV_PARAM_GTX_MARGIN %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_VDEV_PARAM_GTX_MARGIN,
 					  set_value, GTX_CMD);
 		break;
@@ -894,7 +894,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCSAP_GTX_STEP:
 	{
 		hdd_debug("WMI_VDEV_PARAM_GTX_STEP %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_VDEV_PARAM_GTX_STEP,
 					  set_value, GTX_CMD);
 		break;
@@ -903,7 +903,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCSAP_GTX_MINTPC:
 	{
 		hdd_debug("WMI_VDEV_PARAM_GTX_MINTPC %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_VDEV_PARAM_GTX_MINTPC,
 					  set_value, GTX_CMD);
 		break;
@@ -912,7 +912,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCSAP_GTX_BWMASK:
 	{
 		hdd_debug("WMI_VDEV_PARAM_GTX_BWMASK %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_VDEV_PARAM_GTX_BW_MASK,
 					  set_value, GTX_CMD);
 		break;
@@ -951,7 +951,7 @@ static __iw_softap_setparam(struct net_device *dev,
 		if (adapter->device_mode != QDF_SAP_MODE)
 			return -EINVAL;
 
-		status = sme_set_he_bss_color(mac_handle, adapter->session_id,
+		status = sme_set_he_bss_color(mac_handle, adapter->vdev_id,
 				set_value);
 		if (QDF_STATUS_SUCCESS != status) {
 			hdd_err("SET_HE_BSS_COLOR failed");
@@ -990,7 +990,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCASAP_TX_CHAINMASK_CMD:
 	{
 		hdd_debug("QCASAP_TX_CHAINMASK_CMD val %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_PDEV_PARAM_TX_CHAIN_MASK,
 					  set_value, PDEV_CMD);
 		ret = hdd_set_antenna_mode(adapter, hdd_ctx, set_value);
@@ -1000,7 +1000,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCASAP_RX_CHAINMASK_CMD:
 	{
 		hdd_debug("QCASAP_RX_CHAINMASK_CMD val %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_PDEV_PARAM_RX_CHAIN_MASK,
 					  set_value, PDEV_CMD);
 		ret = hdd_set_antenna_mode(adapter, hdd_ctx, set_value);
@@ -1011,7 +1011,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	{
 		hdd_debug("QCASAP_NSS_CMD val %d", set_value);
 		hdd_update_nss(adapter, set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_VDEV_PARAM_NSS,
 					  set_value, VDEV_CMD);
 		break;
@@ -1081,7 +1081,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	}
 	case QCSAP_START_FW_PROFILING:
 		hdd_debug("QCSAP_START_FW_PROFILING %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					WMI_WLAN_PROFILE_TRIGGER_CMDID,
 					set_value, DBG_CMD);
 		break;
@@ -1104,25 +1104,25 @@ static __iw_softap_setparam(struct net_device *dev,
 		break;
 	case QCASAP_PARAM_DCM:
 		hdd_debug("Set WMI_VDEV_PARAM_HE_DCM: %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_VDEV_PARAM_HE_DCM, set_value,
 					  VDEV_CMD);
 		break;
 	case QCASAP_PARAM_RANGE_EXT:
 		hdd_debug("Set WMI_VDEV_PARAM_HE_RANGE_EXT: %d", set_value);
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 					  WMI_VDEV_PARAM_HE_RANGE_EXT,
 					  set_value, VDEV_CMD);
 		break;
 	case QCSAP_SET_DEFAULT_AMPDU:
 		hdd_debug("QCSAP_SET_DEFAULT_AMPDU val %d", set_value);
-		ret = wma_cli_set_command((int)adapter->session_id,
+		ret = wma_cli_set_command((int)adapter->vdev_id,
 				(int)WMI_PDEV_PARAM_MAX_MPDUS_IN_AMPDU,
 				set_value, PDEV_CMD);
 		break;
 	case QCSAP_ENABLE_RTS_BURSTING:
 		hdd_debug("QCSAP_ENABLE_RTS_BURSTING val %d", set_value);
-		ret = wma_cli_set_command((int)adapter->session_id,
+		ret = wma_cli_set_command((int)adapter->vdev_id,
 				(int)WMI_PDEV_PARAM_ENABLE_RTS_SIFS_BURSTING,
 				set_value, PDEV_CMD);
 		break;
@@ -1255,7 +1255,7 @@ static __iw_softap_getparam(struct net_device *dev,
 
 	case QCSAP_PARAM_RTSCTS:
 	{
-		*value = wma_cli_get_command(adapter->session_id,
+		*value = wma_cli_get_command(adapter->vdev_id,
 					     WMI_VDEV_PARAM_ENABLE_RTSCTS,
 					     VDEV_CMD);
 		break;
@@ -1263,7 +1263,7 @@ static __iw_softap_getparam(struct net_device *dev,
 
 	case QCASAP_SHORT_GI:
 	{
-		*value = wma_cli_get_command(adapter->session_id,
+		*value = wma_cli_get_command(adapter->vdev_id,
 					     WMI_VDEV_PARAM_SGI,
 					     VDEV_CMD);
 		break;
@@ -1272,7 +1272,7 @@ static __iw_softap_getparam(struct net_device *dev,
 	case QCSAP_GTX_HT_MCS:
 	{
 		hdd_debug("GET WMI_VDEV_PARAM_GTX_HT_MCS");
-		*value = wma_cli_get_command(adapter->session_id,
+		*value = wma_cli_get_command(adapter->vdev_id,
 					     WMI_VDEV_PARAM_GTX_HT_MCS,
 					     GTX_CMD);
 		break;
@@ -1281,7 +1281,7 @@ static __iw_softap_getparam(struct net_device *dev,
 	case QCSAP_GTX_VHT_MCS:
 	{
 		hdd_debug("GET WMI_VDEV_PARAM_GTX_VHT_MCS");
-		*value = wma_cli_get_command(adapter->session_id,
+		*value = wma_cli_get_command(adapter->vdev_id,
 					     WMI_VDEV_PARAM_GTX_VHT_MCS,
 					     GTX_CMD);
 		break;
@@ -1290,7 +1290,7 @@ static __iw_softap_getparam(struct net_device *dev,
 	case QCSAP_GTX_USRCFG:
 	{
 		hdd_debug("GET WMI_VDEV_PARAM_GTX_USR_CFG");
-		*value = wma_cli_get_command(adapter->session_id,
+		*value = wma_cli_get_command(adapter->vdev_id,
 					     WMI_VDEV_PARAM_GTX_USR_CFG,
 					     GTX_CMD);
 		break;
@@ -1299,7 +1299,7 @@ static __iw_softap_getparam(struct net_device *dev,
 	case QCSAP_GTX_THRE:
 	{
 		hdd_debug("GET WMI_VDEV_PARAM_GTX_THRE");
-		*value = wma_cli_get_command(adapter->session_id,
+		*value = wma_cli_get_command(adapter->vdev_id,
 					     WMI_VDEV_PARAM_GTX_THRE,
 					     GTX_CMD);
 		break;
@@ -1308,7 +1308,7 @@ static __iw_softap_getparam(struct net_device *dev,
 	case QCSAP_GTX_MARGIN:
 	{
 		hdd_debug("GET WMI_VDEV_PARAM_GTX_MARGIN");
-		*value = wma_cli_get_command(adapter->session_id,
+		*value = wma_cli_get_command(adapter->vdev_id,
 					     WMI_VDEV_PARAM_GTX_MARGIN,
 					     GTX_CMD);
 		break;
@@ -1317,7 +1317,7 @@ static __iw_softap_getparam(struct net_device *dev,
 	case QCSAP_GTX_STEP:
 	{
 		hdd_debug("GET WMI_VDEV_PARAM_GTX_STEP");
-		*value = wma_cli_get_command(adapter->session_id,
+		*value = wma_cli_get_command(adapter->vdev_id,
 					     WMI_VDEV_PARAM_GTX_STEP,
 					     GTX_CMD);
 		break;
@@ -1326,7 +1326,7 @@ static __iw_softap_getparam(struct net_device *dev,
 	case QCSAP_GTX_MINTPC:
 	{
 		hdd_debug("GET WMI_VDEV_PARAM_GTX_MINTPC");
-		*value = wma_cli_get_command(adapter->session_id,
+		*value = wma_cli_get_command(adapter->vdev_id,
 					     WMI_VDEV_PARAM_GTX_MINTPC,
 					     GTX_CMD);
 		break;
@@ -1335,7 +1335,7 @@ static __iw_softap_getparam(struct net_device *dev,
 	case QCSAP_GTX_BWMASK:
 	{
 		hdd_debug("GET WMI_VDEV_PARAM_GTX_BW_MASK");
-		*value = wma_cli_get_command(adapter->session_id,
+		*value = wma_cli_get_command(adapter->vdev_id,
 					     WMI_VDEV_PARAM_GTX_BW_MASK,
 					     GTX_CMD);
 		break;
@@ -1370,7 +1370,7 @@ static __iw_softap_getparam(struct net_device *dev,
 	case QCASAP_TX_CHAINMASK_CMD:
 	{
 		hdd_debug("QCASAP_TX_CHAINMASK_CMD");
-		*value = wma_cli_get_command(adapter->session_id,
+		*value = wma_cli_get_command(adapter->vdev_id,
 					     WMI_PDEV_PARAM_TX_CHAIN_MASK,
 					     PDEV_CMD);
 		break;
@@ -1379,7 +1379,7 @@ static __iw_softap_getparam(struct net_device *dev,
 	case QCASAP_RX_CHAINMASK_CMD:
 	{
 		hdd_debug("QCASAP_RX_CHAINMASK_CMD");
-		*value = wma_cli_get_command(adapter->session_id,
+		*value = wma_cli_get_command(adapter->vdev_id,
 					     WMI_PDEV_PARAM_RX_CHAIN_MASK,
 					     PDEV_CMD);
 		break;
@@ -1388,7 +1388,7 @@ static __iw_softap_getparam(struct net_device *dev,
 	case QCASAP_NSS_CMD:
 	{
 		hdd_debug("QCASAP_NSS_CMD");
-		*value = wma_cli_get_command(adapter->session_id,
+		*value = wma_cli_get_command(adapter->vdev_id,
 					     WMI_VDEV_PARAM_NSS,
 					     VDEV_CMD);
 		break;
@@ -1404,7 +1404,7 @@ static __iw_softap_getparam(struct net_device *dev,
 	}
 	case QCSAP_GET_FW_PROFILE_DATA:
 		hdd_debug("QCSAP_GET_FW_PROFILE_DATA");
-		ret = wma_cli_set_command(adapter->session_id,
+		ret = wma_cli_set_command(adapter->vdev_id,
 				WMI_WLAN_PROFILE_GET_PROFILE_DATA_CMDID,
 				0, DBG_CMD);
 		break;
@@ -1430,14 +1430,14 @@ static __iw_softap_getparam(struct net_device *dev,
 	}
 	case QCASAP_PARAM_DCM:
 	{
-		*value = wma_cli_get_command(adapter->session_id,
+		*value = wma_cli_get_command(adapter->vdev_id,
 					     WMI_VDEV_PARAM_HE_DCM,
 					     VDEV_CMD);
 		break;
 	}
 	case QCASAP_PARAM_RANGE_EXT:
 	{
-		*value = wma_cli_get_command(adapter->session_id,
+		*value = wma_cli_get_command(adapter->vdev_id,
 					     WMI_VDEV_PARAM_HE_RANGE_EXT,
 					     VDEV_CMD);
 		break;
@@ -1720,7 +1720,7 @@ static __iw_softap_set_tx_power(struct net_device *dev,
 
 	set_value = value[0];
 	if (QDF_STATUS_SUCCESS !=
-	    sme_set_tx_power(hdd_ctx->mac_handle, adapter->session_id, bssid,
+	    sme_set_tx_power(hdd_ctx->mac_handle, adapter->vdev_id, bssid,
 			     adapter->device_mode, set_value)) {
 		hdd_err("Setting tx power failed");
 		return -EIO;
@@ -2167,7 +2167,7 @@ __iw_softap_stopbss(struct net_device *dev,
 		clear_bit(SOFTAP_BSS_STARTED, &adapter->event_flags);
 		policy_mgr_decr_session_set_pcl(hdd_ctx->psoc,
 					     adapter->device_mode,
-					     adapter->session_id);
+					     adapter->vdev_id);
 		hdd_green_ap_start_state_mc(hdd_ctx, adapter->device_mode,
 					    false);
 		ret = qdf_status_to_os_return(status);

core/hdd/src/wlan_hdd_softap_tx_rx.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
@@ -910,7 +910,7 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *adapter_context, qdf_nbuf_t rx_buf)
 		}
 
 		hdd_event_eapol_log(skb, QDF_RX);
-		qdf_dp_trace_log_pkt(adapter->session_id,
+		qdf_dp_trace_log_pkt(adapter->vdev_id,
 				     skb, QDF_RX, QDF_TRACE_DEFAULT_PDEV_ID);
 		DPTRACE(qdf_dp_trace(skb,
 			QDF_DP_TRACE_RX_HDD_PACKET_PTR_RECORD,
@@ -984,7 +984,7 @@ QDF_STATUS hdd_softap_deregister_sta(struct hdd_adapter *adapter,
 			if (ucfg_ipa_wlan_evt(hdd_ctx->pdev, adapter->dev,
 					  adapter->device_mode,
 					  adapter->sta_info[sta_id].sta_id,
-					  adapter->session_id,
+					  adapter->vdev_id,
 					  WLAN_IPA_CLIENT_DISCONNECT,
 					  adapter->sta_info[sta_id].sta_mac.
 					  bytes) != QDF_STATUS_SUCCESS)
@@ -1051,12 +1051,12 @@ QDF_STATUS hdd_softap_register_sta(struct hdd_adapter *adapter,
 
 	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);
 	adapter->txrx_vdev = (void *)cdp_get_vdev_from_vdev_id(soc,
 					(struct cdp_pdev *)pdev,
-					adapter->session_id);
+					adapter->vdev_id);
 	adapter->tx_fn = txrx_ops.tx.tx;
 
 	qdf_status = cdp_peer_register(soc,
@@ -1194,7 +1194,7 @@ QDF_STATUS hdd_softap_stop_bss(struct hdd_adapter *adapter)
 				      adapter->dev,
 				      adapter->device_mode,
 				      ap_ctx->broadcast_sta_id,
-				      adapter->session_id,
+				      adapter->vdev_id,
 				      WLAN_IPA_AP_DISCONNECT,
 				      adapter->dev->dev_addr) !=
 		    QDF_STATUS_SUCCESS)

core/hdd/src/wlan_hdd_stats.c

@@ -558,7 +558,7 @@ bool hdd_get_interface_info(struct hdd_adapter *adapter,
 		if (eConnectionState_Connecting ==
 		    sta_ctx->conn_info.connState) {
 			hdd_err("Session ID %d, Connection is in progress",
-				adapter->session_id);
+				adapter->vdev_id);
 			pInfo->state = WIFI_ASSOCIATING;
 		}
 		if ((eConnectionState_Associated ==
@@ -1301,7 +1301,7 @@ __wlan_hdd_cfg80211_ll_stats_set(struct wiphy *wiphy,
 		nla_get_u32(tb_vendor
 			    [QCA_WLAN_VENDOR_ATTR_LL_STATS_SET_CONFIG_AGGRESSIVE_STATS_GATHERING]);
 
-	LinkLayerStatsSetReq.staId = adapter->session_id;
+	LinkLayerStatsSetReq.staId = adapter->vdev_id;
 
 	hdd_debug("LL_STATS_SET reqId = %d, staId = %d, mpduSizeThreshold = %d, Statistics Gathering = %d",
 		LinkLayerStatsSetReq.reqId, LinkLayerStatsSetReq.staId,
@@ -1435,14 +1435,14 @@ int wlan_hdd_ll_stats_get(struct hdd_adapter *adapter, uint32_t req_id,
 
 	get_req.reqId = req_id;
 	get_req.paramIdMask = req_mask;
-	get_req.staId = adapter->session_id;
+	get_req.staId = adapter->vdev_id;
 
 	rtnl_lock();
 	errno = wlan_hdd_send_ll_stats_req(hdd_ctx, &get_req);
 	rtnl_unlock();
 	if (errno)
 		hdd_err("Send LL stats req failed, id:%u, mask:%d, session:%d",
-			req_id, req_mask, adapter->session_id);
+			req_id, req_mask, adapter->vdev_id);
 
 	hdd_exit();
 
@@ -1519,9 +1519,9 @@ __wlan_hdd_cfg80211_ll_stats_get(struct wiphy *wiphy,
 		nla_get_u32(tb_vendor
 			    [QCA_WLAN_VENDOR_ATTR_LL_STATS_GET_CONFIG_REQ_MASK]);
 
-	LinkLayerStatsGetReq.staId = adapter->session_id;
+	LinkLayerStatsGetReq.staId = adapter->vdev_id;
 
-	if (wlan_hdd_validate_session_id(adapter->session_id))
+	if (wlan_hdd_validate_session_id(adapter->vdev_id))
 		return -EINVAL;
 
 	ret = wlan_hdd_send_ll_stats_req(hdd_ctx, &LinkLayerStatsGetReq);
@@ -1637,7 +1637,7 @@ __wlan_hdd_cfg80211_ll_stats_clear(struct wiphy *wiphy,
 	 */
 	LinkLayerStatsClearReq.reqId = 1;
 
-	LinkLayerStatsClearReq.staId = adapter->session_id;
+	LinkLayerStatsClearReq.staId = adapter->vdev_id;
 
 	hdd_debug("LL_STATS_CLEAR reqId = %d, staId = %d, statsClearReqMask = 0x%X, stopReq = %d",
 		LinkLayerStatsClearReq.reqId,
@@ -1728,7 +1728,7 @@ void wlan_hdd_clear_link_layer_stats(struct hdd_adapter *adapter)
 		WIFI_STATS_IFACE_ALL_PEER;
 	link_layer_stats_clear_req.stopReq = 0;
 	link_layer_stats_clear_req.reqId = 1;
-	link_layer_stats_clear_req.staId = adapter->session_id;
+	link_layer_stats_clear_req.staId = adapter->vdev_id;
 	sme_ll_stats_clear_req(mac_handle, &link_layer_stats_clear_req);
 }
 
@@ -2825,7 +2825,7 @@ set_thresh:
 
 set_period:
 	hdd_info("send period to target");
-	errno = wma_cli_set_command(adapter->session_id,
+	errno = wma_cli_set_command(adapter->vdev_id,
 				    WMI_PDEV_PARAM_STATS_OBSERVATION_PERIOD,
 				    period, PDEV_CMD);
 	if (errno) {
@@ -2896,7 +2896,7 @@ static int __wlan_hdd_cfg80211_stats_ext_request(struct wiphy *wiphy,
 	stats_ext_req.request_data_len = data_len;
 	stats_ext_req.request_data = (void *)data;
 
-	status = sme_stats_ext_request(adapter->session_id, &stats_ext_req);
+	status = sme_stats_ext_request(adapter->vdev_id, &stats_ext_req);
 
 	if (QDF_STATUS_SUCCESS != status)
 		ret_val = -EINVAL;
@@ -4338,7 +4338,7 @@ void hdd_wlan_fill_per_chain_rssi_stats(struct station_info *sinfo,
 			sinfo->signal_avg = sinfo->chain_signal_avg[i];
 
 		hdd_debug("RSSI for chain %d, vdev_id %d is %d",
-			  i, adapter->session_id, sinfo->chain_signal_avg[i]);
+			  i, adapter->vdev_id, sinfo->chain_signal_avg[i]);
 
 		if (!rssi_stats_valid && sinfo->chain_signal_avg[i])
 			rssi_stats_valid = true;
@@ -4393,7 +4393,7 @@ static int wlan_hdd_get_sta_stats(struct wiphy *wiphy,
 
 	qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
 		   TRACE_CODE_HDD_CFG80211_GET_STA,
-		   adapter->session_id, 0);
+		   adapter->vdev_id, 0);
 
 	if (eConnectionState_Associated != sta_ctx->conn_info.connState) {
 		hdd_debug("Not associated");
@@ -4601,7 +4601,7 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy,
 	if (status)
 		return status;
 
-	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_SAP_MODE)
@@ -4787,7 +4787,7 @@ static bool wlan_hdd_update_survey_info(struct wiphy *wiphy,
 
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	sme_get_operation_channel(hdd_ctx->mac_handle, &channel,
-				  adapter->session_id);
+				  adapter->vdev_id);
 	opfreq = wlan_reg_chan_to_freq(hdd_ctx->pdev, channel);
 
 	mutex_lock(&hdd_ctx->chan_info_lock);
@@ -5097,7 +5097,7 @@ static int __wlan_hdd_get_rcpi(struct hdd_adapter *adapter,
 	cookie = osif_request_cookie(request);
 
 	rcpi_req->mac_addr = mac_addr;
-	rcpi_req->session_id = adapter->session_id;
+	rcpi_req->session_id = adapter->vdev_id;
 	rcpi_req->measurement_type = measurement_type;
 	rcpi_req->rcpi_callback = wlan_hdd_get_rcpi_cb;
 	rcpi_req->rcpi_context = cookie;
@@ -5644,7 +5644,7 @@ int wlan_hdd_get_peer_rssi(struct hdd_adapter *adapter,
 
 	qdf_mem_copy(&rssi_req.peer_macaddr, macaddress,
 		     QDF_MAC_ADDR_SIZE);
-	rssi_req.sessionid = adapter->session_id;
+	rssi_req.sessionid = adapter->vdev_id;
 	status = sme_get_peer_info(adapter->hdd_ctx->mac_handle,
 				   rssi_req,
 				   cookie,
@@ -5753,7 +5753,7 @@ int wlan_hdd_get_peer_info(struct hdd_adapter *adapter,
 
 	qdf_mem_copy(&peer_info_req.peer_macaddr, &macaddress,
 		     QDF_MAC_ADDR_SIZE);
-	peer_info_req.sessionid = adapter->session_id;
+	peer_info_req.sessionid = adapter->vdev_id;
 	peer_info_req.reset_after_request = 0;
 	status = sme_get_peer_info_ext(adapter->hdd_ctx->mac_handle,
 				       &peer_info_req,
@@ -5853,7 +5853,7 @@ QDF_STATUS wlan_hdd_get_class_astats(struct hdd_adapter *adapter)
 				    eCSR_HDD, SME_GLOBAL_CLASSA_STATS,
 				    hdd_get_class_a_statistics_cb,
 				    sta_ctx->conn_info.staId[0],
-				    cookie, adapter->session_id);
+				    cookie, adapter->vdev_id);
 	if (QDF_STATUS_SUCCESS != status) {
 		hdd_warn("Unable to retrieve Class A statistics");
 		goto return_cached_results;
@@ -6039,7 +6039,7 @@ int wlan_hdd_get_station_stats(struct hdd_adapter *adapter)
 				    hdd_get_station_statistics_cb,
 				    sta_ctx->conn_info.staId[0],
 				    cookie,
-				    adapter->session_id);
+				    adapter->vdev_id);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		hdd_err("Failed to retrieve statistics, status %d", status);
 		goto put_request;
@@ -6172,7 +6172,7 @@ void wlan_hdd_display_txrx_stats(struct hdd_context *ctx)
 		total_rx_delv = 0;
 		total_rx_refused = 0;
 		stats = &adapter->hdd_stats.tx_rx_stats;
-		hdd_debug("adapter: %u", adapter->session_id);
+		hdd_debug("adapter: %u", adapter->vdev_id);
 		for (; i < NUM_CPUS; i++) {
 			total_rx_pkt += stats->rx_packets[i];
 			total_rx_dropped += stats->rx_dropped[i];

core/hdd/src/wlan_hdd_tx_power.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
@@ -87,7 +87,7 @@ static int __wlan_hdd_cfg80211_txpower_scale(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	status = wma_set_tx_power_scale(adapter->session_id, scale_value);
+	status = wma_set_tx_power_scale(adapter->vdev_id, scale_value);
 
 	if (status != QDF_STATUS_SUCCESS) {
 		hdd_err("Set tx power scale failed");
@@ -164,7 +164,7 @@ __wlan_hdd_cfg80211_txpower_scale_decr_db(struct wiphy *wiphy,
 	scale_value = nla_get_u8(tb
 		    [QCA_WLAN_VENDOR_ATTR_TXPOWER_SCALE_DECR_DB]);
 
-	status = wma_set_tx_power_scale_decr_db(adapter->session_id,
+	status = wma_set_tx_power_scale_decr_db(adapter->vdev_id,
 						scale_value);
 
 	if (status != QDF_STATUS_SUCCESS) {

core/hdd/src/wlan_hdd_tx_rx.c

@@ -142,7 +142,7 @@ void hdd_tx_resume_timer_expired_handler(void *adapter_context)
 					     WLAN_NETIF_PRIORITY_QUEUE_ON,
 					     WLAN_DATA_FLOW_CONTROL_PRIORITY);
 		cdp_hl_fc_set_os_queue_status(soc,
-					      adapter->session_id,
+					      adapter->vdev_id,
 					      WLAN_NETIF_PRIORITY_QUEUE_ON);
 	}
 	if (np_qpaused) {
@@ -150,7 +150,7 @@ void hdd_tx_resume_timer_expired_handler(void *adapter_context)
 					     WLAN_WAKE_NON_PRIORITY_QUEUE,
 					     WLAN_DATA_FLOW_CONTROL);
 		cdp_hl_fc_set_os_queue_status(soc,
-					      adapter->session_id,
+					      adapter->vdev_id,
 					      WLAN_WAKE_NON_PRIORITY_QUEUE);
 	}
 }
@@ -329,7 +329,7 @@ void hdd_register_tx_flow_control(struct hdd_adapter *adapter,
 		adapter->tx_flow_timer_initialized = true;
 	}
 	cdp_fc_register(cds_get_context(QDF_MODULE_ID_SOC),
-		adapter->session_id, flow_control_fp, adapter,
+		adapter->vdev_id, flow_control_fp, adapter,
 		flow_control_is_pause_fp);
 }
 
@@ -342,7 +342,7 @@ void hdd_register_tx_flow_control(struct hdd_adapter *adapter,
 void hdd_deregister_tx_flow_control(struct hdd_adapter *adapter)
 {
 	cdp_fc_deregister(cds_get_context(QDF_MODULE_ID_SOC),
-			adapter->session_id);
+			adapter->vdev_id);
 	if (adapter->tx_flow_timer_initialized == true) {
 		qdf_mc_timer_stop(&adapter->tx_flow_control_timer);
 		qdf_mc_timer_destroy(&adapter->tx_flow_control_timer);
@@ -420,7 +420,7 @@ static inline struct sk_buff *hdd_skb_orphan(struct hdd_adapter *adapter,
 uint32_t hdd_txrx_get_tx_ack_count(struct hdd_adapter *adapter)
 {
 	return cdp_get_tx_ack_stats(cds_get_context(QDF_MODULE_ID_SOC),
-				    adapter->session_id);
+				    adapter->vdev_id);
 }
 
 #ifdef FEATURE_WLAN_DIAG_SUPPORT
@@ -2060,7 +2060,7 @@ QDF_STATUS hdd_rx_packet_cbk(void *adapter_context,
 		}
 
 		hdd_event_eapol_log(skb, QDF_RX);
-		qdf_dp_trace_log_pkt(adapter->session_id, skb, QDF_RX,
+		qdf_dp_trace_log_pkt(adapter->vdev_id, skb, QDF_RX,
 				     QDF_TRACE_DEFAULT_PDEV_ID);
 
 		DPTRACE(qdf_dp_trace(skb,