qcacld-3.0: Rename hdd_adapter sessionId field

Per the Linux coding style "mixed-case names are frowned upon" so
rename field sessionId in struct hdd_adapter.

Change-Id: Ic33452766d5aee02fa0d87f9d198485b4192db39
CRs-Fixed: 2135916

core/hdd/inc/wlan_hdd_main.h

@@ -1035,7 +1035,7 @@ struct hdd_adapter {
 	/* estimated link speed */
 	uint32_t estimated_linkspeed;
 
-	uint8_t sessionId;
+	uint8_t session_id;
 
 	/* Completion variable for session close */
 	struct completion session_close_comp_var;

core/hdd/src/wlan_hdd_assoc.c

@@ -310,7 +310,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->hHal,
-				adapter->sessionId);
+				adapter->session_id);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		hdd_err("sme_remove_beacon_filter() failed");
 		return -EFAULT;
@@ -337,7 +337,7 @@ static int hdd_add_beacon_filter(struct hdd_adapter *adapter)
 				(unsigned long int *)ie_map);
 
 	status = sme_add_beacon_filter(hdd_ctx->hHal,
-				adapter->sessionId, ie_map);
+				adapter->session_id, ie_map);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		hdd_err("sme_add_beacon_filter() failed");
 		return -EFAULT;
@@ -1026,7 +1026,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(hdd_ctx->hHal, adapter->sessionId, (u8 *) ricIe,
+	sme_get_rici_es(hdd_ctx->hHal, adapter->session_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");
@@ -1035,7 +1035,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(hdd_ctx->hHal, adapter->sessionId,
+	sme_get_ft_pre_auth_response(hdd_ctx->hHal, adapter->session_id,
 				     (u8 *) ftIe, DOT11F_IE_FTINFO_MAX_LEN,
 				     &auth_resp_len);
 
@@ -1044,7 +1044,7 @@ static void hdd_send_ft_event(struct hdd_adapter *adapter)
 		return;
 	}
 
-	sme_set_ft_pre_auth_state(hdd_ctx->hHal, adapter->sessionId, true);
+	sme_set_ft_pre_auth_state(hdd_ctx->hHal, adapter->session_id, true);
 
 	ftEvent.target_ap = ftIe;
 
@@ -1070,7 +1070,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(hdd_ctx->hHal, adapter->sessionId,
+	sme_get_rici_es(hdd_ctx->hHal, adapter->session_id,
 			(u8 *) &(buff[str_len]), (IW_CUSTOM_MAX - str_len),
 			&ric_ies_length);
 	if (ric_ies_length == 0) {
@@ -1083,7 +1083,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(hdd_ctx->hHal, adapter->sessionId,
+	sme_get_ft_pre_auth_response(hdd_ctx->hHal, adapter->session_id,
 				     (u8 *) &buff[str_len],
 				     (IW_CUSTOM_MAX - str_len), &auth_resp_len);
 
@@ -1248,7 +1248,7 @@ static void hdd_send_association_event(struct net_device *dev,
 			/* change logging before release */
 			hdd_debug("LFR3:hdd_send_association_event");
 			/* Update tdls module about the disconnection event */
-			hdd_notify_sta_disconnect(adapter->sessionId,
+			hdd_notify_sta_disconnect(adapter->session_id,
 						 true, false,
 						 adapter->hdd_vdev);
 		}
@@ -1263,7 +1263,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->hdd_psoc,
-				adapter->device_mode, adapter->sessionId);
+				adapter->device_mode, adapter->session_id);
 		memcpy(wrqu.ap_addr.sa_data, pCsrRoamInfo->pBssDesc->bssId,
 		       sizeof(pCsrRoamInfo->pBssDesc->bssId));
 
@@ -1325,10 +1325,10 @@ static void hdd_send_association_event(struct net_device *dev,
 		hdd_send_peer_status_ind_to_app(&peerMacAddr,
 						ePeerConnected,
 						pCsrRoamInfo->timingMeasCap,
-						adapter->sessionId, &chan_info,
+						adapter->session_id, &chan_info,
 						adapter->device_mode);
 		/* Update tdls module about connection event */
-		hdd_notify_sta_connect(adapter->sessionId,
+		hdd_notify_sta_connect(adapter->session_id,
 				       pCsrRoamInfo->tdls_chan_swit_prohibited,
 				       pCsrRoamInfo->tdls_prohibited,
 				       adapter->hdd_vdev);
@@ -1340,7 +1340,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->sessionId,
+			cds_get_context(QDF_MODULE_ID_SOC), adapter->session_id,
 			&adapter->prev_fwd_tx_packets,
 			&adapter->prev_fwd_rx_packets);
 		spin_unlock_bh(&hdd_ctx->bus_bw_lock);
@@ -1350,7 +1350,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->hdd_psoc,
-				adapter->sessionId);
+				adapter->session_id);
 		memcpy(wrqu.ap_addr.sa_data, sta_ctx->conn_info.bssId.bytes,
 				ETH_ALEN);
 		hdd_debug("wlan: new IBSS connection to " MAC_ADDRESS_STR,
@@ -1373,7 +1373,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->hdd_psoc,
-				adapter->device_mode, adapter->sessionId);
+				adapter->device_mode, adapter->session_id);
 
 #ifdef FEATURE_WLAN_AUTO_SHUTDOWN
 		wlan_hdd_auto_shutdown_enable(hdd_ctx, true);
@@ -1387,7 +1387,7 @@ 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->sessionId,
+							adapter->session_id,
 							NULL,
 							adapter->device_mode);
 		}
@@ -1400,7 +1400,7 @@ static void hdd_send_association_event(struct net_device *dev,
 
 		hdd_lpass_notify_disconnect(adapter);
 		/* Update tdls module about the disconnection event */
-		hdd_notify_sta_disconnect(adapter->sessionId,
+		hdd_notify_sta_disconnect(adapter->session_id,
 					  false,
 					  false,
 					  adapter->hdd_vdev);
@@ -1611,7 +1611,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->sessionId,
+				adapter->session_id,
 				QDF_TRACE_DEFAULT_PDEV_ID,
 				QDF_PROTO_TYPE_MGMT, QDF_PROTO_MGMT_DISASSOC));
 
@@ -1678,7 +1678,7 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
 	}
 
 	hdd_wmm_adapter_clear(adapter);
-	sme_ft_reset(WLAN_HDD_GET_HAL_CTX(adapter), adapter->sessionId);
+	sme_ft_reset(WLAN_HDD_GET_HAL_CTX(adapter), adapter->session_id);
 	if (hdd_remove_beacon_filter(adapter) != 0)
 		hdd_err("hdd_remove_beacon_filter() failed");
 
@@ -1748,7 +1748,7 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
 			(QDF_P2P_CLIENT_MODE == adapter->device_mode)) {
 		sme_ps_disable_auto_ps_timer(WLAN_HDD_GET_HAL_CTX
 				(adapter),
-				adapter->sessionId);
+				adapter->session_id);
 	}
 	wlan_hdd_clear_link_layer_stats(adapter);
 
@@ -1840,7 +1840,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->sessionId);
+				adapter->session_id);
 		if (err != QDF_STATUS_SUCCESS) {
 			hdd_err("Failed to set the peer state to authorized");
 			return QDF_STATUS_E_FAULT;
@@ -1959,7 +1959,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->sessionId);
+				adapter->session_id);
 	if (!adapter->txrx_vdev) {
 		hdd_err("%s find vdev fail", __func__);
 		return QDF_STATUS_E_FAILURE;
@@ -2176,7 +2176,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->hdd_psoc,
-				adapter->device_mode, adapter->sessionId);
+				adapter->device_mode, adapter->session_id);
 
 	/* Send the Assoc Resp, the supplicant needs this for initial Auth */
 	len = pCsrRoamInfo->nAssocRspLength - FT_ASSOC_RSP_IES_OFFSET;
@@ -2193,7 +2193,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(hal_handle, adapter->sessionId,
+	sme_roam_get_connect_profile(hal_handle, adapter->session_id,
 		&roam_profile);
 
 	bss = hdd_cfg80211_get_bss(adapter->wdev.wiphy,
@@ -2350,7 +2350,7 @@ static int hdd_change_sta_state_authenticated(struct hdd_adapter *adapter,
 		(QDF_P2P_CLIENT_MODE == adapter->device_mode)) {
 		sme_ps_enable_auto_ps_timer(
 			WLAN_HDD_GET_HAL_CTX(adapter),
-			adapter->sessionId,
+			adapter->session_id,
 			timeout);
 	}
 
@@ -2421,7 +2421,7 @@ static void hdd_change_peer_state_after_set_key(struct hdd_adapter *adapter,
 		 * case of 11R roaming.
 		 */
 		if (sme_neighbor_roam_is11r_assoc(WLAN_HDD_GET_HAL_CTX(adapter),
-						  adapter->sessionId))
+						  adapter->session_id))
 			hdd_sta_ctx->conn_info.ptk_installed = true;
 	} else {
 		hdd_sta_ctx->conn_info.ptk_installed = true;
@@ -2732,7 +2732,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 				hdd_err("Disconnecting...");
 				sme_roam_disconnect(
 					WLAN_HDD_GET_HAL_CTX(adapter),
-					adapter->sessionId,
+					adapter->session_id,
 					eCSR_DISCONNECT_REASON_UNSPECIFIED);
 			}
 			return QDF_STATUS_E_FAILURE;
@@ -2743,7 +2743,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 			hdd_ctx->hdd_psoc);
 
 		DPTRACE(qdf_dp_trace_mgmt_pkt(QDF_DP_TRACE_MGMT_PACKET_RECORD,
-			adapter->sessionId,
+			adapter->session_id,
 			QDF_TRACE_DEFAULT_PDEV_ID,
 			QDF_PROTO_TYPE_MGMT, QDF_PROTO_MGMT_ASSOC));
 
@@ -2785,7 +2785,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 					hdd_debug("Disconnecting...");
 					sme_roam_disconnect(
 					   WLAN_HDD_GET_HAL_CTX(adapter),
-					   adapter->sessionId,
+					   adapter->session_id,
 					   eCSR_DISCONNECT_REASON_UNSPECIFIED);
 				}
 				return QDF_STATUS_E_FAILURE;
@@ -2870,7 +2870,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 						policy_mgr_decr_session_set_pcl(
 							hdd_ctx->hdd_psoc,
 							adapter->device_mode,
-							adapter->sessionId);
+							adapter->session_id);
 						hdd_debug("ft_carrier_on is %d, sending roamed indication",
 							 ft_carrier_on);
 						chan =
@@ -2917,11 +2917,11 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 					}
 					if (sme_get_ftptk_state
 						    (WLAN_HDD_GET_HAL_CTX(adapter),
-						    adapter->sessionId)) {
+						    adapter->session_id)) {
 						sme_set_ftptk_state
 							(WLAN_HDD_GET_HAL_CTX
 								(adapter),
-							adapter->sessionId,
+							adapter->session_id,
 							false);
 						roam_info->fAuthRequired =
 							false;
@@ -2964,13 +2964,13 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 				 */
 				csr_roam_get_wpa_rsn_req_ie(WLAN_HDD_GET_HAL_CTX
 								    (adapter),
-							    adapter->sessionId,
+							    adapter->session_id,
 							    &reqRsnLength,
 							    reqRsnIe);
 
 				csr_roam_get_wpa_rsn_rsp_ie(WLAN_HDD_GET_HAL_CTX
 								    (adapter),
-							    adapter->sessionId,
+							    adapter->session_id,
 							    &rspRsnLength,
 							    rspRsnIe);
 				if (!hddDisconInProgress) {
@@ -3037,7 +3037,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 			 */
 			csr_roam_get_wpa_rsn_req_ie(
 						WLAN_HDD_GET_HAL_CTX(adapter),
-						adapter->sessionId,
+						adapter->session_id,
 						&reqRsnLength, reqRsnIe);
 
 			hdd_send_re_assoc_event(dev, adapter, roam_info,
@@ -3354,11 +3354,11 @@ 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->hdd_psoc,
-				adapter->device_mode, adapter->sessionId);
+				adapter->device_mode, adapter->session_id);
 		} else if (eCSR_ROAM_RESULT_IBSS_JOIN_SUCCESS == roamResult ||
 				eCSR_ROAM_RESULT_IBSS_COALESCED == roamResult) {
 			policy_mgr_update_connection_info(hdd_ctx->hdd_psoc,
-					adapter->sessionId);
+					adapter->session_id);
 		}
 		break;
 	}
@@ -3659,7 +3659,7 @@ roam_roam_connect_status_update_handler(struct hdd_adapter *adapter,
 			qdf_status =
 				sme_roam_set_key(WLAN_HDD_GET_HAL_CTX
 							 (adapter),
-						 adapter->sessionId,
+						 adapter->session_id,
 						 &sta_ctx->ibss_enc_key,
 						 &roamId);
 
@@ -3773,7 +3773,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->sessionId),
+		 (struct cdp_pdev *)pdev, adapter->session_id),
 		 adapter, &txrx_ops);
 	adapter->tx_fn = txrx_ops.tx.tx;
 
@@ -4333,7 +4333,7 @@ static void hdd_roam_channel_switch_handler(struct hdd_adapter *adapter,
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
 	hdd_debug("channel switch for session:%d to channel:%d",
-		adapter->sessionId, roam_info->chan_info.chan_id);
+		adapter->session_id, roam_info->chan_info.chan_id);
 
 	chan_change.chan = roam_info->chan_info.chan_id;
 	chan_change.chan_params.ch_width =
@@ -4360,7 +4360,7 @@ static void hdd_roam_channel_switch_handler(struct hdd_adapter *adapter,
 	policy_mgr_check_concurrent_intf_and_restart_sap(hdd_ctx->hdd_psoc);
 
 	status = policy_mgr_set_hw_mode_on_channel_switch(hdd_ctx->hdd_psoc,
-		adapter->sessionId);
+		adapter->session_id);
 	if (QDF_IS_STATUS_ERROR(status))
 		hdd_debug("set hw mode change not done");
 }
@@ -4403,13 +4403,13 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *roam_info, uint32_t roamId,
 	/* Omitting eCSR_ROAM_UPDATE_SCAN_RESULT as this is too frequent */
 	if (eCSR_ROAM_UPDATE_SCAN_RESULT != roamStatus)
 		MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_RX_SME_MSG,
-				 adapter->sessionId, roamStatus));
+				 adapter->session_id, roamStatus));
 
 	switch (roamStatus) {
 	case eCSR_ROAM_SESSION_OPENED:
 		set_bit(SME_SESSION_OPENED, &adapter->event_flags);
 		complete(&adapter->session_open_comp_var);
-		hdd_debug("session %d opened", adapter->sessionId);
+		hdd_debug("session %d opened", adapter->session_id);
 		break;
 
 	/*
@@ -4420,14 +4420,14 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *roam_info, uint32_t roamId,
 	 */
 	case eCSR_ROAM_FT_REASSOC_FAILED:
 		hdd_err("Reassoc Failed with roamStatus: %d roamResult: %d SessionID: %d",
-			 roamStatus, roamResult, adapter->sessionId);
+			 roamStatus, roamResult, adapter->session_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->sessionId);
+			  sta_ctx->hdd_reassoc_scenario, adapter->session_id);
 		break;
 
 	case eCSR_ROAM_FT_START:
@@ -4453,7 +4453,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *roam_info, uint32_t roamId,
 		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->sessionId);
+			  sta_ctx->hdd_reassoc_scenario, adapter->session_id);
 		break;
 	case eCSR_ROAM_NAPI_OFF:
 		hdd_debug("After Roam Synch Comp: NAPI Serialize OFF");
@@ -4568,7 +4568,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *roam_info, uint32_t roamId,
 			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->sessionId);
+				  adapter->session_id);
 		}
 	}
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD

core/hdd/src/wlan_hdd_disa.c

@@ -183,7 +183,7 @@ static int hdd_fill_encrypt_decrypt_params(struct encrypt_decrypt_req_params
 		return -EINVAL;
 	}
 
-	encrypt_decrypt_params->vdev_id = adapter->sessionId;
+	encrypt_decrypt_params->vdev_id = adapter->session_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

@@ -1680,7 +1680,7 @@ static int __wlan_hdd_cfg80211_extscan_get_capabilities(struct wiphy *wiphy,
 	pReqMsg->requestId =
 		nla_get_u32(tb
 		 [QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_REQUEST_ID]);
-	pReqMsg->sessionId = adapter->sessionId;
+	pReqMsg->sessionId = adapter->session_id;
 	hdd_debug("Req Id %d Session Id %d",
 		pReqMsg->requestId, pReqMsg->sessionId);
 
@@ -1816,7 +1816,7 @@ static int __wlan_hdd_cfg80211_extscan_get_cached_results(struct wiphy *wiphy,
 	}
 
 	pReqMsg->requestId = nla_get_u32(tb[PARAM_REQUEST_ID]);
-	pReqMsg->sessionId = adapter->sessionId;
+	pReqMsg->sessionId = adapter->session_id;
 
 	/* Parse and fetch flush parameter */
 	if (!tb[PARAM_FLUSH]) {
@@ -1983,7 +1983,7 @@ __wlan_hdd_cfg80211_extscan_set_bssid_hotlist(struct wiphy *wiphy,
 			pReqMsg->numAp, WLAN_EXTSCAN_MAX_HOTLIST_APS);
 		goto fail;
 	}
-	pReqMsg->sessionId = adapter->sessionId;
+	pReqMsg->sessionId = adapter->session_id;
 	hdd_debug("Number of AP %d Session Id %d",
 		pReqMsg->numAp, pReqMsg->sessionId);
 
@@ -2236,7 +2236,7 @@ __wlan_hdd_cfg80211_extscan_set_significant_change(struct wiphy *wiphy,
 		goto fail;
 	}
 
-	pReqMsg->sessionId = adapter->sessionId;
+	pReqMsg->sessionId = adapter->session_id;
 	hdd_debug("Number of AP %d Session Id %d",
 		pReqMsg->numAp, pReqMsg->sessionId);
 
@@ -3176,7 +3176,7 @@ __wlan_hdd_cfg80211_extscan_start(struct wiphy *wiphy,
 	}
 
 	pReqMsg->requestId = nla_get_u32(tb[PARAM_REQUEST_ID]);
-	pReqMsg->sessionId = adapter->sessionId;
+	pReqMsg->sessionId = adapter->session_id;
 
 	/* Parse and fetch base period */
 	if (!tb[PARAM_BASE_PERIOD]) {
@@ -3390,7 +3390,7 @@ __wlan_hdd_cfg80211_extscan_stop(struct wiphy *wiphy,
 	}
 
 	pReqMsg->requestId = nla_get_u32(tb[PARAM_REQUEST_ID]);
-	pReqMsg->sessionId = adapter->sessionId;
+	pReqMsg->sessionId = adapter->session_id;
 	hdd_debug("Req Id %d Session Id %d",
 		pReqMsg->requestId, pReqMsg->sessionId);
 
@@ -3523,7 +3523,7 @@ __wlan_hdd_cfg80211_extscan_reset_bssid_hotlist(struct wiphy *wiphy,
 	pReqMsg->requestId =
 		nla_get_u32(tb
 		 [QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_REQUEST_ID]);
-	pReqMsg->sessionId = adapter->sessionId;
+	pReqMsg->sessionId = adapter->session_id;
 	hdd_debug("Req Id %d Session Id %d",
 		pReqMsg->requestId, pReqMsg->sessionId);
 
@@ -3653,7 +3653,7 @@ __wlan_hdd_cfg80211_extscan_reset_significant_change(struct wiphy
 	pReqMsg->requestId =
 		nla_get_u32(tb
 		 [QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_REQUEST_ID]);
-	pReqMsg->sessionId = adapter->sessionId;
+	pReqMsg->sessionId = adapter->session_id;
 	hdd_debug("Req Id %d Session Id %d",
 		pReqMsg->requestId, pReqMsg->sessionId);
 
@@ -3903,7 +3903,7 @@ static int __wlan_hdd_cfg80211_set_epno_list(struct wiphy *wiphy,
 	    tb[QCA_WLAN_VENDOR_ATTR_PNO_CONFIG_REQUEST_ID]);
 	hdd_debug("Req Id %u", req_msg->request_id);
 
-	req_msg->session_id = adapter->sessionId;
+	req_msg->session_id = adapter->session_id;
 	hdd_debug("Session Id %d", req_msg->session_id);
 
 	if (num_networks) {
@@ -4197,7 +4197,7 @@ static int __wlan_hdd_cfg80211_set_passpoint_list(struct wiphy *wiphy,
 	req_msg->request_id = nla_get_u32(
 	    tb[QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_REQUEST_ID]);
 
-	req_msg->session_id = adapter->sessionId;
+	req_msg->session_id = adapter->session_id;
 	hdd_debug("Req Id %u Session Id %d", req_msg->request_id,
 			req_msg->session_id);
 
@@ -4301,7 +4301,7 @@ static int __wlan_hdd_cfg80211_reset_passpoint_list(struct wiphy *wiphy,
 	req_msg->request_id = nla_get_u32(
 	    tb[QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_REQUEST_ID]);
 
-	req_msg->session_id = adapter->sessionId;
+	req_msg->session_id = adapter->session_id;
 	hdd_debug("Req Id %u Session Id %d",
 			req_msg->request_id, req_msg->session_id);
 

core/hdd/src/wlan_hdd_green_ap.c

@@ -124,7 +124,7 @@ static int hdd_green_ap_enable(struct hdd_adapter *adapter, uint8_t enable)
 
 	hdd_debug("Set Green-AP val: %d", enable);
 
-	ret = wma_cli_set_command(adapter->sessionId,
+	ret = wma_cli_set_command(adapter->session_id,
 				  WMI_PDEV_GREEN_AP_PS_ENABLE_CMDID,
 				  enable, DBG_CMD);
 

core/hdd/src/wlan_hdd_hostapd.c

@@ -253,7 +253,7 @@ hdd_hostapd_init_sap_session(struct hdd_adapter *adapter,
 	}
 	status = wlansap_start(sap_ctx, adapter->device_mode,
 			       adapter->mac_addr.bytes,
-			       adapter->sessionId);
+			       adapter->session_id);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		hdd_err("wlansap_start failed!! status: %d", status);
 		adapter->session.ap.sap_context = NULL;
@@ -270,7 +270,7 @@ hdd_hostapd_init_sap_session(struct hdd_adapter *adapter,
 error:
 	wlansap_context_put(sap_ctx);
 	hdd_err("releasing the sap context for session-id:%d",
-		adapter->sessionId);
+		adapter->session_id);
 
 	return NULL;
 }
@@ -305,7 +305,7 @@ int hdd_hostapd_deinit_sap_session(struct hdd_adapter *adapter)
 	}
 	adapter->session.ap.sap_context = NULL;
 
-	if (!wlan_hdd_validate_session_id(adapter->sessionId)) {
+	if (!wlan_hdd_validate_session_id(adapter->session_id)) {
 		if (hdd_objmgr_release_vdev(adapter)) {
 			hdd_err("objmgr vdev release failed");
 			status = -EINVAL;
@@ -661,7 +661,7 @@ QDF_STATUS hdd_set_sap_ht2040_mode(struct hdd_adapter *adapter,
 			return QDF_STATUS_E_FAULT;
 		}
 		qdf_ret_status =
-			sme_set_ht2040_mode(hHal, adapter->sessionId,
+			sme_set_ht2040_mode(hHal, adapter->session_id,
 					channel_type, true);
 		if (qdf_ret_status == QDF_STATUS_E_FAILURE) {
 			hdd_err("Failed to change HT20/40 mode");
@@ -850,7 +850,7 @@ static int hdd_stop_bss_link(struct hdd_adapter *adapter,
 		clear_bit(SOFTAP_BSS_STARTED, &adapter->event_flags);
 		policy_mgr_decr_session_set_pcl(hdd_ctx->hdd_psoc,
 					adapter->device_mode,
-					adapter->sessionId);
+					adapter->session_id);
 	}
 	EXIT();
 	return (status == QDF_STATUS_SUCCESS) ? 0 : -EBUSY;
@@ -1498,7 +1498,7 @@ hdd_stop_sap_due_to_invalid_channel(struct work_struct *work)
 	struct hdd_adapter *sap_adapter = container_of(work,
 						  struct hdd_adapter,
 						  sap_stop_bss_work);
-	hdd_debug("work started for sap session[%d]", sap_adapter->sessionId);
+	hdd_debug("work started for sap session[%d]", sap_adapter->session_id);
 	cds_ssr_protect(__func__);
 	if (sap_adapter == NULL) {
 	    cds_err("sap_adapter is NULL, no work needed");
@@ -1598,7 +1598,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 		       operatingChannel,
 		       pSapEvent->sapevt.sapStartBssCompleteEvent.staId);
 
-		adapter->sessionId =
+		adapter->session_id =
 			pSapEvent->sapevt.sapStartBssCompleteEvent.sessionId;
 
 		hostapd_state->qdf_status =
@@ -1619,7 +1619,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 
 		hdd_debug("The value of dfs_cac_block_tx[%d] for ApCtx[%pK]:%d",
 				ap_ctx->dfs_cac_block_tx, ap_ctx,
-				adapter->sessionId);
+				adapter->session_id);
 
 		if (hostapd_state->qdf_status) {
 			hdd_err("startbss event failed!!");
@@ -1717,7 +1717,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 
 		sme_roam_set_default_key_index(
 			WLAN_HDD_GET_HAL_CTX(adapter),
-			adapter->sessionId,
+			adapter->session_id,
 			ap_ctx->wep_def_key_idx);
 
 		/* Set group key / WEP key every time when BSS is restarted */
@@ -1749,7 +1749,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 			hdd_debug("Set SIFS Burst disable for DFS channel %d",
 			       ap_ctx->operating_channel);
 
-			if (wma_cli_set_command(adapter->sessionId,
+			if (wma_cli_set_command(adapter->session_id,
 						WMI_PDEV_PARAM_BURST_ENABLE,
 						0, PDEV_CMD)) {
 				hdd_err("Failed to Set SIFS Burst channel: %d",
@@ -1776,7 +1776,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 			hdd_ctx->hdd_psoc)) {
 			hdd_debug("check for possible hw mode change");
 			status = policy_mgr_set_hw_mode_on_channel_switch(
-				hdd_ctx->hdd_psoc, adapter->sessionId);
+				hdd_ctx->hdd_psoc, adapter->session_id);
 			if (QDF_IS_STATUS_ERROR(status))
 				hdd_debug("set hw mode change not done");
 			policy_mgr_set_do_hw_mode_change_flag(
@@ -1923,7 +1923,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 	}
 	case eSAP_DFS_RADAR_DETECT_DURING_PRE_CAC:
 		hdd_debug("notification for radar detect during pre cac:%d",
-			adapter->sessionId);
+			adapter->session_id);
 		hdd_send_conditional_chan_switch_status(hdd_ctx,
 			&adapter->wdev, false);
 		hdd_ctx->dev_dfs_cac_status = DFS_CAC_NEVER_DONE;
@@ -1934,7 +1934,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 		break;
 	case eSAP_DFS_PRE_CAC_END:
 		hdd_debug("pre cac end notification received:%d",
-			adapter->sessionId);
+			adapter->session_id);
 		hdd_send_conditional_chan_switch_status(hdd_ctx,
 			&adapter->wdev, true);
 		ap_ctx->dfs_cac_block_tx = false;
@@ -2064,7 +2064,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 		}
 
 		DPTRACE(qdf_dp_trace_mgmt_pkt(QDF_DP_TRACE_MGMT_PACKET_RECORD,
-			adapter->sessionId,
+			adapter->session_id,
 			QDF_TRACE_DEFAULT_PDEV_ID,
 			QDF_PROTO_TYPE_MGMT, QDF_PROTO_MGMT_ASSOC));
 
@@ -2079,7 +2079,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 
 			cdp_get_intra_bss_fwd_pkts_count(
 				cds_get_context(QDF_MODULE_ID_SOC),
-				adapter->sessionId,
+				adapter->session_id,
 				&adapter->prev_fwd_tx_packets,
 				&adapter->prev_fwd_rx_packets);
 
@@ -2139,7 +2139,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 		/* Lets abort scan to ensure smooth authentication for client */
 		if ((scan_info != NULL) && scan_info->mScanPending) {
 			wlan_abort_scan(hdd_ctx->hdd_pdev, INVAL_PDEV_ID,
-				adapter->sessionId, INVALID_SCAN_ID, false);
+				adapter->session_id, INVALID_SCAN_ID, false);
 		}
 		if (adapter->device_mode == QDF_P2P_GO_MODE) {
 			/* send peer status indication to oem app */
@@ -2147,7 +2147,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 				&event->staMac,
 				ePeerConnected,
 				event->timingMeasCap,
-				adapter->sessionId,
+				adapter->session_id,
 				&event->chan_info,
 				adapter->device_mode);
 		}
@@ -2206,7 +2206,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 		}
 #endif
 		DPTRACE(qdf_dp_trace_mgmt_pkt(QDF_DP_TRACE_MGMT_PACKET_RECORD,
-			adapter->sessionId,
+			adapter->session_id,
 			QDF_TRACE_DEFAULT_PDEV_ID,
 			QDF_PROTO_TYPE_MGMT, QDF_PROTO_MGMT_DISASSOC));
 
@@ -2266,7 +2266,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 
 		/* Update the beacon Interval if it is P2P GO */
 		qdf_status = policy_mgr_change_mcc_go_beacon_interval(
-			hdd_ctx->hdd_psoc, adapter->sessionId,
+			hdd_ctx->hdd_psoc, adapter->session_id,
 			adapter->device_mode);
 		if (QDF_STATUS_SUCCESS != qdf_status) {
 			hdd_err("Failed to update Beacon interval status: %d",
@@ -2278,7 +2278,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 						sapStationDisassocCompleteEvent.
 						staMac, ePeerDisconnected,
 						0,
-						adapter->sessionId,
+						adapter->session_id,
 						NULL,
 						adapter->device_mode);
 		}
@@ -2521,7 +2521,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 
 	case eSAP_STOP_BSS_DUE_TO_NO_CHNL:
 		hdd_debug("Stop sap session[%d]",
-			  adapter->sessionId);
+			  adapter->session_id);
 		INIT_WORK(&adapter->sap_stop_bss_work,
 			  hdd_stop_sap_due_to_invalid_channel);
 		schedule_work(&adapter->sap_stop_bss_work);
@@ -3111,7 +3111,7 @@ static int __iw_softap_set_two_ints_getnone(struct net_device *dev,
 			cds_trigger_recovery(QDF_REASON_UNSPECIFIED);
 			return 0;
 		}
-		ret = wma_cli_set2_command(adapter->sessionId,
+		ret = wma_cli_set2_command(adapter->session_id,
 					   GEN_PARAM_CRASH_INJECT,
 					   value[1], value[2],
 					   GEN_CMD);
@@ -3133,14 +3133,14 @@ 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->sessionId,
+		ret = wma_cli_set2_command(adapter->session_id,
 				 WMI_WLAN_PROFILE_ENABLE_PROFILE_ID_CMDID,
 					value[1], value[2], DBG_CMD);
 		break;
 	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->sessionId,
+		ret = wma_cli_set2_command(adapter->session_id,
 					WMI_WLAN_PROFILE_SET_HIST_INTVL_CMDID,
 					value[1], value[2], DBG_CMD);
 	case QCSAP_SET_WLAN_SUSPEND:
@@ -3356,7 +3356,7 @@ static __iw_softap_setparam(struct net_device *dev,
 		QDF_STATUS status;
 
 		status = sme_update_session_param(hHal,
-				adapter->sessionId,
+				adapter->session_id,
 				SIR_PARAM_SSID_HIDDEN, set_value);
 		if (QDF_STATUS_SUCCESS != status) {
 			hdd_err("QCSAP_PARAM_HIDE_SSID failed");
@@ -3389,7 +3389,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMA_VDEV_TXRX_FWSTATS_ENABLE_CMDID,
 					  set_value, VDEV_CMD);
 		break;
@@ -3398,7 +3398,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCSAP_PARAM_SET_TXRX_STATS:
 	{
 		ret = cds_get_datapath_handles(&soc, &pdev, &vdev,
-				 adapter->sessionId);
+				 adapter->session_id);
 		if (ret != 0) {
 			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				"Invalid Handles");
@@ -3414,7 +3414,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMI_DBGLOG_LOG_LEVEL,
 					  set_value, DBG_CMD);
 		break;
@@ -3423,7 +3423,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMI_DBGLOG_VAP_ENABLE,
 					  set_value, DBG_CMD);
 		break;
@@ -3432,7 +3432,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMI_DBGLOG_VAP_DISABLE,
 					  set_value, DBG_CMD);
 		break;
@@ -3441,7 +3441,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMI_DBGLOG_MODULE_ENABLE,
 					  set_value, DBG_CMD);
 		break;
@@ -3450,7 +3450,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMI_DBGLOG_MODULE_DISABLE,
 					  set_value, DBG_CMD);
 		break;
@@ -3459,7 +3459,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMI_DBGLOG_MOD_LOG_LEVEL,
 					  set_value, DBG_CMD);
 		break;
@@ -3468,7 +3468,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMI_DBGLOG_TYPE,
 					  set_value, DBG_CMD);
 		break;
@@ -3476,7 +3476,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMI_DBGLOG_REPORT_ENABLE,
 					  set_value, DBG_CMD);
 		break;
@@ -3499,7 +3499,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMA_VDEV_TXRX_FWSTATS_RESET_CMDID,
 					  set_value, VDEV_CMD);
 		break;
@@ -3507,7 +3507,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCSAP_PARAM_RTSCTS:
 	{
-		ret = wma_cli_set_command(adapter->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMI_VDEV_PARAM_ENABLE_RTSCTS,
 					  set_value, VDEV_CMD);
 		if (ret) {
@@ -3573,7 +3573,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMI_VDEV_PARAM_FIXED_RATE,
 					  set_value, VDEV_CMD);
 		break;
@@ -3603,7 +3603,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMI_VDEV_PARAM_FIXED_RATE,
 					  set_value, VDEV_CMD);
 		break;
@@ -3619,7 +3619,7 @@ static __iw_softap_setparam(struct net_device *dev,
 		 *
 		 * SGI is same for 20MHZ and 40MHZ.
 		 */
-		ret = sme_update_ht_config(hHal, adapter->sessionId,
+		ret = sme_update_ht_config(hHal, adapter->session_id,
 					   WNI_CFG_HT_CAP_INFO_SHORT_GI_20MHZ,
 					   set_value);
 		if (ret)
@@ -3630,7 +3630,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  GEN_VDEV_PARAM_AMPDU,
 					  set_value, GEN_CMD);
 		break;
@@ -3639,7 +3639,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  GEN_VDEV_PARAM_AMSDU,
 					  set_value, GEN_CMD);
 		break;
@@ -3647,7 +3647,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMI_VDEV_PARAM_GTX_HT_MCS,
 					  set_value, GTX_CMD);
 		break;
@@ -3656,7 +3656,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMI_VDEV_PARAM_GTX_VHT_MCS,
 						set_value, GTX_CMD);
 		break;
@@ -3665,7 +3665,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMI_VDEV_PARAM_GTX_USR_CFG,
 					  set_value, GTX_CMD);
 		break;
@@ -3674,7 +3674,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMI_VDEV_PARAM_GTX_THRE,
 					  set_value, GTX_CMD);
 		break;
@@ -3683,7 +3683,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMI_VDEV_PARAM_GTX_MARGIN,
 					  set_value, GTX_CMD);
 		break;
@@ -3692,7 +3692,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMI_VDEV_PARAM_GTX_STEP,
 					  set_value, GTX_CMD);
 		break;
@@ -3701,7 +3701,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMI_VDEV_PARAM_GTX_MINTPC,
 					  set_value, GTX_CMD);
 		break;
@@ -3710,7 +3710,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMI_VDEV_PARAM_GTX_BW_MASK,
 					  set_value, GTX_CMD);
 		break;
@@ -3749,7 +3749,7 @@ static __iw_softap_setparam(struct net_device *dev,
 		if (adapter->device_mode != QDF_SAP_MODE)
 			return -EINVAL;
 
-		status = sme_set_he_bss_color(hHal, adapter->sessionId,
+		status = sme_set_he_bss_color(hHal, adapter->session_id,
 				set_value);
 		if (QDF_STATUS_SUCCESS != status) {
 			hdd_err("SET_HE_BSS_COLOR failed");
@@ -3789,7 +3789,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMI_PDEV_PARAM_TX_CHAIN_MASK,
 					  set_value, PDEV_CMD);
 		break;
@@ -3798,7 +3798,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMI_PDEV_PARAM_RX_CHAIN_MASK,
 					  set_value, PDEV_CMD);
 		break;
@@ -3807,7 +3807,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCASAP_NSS_CMD:
 	{
 		hdd_debug("QCASAP_NSS_CMD val %d", set_value);
-		ret = wma_cli_set_command(adapter->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMI_VDEV_PARAM_NSS,
 					  set_value, VDEV_CMD);
 		break;
@@ -3885,7 +3885,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					WMI_WLAN_PROFILE_TRIGGER_CMDID,
 					set_value, DBG_CMD);
 		break;
@@ -3908,25 +3908,25 @@ static __iw_softap_setparam(struct net_device *dev,
 		break;
 	case QCASAP_PARAM_DCM:
 		hdd_notice("Set WMI_VDEV_PARAM_HE_DCM: %d", set_value);
-		ret = wma_cli_set_command(adapter->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 					  WMI_VDEV_PARAM_HE_DCM, set_value,
 					  VDEV_CMD);
 		break;
 	case QCASAP_PARAM_RANGE_EXT:
 		hdd_notice("Set WMI_VDEV_PARAM_HE_RANGE_EXT: %d", set_value);
-		ret = wma_cli_set_command(adapter->sessionId,
+		ret = wma_cli_set_command(adapter->session_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->sessionId,
+		ret = wma_cli_set_command((int)adapter->session_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->sessionId,
+		ret = wma_cli_set_command((int)adapter->session_id,
 				(int)WMI_PDEV_PARAM_ENABLE_RTS_SIFS_BURSTING,
 				set_value, PDEV_CMD);
 		break;
@@ -4069,7 +4069,7 @@ static __iw_softap_getparam(struct net_device *dev,
 
 	case QCSAP_PARAM_RTSCTS:
 	{
-		*value = wma_cli_get_command(adapter->sessionId,
+		*value = wma_cli_get_command(adapter->session_id,
 					     WMI_VDEV_PARAM_ENABLE_RTSCTS,
 					     VDEV_CMD);
 		break;
@@ -4077,7 +4077,7 @@ static __iw_softap_getparam(struct net_device *dev,
 
 	case QCASAP_SHORT_GI:
 	{
-		*value = wma_cli_get_command(adapter->sessionId,
+		*value = wma_cli_get_command(adapter->session_id,
 					     WMI_VDEV_PARAM_SGI,
 					     VDEV_CMD);
 		break;
@@ -4086,7 +4086,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->sessionId,
+		*value = wma_cli_get_command(adapter->session_id,
 					     WMI_VDEV_PARAM_GTX_HT_MCS,
 					     GTX_CMD);
 		break;
@@ -4095,7 +4095,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->sessionId,
+		*value = wma_cli_get_command(adapter->session_id,
 					     WMI_VDEV_PARAM_GTX_VHT_MCS,
 					     GTX_CMD);
 		break;
@@ -4104,7 +4104,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->sessionId,
+		*value = wma_cli_get_command(adapter->session_id,
 					     WMI_VDEV_PARAM_GTX_USR_CFG,
 					     GTX_CMD);
 		break;
@@ -4113,7 +4113,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->sessionId,
+		*value = wma_cli_get_command(adapter->session_id,
 					     WMI_VDEV_PARAM_GTX_THRE,
 					     GTX_CMD);
 		break;
@@ -4122,7 +4122,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->sessionId,
+		*value = wma_cli_get_command(adapter->session_id,
 					     WMI_VDEV_PARAM_GTX_MARGIN,
 					     GTX_CMD);
 		break;
@@ -4131,7 +4131,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->sessionId,
+		*value = wma_cli_get_command(adapter->session_id,
 					     WMI_VDEV_PARAM_GTX_STEP,
 					     GTX_CMD);
 		break;
@@ -4140,7 +4140,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->sessionId,
+		*value = wma_cli_get_command(adapter->session_id,
 					     WMI_VDEV_PARAM_GTX_MINTPC,
 					     GTX_CMD);
 		break;
@@ -4149,7 +4149,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->sessionId,
+		*value = wma_cli_get_command(adapter->session_id,
 					     WMI_VDEV_PARAM_GTX_BW_MASK,
 					     GTX_CMD);
 		break;
@@ -4188,7 +4188,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->sessionId,
+		*value = wma_cli_get_command(adapter->session_id,
 					     WMI_PDEV_PARAM_TX_CHAIN_MASK,
 					     PDEV_CMD);
 		break;
@@ -4197,7 +4197,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->sessionId,
+		*value = wma_cli_get_command(adapter->session_id,
 					     WMI_PDEV_PARAM_RX_CHAIN_MASK,
 					     PDEV_CMD);
 		break;
@@ -4206,7 +4206,7 @@ static __iw_softap_getparam(struct net_device *dev,
 	case QCASAP_NSS_CMD:
 	{
 		hdd_debug("QCASAP_NSS_CMD");
-		*value = wma_cli_get_command(adapter->sessionId,
+		*value = wma_cli_get_command(adapter->session_id,
 					     WMI_VDEV_PARAM_NSS,
 					     VDEV_CMD);
 		break;
@@ -4222,7 +4222,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->sessionId,
+		ret = wma_cli_set_command(adapter->session_id,
 				WMI_WLAN_PROFILE_GET_PROFILE_DATA_CMDID,
 				0, DBG_CMD);
 		break;
@@ -4248,14 +4248,14 @@ static __iw_softap_getparam(struct net_device *dev,
 	}
 	case QCASAP_PARAM_DCM:
 	{
-		*value = wma_cli_get_command(adapter->sessionId,
+		*value = wma_cli_get_command(adapter->session_id,
 					     WMI_VDEV_PARAM_HE_DCM,
 					     VDEV_CMD);
 		break;
 	}
 	case QCASAP_PARAM_RANGE_EXT:
 	{
-		*value = wma_cli_get_command(adapter->sessionId,
+		*value = wma_cli_get_command(adapter->session_id,
 					     WMI_VDEV_PARAM_HE_RANGE_EXT,
 					     VDEV_CMD);
 		break;
@@ -4530,7 +4530,7 @@ static __iw_softap_set_tx_power(struct net_device *dev,
 
 	set_value = value[0];
 	if (QDF_STATUS_SUCCESS !=
-	    sme_set_tx_power(hHal, adapter->sessionId, bssid,
+	    sme_set_tx_power(hHal, adapter->session_id, bssid,
 			     adapter->device_mode, set_value)) {
 		hdd_err("Setting tx power failed");
 		return -EIO;
@@ -5116,7 +5116,7 @@ __iw_softap_stopbss(struct net_device *dev,
 		clear_bit(SOFTAP_BSS_STARTED, &adapter->event_flags);
 		policy_mgr_decr_session_set_pcl(hdd_ctx->hdd_psoc,
 					     adapter->device_mode,
-					     adapter->sessionId);
+					     adapter->session_id);
 		ret = qdf_status_to_os_return(status);
 	}
 	EXIT();
@@ -6238,7 +6238,7 @@ QDF_STATUS hdd_init_ap_mode(struct hdd_adapter *adapter, bool reinit)
 
 	set_bit(WMM_INIT_DONE, &adapter->event_flags);
 
-	ret = wma_cli_set_command(adapter->sessionId,
+	ret = wma_cli_set_command(adapter->session_id,
 				  WMI_PDEV_PARAM_BURST_ENABLE,
 				  hdd_ctx->config->enableSifsBurst,
 				  PDEV_CMD);
@@ -6348,7 +6348,7 @@ struct hdd_adapter *hdd_wlan_create_ap_dev(struct hdd_context *hdd_ctx,
 	adapter->dev = dev;
 	adapter->hdd_ctx = hdd_ctx;
 	adapter->magic = WLAN_HDD_ADAPTER_MAGIC;
-	adapter->sessionId = HDD_SESSION_ID_INVALID;
+	adapter->session_id = HDD_SESSION_ID_INVALID;
 
 	hdd_debug("dev = %pK, adapter = %pK, concurrency_mode=0x%x",
 		dev, adapter,
@@ -6478,7 +6478,7 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_SET_CHANNEL,
-			 adapter->sessionId, channel_type));
+			 adapter->session_id, channel_type));
 
 	hdd_debug("Device_mode %s(%d)  freq = %d",
 	       hdd_device_mode_to_string(adapter->device_mode),
@@ -6849,7 +6849,7 @@ wlan_hdd_cfg80211_alloc_new_beacon(struct hdd_adapter *adapter,
 
 	if (!params->head && !old) {
 		hdd_err("session: %d old and new heads points to NULL",
-		       adapter->sessionId);
+		       adapter->session_id);
 		return -EINVAL;
 	}
 
@@ -7034,7 +7034,7 @@ int wlan_hdd_cfg80211_update_apies(struct hdd_adapter *adapter)
 	wlan_hdd_add_sap_obss_scan_ie(adapter, genie, &total_ielen);
 
 	qdf_copy_macaddr(&updateIE.bssid, &adapter->mac_addr);
-	updateIE.smeSessionId = adapter->sessionId;
+	updateIE.smeSessionId = adapter->session_id;
 
 	if (test_bit(SOFTAP_BSS_STARTED, &adapter->event_flags)) {
 		updateIE.ieBufferlength = total_ielen;
@@ -8114,7 +8114,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 	if (hostapd_state->bss_state == BSS_START)
 		policy_mgr_incr_active_session(hdd_ctx->hdd_psoc,
 					adapter->device_mode,
-					adapter->sessionId);
+					adapter->session_id);
 #ifdef DHCP_SERVER_OFFLOAD
 	if (iniConfig->enableDHCPServerOffload)
 		wlan_hdd_set_dhcp_server_offload(adapter);
@@ -8204,14 +8204,14 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->sessionId)) {
-		hdd_err("Invalid session id: %d", adapter->sessionId);
+	if (wlan_hdd_validate_session_id(adapter->session_id)) {
+		hdd_err("Invalid session id: %d", adapter->session_id);
 		return -EINVAL;
 	}
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_STOP_AP,
-			 adapter->sessionId, adapter->device_mode));
+			 adapter->session_id, adapter->device_mode));
 
 	if (!(adapter->device_mode == QDF_SAP_MODE ||
 	      adapter->device_mode == QDF_P2P_GO_MODE)) {
@@ -8250,7 +8250,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 				hdd_debug("Aborting pending scan for device mode:%d",
 				       staAdapter->device_mode);
 				wlan_abort_scan(hdd_ctx->hdd_pdev, INVAL_PDEV_ID,
-					staAdapter->sessionId, INVALID_SCAN_ID, true);
+					staAdapter->session_id, INVALID_SCAN_ID, true);
 			}
 		}
 
@@ -8283,7 +8283,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 	old = adapter->session.ap.beacon;
 	if (!old) {
 		hdd_err("Session id: %d beacon data points to NULL",
-		       adapter->sessionId);
+		       adapter->session_id);
 		return -EINVAL;
 	}
 	wlan_hdd_cleanup_remain_on_channel_ctx(adapter);
@@ -8309,7 +8309,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 		/*BSS stopped, clear the active sessions for this device mode*/
 		policy_mgr_decr_session_set_pcl(hdd_ctx->hdd_psoc,
 						adapter->device_mode,
-						adapter->sessionId);
+						adapter->session_id);
 		adapter->session.ap.beacon = NULL;
 		qdf_mem_free(old);
 	}
@@ -8324,7 +8324,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 	}
 
 	qdf_copy_macaddr(&updateIE.bssid, &adapter->mac_addr);
-	updateIE.smeSessionId = adapter->sessionId;
+	updateIE.smeSessionId = adapter->session_id;
 	updateIE.ieBufferlength = 0;
 	updateIE.pAdditionIEBuffer = NULL;
 	updateIE.append = true;
@@ -8507,13 +8507,13 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->sessionId)) {
-		hdd_err("Invalid session id: %d", adapter->sessionId);
+	if (wlan_hdd_validate_session_id(adapter->session_id)) {
+		hdd_err("Invalid session id: %d", adapter->session_id);
 		return -EINVAL;
 	}
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
-			 TRACE_CODE_HDD_CFG80211_START_AP, adapter->sessionId,
+			 TRACE_CODE_HDD_CFG80211_START_AP, adapter->session_id,
 			 params->beacon_interval));
 	if (WLAN_HDD_ADAPTER_MAGIC != adapter->magic) {
 		hdd_err("HDD adapter magic is invalid");
@@ -8597,7 +8597,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 		hdd_err("ERR: clear event failed");
 
 	status = policy_mgr_current_connections_update(hdd_ctx->hdd_psoc,
-			adapter->sessionId, channel,
+			adapter->session_id, channel,
 			SIR_UPDATE_REASON_START_AP);
 	if (QDF_STATUS_E_FAILURE == status) {
 		hdd_err("ERROR: connections update failed!!");
@@ -8706,7 +8706,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 				hdd_err("Failed to allocate Memory");
 				return QDF_STATUS_E_FAILURE;
 			}
-			sta_inactivity_timer->session_id = adapter->sessionId;
+			sta_inactivity_timer->session_id = adapter->session_id;
 			sta_inactivity_timer->sta_inactivity_timeout =
 				params->inactivity_timeout;
 			sme_update_sta_inactivity_timeout(WLAN_HDD_GET_HAL_CTX
@@ -8772,14 +8772,14 @@ static int __wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->sessionId)) {
-		hdd_err("invalid session id: %d", adapter->sessionId);
+	if (wlan_hdd_validate_session_id(adapter->session_id)) {
+		hdd_err("invalid session id: %d", adapter->session_id);
 		return -EINVAL;
 	}
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_CHANGE_BEACON,
-			 adapter->sessionId, adapter->device_mode));
+			 adapter->session_id, adapter->device_mode));
 	hdd_debug("Device_mode %s(%d)",
 	       hdd_device_mode_to_string(adapter->device_mode),
 	       adapter->device_mode);
@@ -8799,7 +8799,7 @@ static int __wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy,
 
 	if (!old) {
 		hdd_err("session id: %d beacon data points to NULL",
-		       adapter->sessionId);
+		       adapter->session_id);
 		return -EINVAL;
 	}
 

core/hdd/src/wlan_hdd_ioctl.c

@@ -811,7 +811,7 @@ void hdd_wma_send_fastreassoc_cmd(struct hdd_adapter *adapter,
 	qdf_mem_copy(connected_bssid, hdd_sta_ctx->conn_info.bssId.bytes,
 		     ETH_ALEN);
 	sme_fast_reassoc(WLAN_HDD_GET_HAL_CTX(adapter),
-			 profile, bssid, channel, adapter->sessionId,
+			 profile, bssid, channel, adapter->session_id,
 			 connected_bssid);
 }
 #endif
@@ -883,7 +883,7 @@ int hdd_reassoc(struct hdd_adapter *adapter, const uint8_t *bssid,
 		handoffInfo.channel = channel;
 		handoffInfo.src = src;
 		qdf_mem_copy(handoffInfo.bssid.bytes, bssid, QDF_MAC_ADDR_SIZE);
-		sme_handoff_request(hdd_ctx->hHal, adapter->sessionId,
+		sme_handoff_request(hdd_ctx->hHal, adapter->session_id,
 				    &handoffInfo);
 	}
 exit:
@@ -1096,7 +1096,7 @@ hdd_sendactionframe(struct hdd_adapter *adapter, const uint8_t *bssid,
 				 * frames.
 				 */
 				sme_abort_roam_scan(hdd_ctx->hHal,
-						    adapter->sessionId);
+						    adapter->session_id);
 			} else {
 				/*
 				 * 0 is accepted as current home channel,
@@ -1450,7 +1450,7 @@ hdd_parse_set_roam_scan_channels_v1(struct hdd_adapter *adapter,
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_SETROAMSCANCHANNELS_IOCTL,
-			 adapter->sessionId, num_chan));
+			 adapter->session_id, num_chan));
 
 	if (num_chan > WNI_CFG_VALID_CHANNEL_LIST_LEN) {
 		hdd_err("number of channels (%d) supported exceeded max (%d)",
@@ -1461,7 +1461,7 @@ hdd_parse_set_roam_scan_channels_v1(struct hdd_adapter *adapter,
 
 	status =
 		sme_change_roam_scan_channel_list(hdd_ctx->hHal,
-						  adapter->sessionId,
+						  adapter->session_id,
 						  channel_list, num_chan);
 	if (QDF_STATUS_SUCCESS != status) {
 		hdd_err("Failed to update channel list information");
@@ -1516,7 +1516,7 @@ hdd_parse_set_roam_scan_channels_v2(struct hdd_adapter *adapter,
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_SETROAMSCANCHANNELS_IOCTL,
-			 adapter->sessionId, num_chan));
+			 adapter->session_id, num_chan));
 
 	for (i = 0; i < num_chan; i++) {
 		channel = *value++;
@@ -1530,7 +1530,7 @@ hdd_parse_set_roam_scan_channels_v2(struct hdd_adapter *adapter,
 	}
 	status =
 		sme_change_roam_scan_channel_list(hdd_ctx->hHal,
-						  adapter->sessionId,
+						  adapter->session_id,
 						  channel_list, num_chan);
 	if (QDF_STATUS_SUCCESS != status) {
 		hdd_err("Failed to update channel list information");
@@ -2015,7 +2015,7 @@ static int hdd_set_app_type1_parser(struct hdd_adapter *adapter,
 	}
 
 	memset(&params, 0, sizeof(tSirAppType1Params));
-	params.vdev_id = adapter->sessionId;
+	params.vdev_id = adapter->session_id;
 	qdf_copy_macaddr(&params.wakee_mac_addr, &adapter->mac_addr);
 
 	params.id_length = strlen(id);
@@ -2104,7 +2104,7 @@ static int hdd_set_app_type2_parser(struct hdd_adapter *adapter,
 	params.rc4_key_len = strlen(rc4_key);
 	qdf_mem_copy(params.rc4_key, rc4_key, params.rc4_key_len);
 
-	params.vdev_id = adapter->sessionId;
+	params.vdev_id = adapter->session_id;
 	params.tcp_src_port = (params.tcp_src_port != 0) ?
 		params.tcp_src_port : hdd_ctx->config->extWowApp2TcpSrcPort;
 	params.tcp_dst_port = (params.tcp_dst_port != 0) ?
@@ -2420,7 +2420,7 @@ static int wlan_hdd_get_link_status(struct hdd_adapter *adapter)
 
 	hstatus = sme_get_link_status(WLAN_HDD_GET_HAL_CTX(adapter),
 				      hdd_get_link_status_cb,
-				      cookie, adapter->sessionId);
+				      cookie, adapter->session_id);
 	if (QDF_STATUS_SUCCESS != hstatus) {
 		hdd_err("Unable to retrieve link status");
 		/* return a cached value */
@@ -2846,7 +2846,7 @@ static int drv_cmd_p2p_dev_addr(struct hdd_adapter *adapter,
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_P2P_DEV_ADDR_IOCTL,
-			 adapter->sessionId,
+			 adapter->session_id,
 			(unsigned int)(*(hdd_ctx->p2pDeviceAddress.bytes + 2)
 				<< 24 | *(hdd_ctx->p2pDeviceAddress.bytes
 				+ 3) << 16 | *(hdd_ctx->
@@ -2990,13 +2990,13 @@ static int drv_cmd_set_roam_trigger(struct hdd_adapter *adapter,
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_SETROAMTRIGGER_IOCTL,
-			 adapter->sessionId, lookUpThreshold));
+			 adapter->session_id, lookUpThreshold));
 	hdd_debug("Received Command to Set Roam trigger (Neighbor lookup threshold) = %d",
 		  lookUpThreshold);
 
 	hdd_ctx->config->nNeighborLookupRssiThreshold = lookUpThreshold;
 	status = sme_set_neighbor_lookup_rssi_threshold(hdd_ctx->hHal,
-							adapter->sessionId,
+							adapter->session_id,
 							lookUpThreshold);
 	if (QDF_STATUS_SUCCESS != status) {
 		hdd_err("Failed to set roam trigger, try again");
@@ -3023,7 +3023,7 @@ static int drv_cmd_get_roam_trigger(struct hdd_adapter *adapter,
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_GETROAMTRIGGER_IOCTL,
-			 adapter->sessionId, lookUpThreshold));
+			 adapter->session_id, lookUpThreshold));
 
 	len = scnprintf(extra, sizeof(extra), "%s %d", command, rssi);
 	len = QDF_MIN(priv_data->total_len, len + 1);
@@ -3077,7 +3077,7 @@ static int drv_cmd_set_roam_scan_period(struct hdd_adapter *adapter,
 	}
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_SETROAMSCANPERIOD_IOCTL,
-			 adapter->sessionId, roamScanPeriod));
+			 adapter->session_id, roamScanPeriod));
 	neighborEmptyScanRefreshPeriod = roamScanPeriod * 1000;
 
 	hdd_debug("Received Command to Set roam scan period (Empty Scan refresh period) = %d",
@@ -3086,7 +3086,7 @@ static int drv_cmd_set_roam_scan_period(struct hdd_adapter *adapter,
 	hdd_ctx->config->nEmptyScanRefreshPeriod =
 		neighborEmptyScanRefreshPeriod;
 	sme_update_empty_scan_refresh_period(hdd_ctx->hHal,
-					     adapter->sessionId,
+					     adapter->session_id,
 					     neighborEmptyScanRefreshPeriod);
 
 exit:
@@ -3107,7 +3107,7 @@ static int drv_cmd_get_roam_scan_period(struct hdd_adapter *adapter,
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_GETROAMSCANPERIOD_IOCTL,
-			 adapter->sessionId,
+			 adapter->session_id,
 			 nEmptyScanRefreshPeriod));
 	len = scnprintf(extra, sizeof(extra), "%s %d",
 			"GETROAMSCANPERIOD",
@@ -3173,7 +3173,7 @@ static int drv_cmd_set_roam_scan_refresh_period(struct hdd_adapter *adapter,
 	hdd_ctx->config->nNeighborResultsRefreshPeriod =
 				neighborScanRefreshPeriod;
 	sme_set_neighbor_scan_refresh_period(hdd_ctx->hHal,
-					     adapter->sessionId,
+					     adapter->session_id,
 					     neighborScanRefreshPeriod);
 
 exit:
@@ -3269,12 +3269,12 @@ static int drv_cmd_set_roam_mode(struct hdd_adapter *adapter,
 			hdd_ctx->config->isRoamOffloadScanEnabled);
 		sme_update_is_fast_roam_ini_feature_enabled(
 			hdd_ctx->hHal,
-			adapter->sessionId,
+			adapter->session_id,
 			roamMode);
 	} else {
 		sme_update_is_fast_roam_ini_feature_enabled(
 			hdd_ctx->hHal,
-			adapter->sessionId,
+			adapter->session_id,
 			roamMode);
 		hdd_ctx->config->isRoamOffloadScanEnabled = roamMode;
 		sme_update_roam_scan_offload_enabled(
@@ -3358,7 +3358,7 @@ static int drv_cmd_set_roam_delta(struct hdd_adapter *adapter,
 
 	hdd_ctx->config->RoamRssiDiff = roamRssiDiff;
 	sme_update_roam_rssi_diff(hdd_ctx->hHal,
-				  adapter->sessionId,
+				  adapter->session_id,
 				  roamRssiDiff);
 
 exit:
@@ -3379,7 +3379,7 @@ static int drv_cmd_get_roam_delta(struct hdd_adapter *adapter,
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_GETROAMDELTA_IOCTL,
-			 adapter->sessionId, roamRssiDiff));
+			 adapter->session_id, roamRssiDiff));
 
 	len = scnprintf(extra, sizeof(extra), "%s %d",
 			command, roamRssiDiff);
@@ -3408,7 +3408,7 @@ static int drv_cmd_get_band(struct hdd_adapter *adapter,
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_GETBAND_IOCTL,
-			 adapter->sessionId, band));
+			 adapter->session_id, band));
 
 	len = scnprintf(extra, sizeof(extra), "%s %d", command, band);
 	len = QDF_MIN(priv_data->total_len, len + 1);
@@ -3447,7 +3447,7 @@ static int drv_cmd_get_roam_scan_channels(struct hdd_adapter *adapter,
 		sme_get_roam_scan_channel_list(hdd_ctx->hHal,
 					       ChannelList,
 					       &numChannels,
-					       adapter->sessionId)) {
+					       adapter->session_id)) {
 		hdd_err("failed to get roam scan channel list");
 		ret = -EFAULT;
 		goto exit;
@@ -3455,7 +3455,7 @@ static int drv_cmd_get_roam_scan_channels(struct hdd_adapter *adapter,
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_GETROAMSCANCHANNELS_IOCTL,
-			 adapter->sessionId, numChannels));
+			 adapter->session_id, numChannels));
 	/*
 	 * output channel list is of the format
 	 * [Number of roam scan channels][Channel1][Channel2]...
@@ -3639,14 +3639,14 @@ static int drv_cmd_set_roam_scan_channel_min_time(struct hdd_adapter *adapter,
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_SETROAMSCANCHANNELMINTIME_IOCTL,
-			 adapter->sessionId, minTime));
+			 adapter->session_id, minTime));
 	hdd_debug("Received Command to change channel min time = %d",
 		  minTime);
 
 	hdd_ctx->config->nNeighborScanMinChanTime = minTime;
 	sme_set_neighbor_scan_min_chan_time(hdd_ctx->hHal,
 					    minTime,
-					    adapter->sessionId);
+					    adapter->session_id);
 
 exit:
 	return ret;
@@ -3670,7 +3670,7 @@ static int drv_cmd_get_roam_scan_channel_min_time(struct hdd_adapter *adapter,
 {
 	int ret = 0;
 	uint16_t val = sme_get_neighbor_scan_min_chan_time(hdd_ctx->hHal,
-						adapter->sessionId);
+						adapter->session_id);
 	char extra[32];
 	uint8_t len = 0;
 
@@ -3681,7 +3681,7 @@ static int drv_cmd_get_roam_scan_channel_min_time(struct hdd_adapter *adapter,
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_GETROAMSCANCHANNELMINTIME_IOCTL,
-			 adapter->sessionId, val));
+			 adapter->session_id, val));
 
 	if (copy_to_user(priv_data->buf, &extra, len)) {
 		hdd_err("failed to copy data to user buffer");
@@ -3733,7 +3733,7 @@ static int drv_cmd_set_scan_channel_time(struct hdd_adapter *adapter,
 
 	hdd_ctx->config->nNeighborScanMaxChanTime = maxTime;
 	sme_set_neighbor_scan_max_chan_time(hdd_ctx->hHal,
-					    adapter->sessionId,
+					    adapter->session_id,
 					    maxTime);
 
 exit:
@@ -3748,7 +3748,7 @@ static int drv_cmd_get_scan_channel_time(struct hdd_adapter *adapter,
 {
 	int ret = 0;
 	uint16_t val = sme_get_neighbor_scan_max_chan_time(hdd_ctx->hHal,
-				adapter->sessionId);
+				adapter->session_id);
 	char extra[32];
 	uint8_t len = 0;
 
@@ -3807,7 +3807,7 @@ static int drv_cmd_set_scan_home_time(struct hdd_adapter *adapter,
 
 	hdd_ctx->config->nNeighborScanPeriod = val;
 	sme_set_neighbor_scan_period(hdd_ctx->hHal,
-				     adapter->sessionId, val);
+				     adapter->session_id, val);
 
 exit:
 	return ret;
@@ -3821,8 +3821,7 @@ static int drv_cmd_get_scan_home_time(struct hdd_adapter *adapter,
 {
 	int ret = 0;
 	uint16_t val = sme_get_neighbor_scan_period(hdd_ctx->hHal,
-						    adapter->
-						    sessionId);
+						    adapter->session_id);
 	char extra[32];
 	uint8_t len = 0;
 
@@ -3950,7 +3949,7 @@ static int drv_cmd_set_scan_n_probes(struct hdd_adapter *adapter,
 
 	hdd_ctx->config->nProbes = nProbes;
 	sme_update_roam_scan_n_probes(hdd_ctx->hHal,
-				      adapter->sessionId, nProbes);
+				      adapter->session_id, nProbes);
 
 exit:
 	return ret;
@@ -4023,7 +4022,7 @@ static int drv_cmd_set_scan_home_away_time(struct hdd_adapter *adapter,
 	    homeAwayTime) {
 		hdd_ctx->config->nRoamScanHomeAwayTime = homeAwayTime;
 		sme_update_roam_scan_home_away_time(hdd_ctx->hHal,
-						    adapter->sessionId,
+						    adapter->session_id,
 						    homeAwayTime,
 						    true);
 	}
@@ -4104,7 +4103,7 @@ static int drv_cmd_set_wes_mode(struct hdd_adapter *adapter,
 		  wesMode);
 
 	hdd_ctx->config->isWESModeEnabled = wesMode;
-	sme_update_wes_mode(hdd_ctx->hHal, wesMode, adapter->sessionId);
+	sme_update_wes_mode(hdd_ctx->hHal, wesMode, adapter->session_id);
 
 exit:
 	return ret;
@@ -4161,7 +4160,7 @@ static int drv_cmd_set_opportunistic_rssi_diff(struct hdd_adapter *adapter,
 		  nOpportunisticThresholdDiff);
 
 	sme_set_roam_opportunistic_scan_threshold_diff(hdd_ctx->hHal,
-				adapter->sessionId,
+				adapter->session_id,
 				nOpportunisticThresholdDiff);
 
 exit:
@@ -4219,7 +4218,7 @@ static int drv_cmd_set_roam_rescan_rssi_diff(struct hdd_adapter *adapter,
 		  nRoamRescanRssiDiff);
 
 	sme_set_roam_rescan_rssi_diff(hdd_ctx->hHal,
-				      adapter->sessionId,
+				      adapter->session_id,
 				      nRoamRescanRssiDiff);
 
 exit:
@@ -4294,8 +4293,7 @@ static int drv_cmd_set_fast_roam(struct hdd_adapter *adapter,
 
 	hdd_ctx->config->isFastRoamIniFeatureEnabled = lfrMode;
 	sme_update_is_fast_roam_ini_feature_enabled(hdd_ctx->hHal,
-						    adapter->
-						    sessionId,
+						    adapter->session_id,
 						    lfrMode);
 
 exit:
@@ -4400,9 +4398,9 @@ static int drv_cmd_fast_reassoc(struct hdd_adapter *adapter,
 				sta_ctx->conn_info.operationChannel);
 		} else {
 			sme_get_modify_profile_fields(hdd_ctx->hHal,
-				adapter->sessionId,
+				adapter->session_id,
 				&modProfileFields);
-			sme_roam_reassoc(hdd_ctx->hHal, adapter->sessionId,
+			sme_roam_reassoc(hdd_ctx->hHal, adapter->session_id,
 				NULL, modProfileFields, &roamId, 1);
 		}
 		return 0;
@@ -4425,7 +4423,7 @@ static int drv_cmd_fast_reassoc(struct hdd_adapter *adapter,
 	handoffInfo.src = FASTREASSOC;
 	qdf_mem_copy(handoffInfo.bssid.bytes, targetApBssid,
 		     sizeof(tSirMacAddr));
-	sme_handoff_request(hdd_ctx->hHal, adapter->sessionId,
+	sme_handoff_request(hdd_ctx->hHal, adapter->session_id,
 			    &handoffInfo);
 exit:
 	return ret;
@@ -4465,7 +4463,7 @@ static int drv_cmd_set_roam_scan_control(struct hdd_adapter *adapter,
 	}
 
 	sme_set_roam_scan_control(hdd_ctx->hHal,
-				  adapter->sessionId,
+				  adapter->session_id,
 				  roamScanControl);
 
 exit:
@@ -4816,7 +4814,7 @@ static int drv_cmd_set_ibss_beacon_oui_data(struct hdd_adapter *adapter,
 	qdf_copy_macaddr(&ibssModifyIE.bssid,
 		     roam_profile->BSSIDs.bssid);
 
-	ibssModifyIE.smeSessionId = adapter->sessionId;
+	ibssModifyIE.smeSessionId = adapter->session_id;
 	ibssModifyIE.notify = true;
 	ibssModifyIE.ieID = IE_EID_VENDOR;
 	ibssModifyIE.ieIDLen = ibss_ie_length;
@@ -4840,7 +4838,7 @@ static int drv_cmd_set_ibss_beacon_oui_data(struct hdd_adapter *adapter,
 	qdf_mem_free(ibss_ie);
 
 	status = sme_send_cesium_enable_ind((tHalHandle)(hdd_ctx->hHal),
-					     adapter->sessionId);
+					     adapter->session_id);
 	if (QDF_STATUS_SUCCESS != status) {
 		hdd_err("Could not send cesium enable indication %d",
 			  status);
@@ -4885,11 +4883,11 @@ static int drv_cmd_set_rmc_enable(struct hdd_adapter *adapter,
 	if (true == ucRmcEnable) {
 		status = sme_enable_rmc((tHalHandle)
 							(hdd_ctx->hHal),
-						   adapter->sessionId);
+						   adapter->session_id);
 	} else if (false == ucRmcEnable) {
 		status = sme_disable_rmc((tHalHandle)
 							(hdd_ctx->hHal),
-						     adapter->sessionId);
+						     adapter->session_id);
 	} else {
 		hdd_err("Invalid SETRMCENABLE command %d",
 			ucRmcEnable);
@@ -4949,7 +4947,7 @@ static int drv_cmd_set_rmc_action_period(struct hdd_adapter *adapter,
 	}
 
 	status = sme_send_rmc_action_period((tHalHandle)(hdd_ctx->hHal),
-					    adapter->sessionId);
+					    adapter->session_id);
 	if (QDF_STATUS_SUCCESS != status) {
 		hdd_err("Could not send cesium enable indication %d",
 			  status);
@@ -5304,7 +5302,7 @@ static int drv_cmd_set_ccx_roam_scan_channels(struct hdd_adapter *adapter,
 		goto exit;
 	}
 	status = sme_set_ese_roam_scan_channel_list(hdd_ctx->hHal,
-						    adapter->sessionId,
+						    adapter->session_id,
 						    ChannelList,
 						    numChannels);
 	if (QDF_STATUS_SUCCESS != status) {
@@ -5448,7 +5446,7 @@ static int drv_cmd_set_cckm_ie(struct hdd_adapter *adapter,
 		goto exit;
 	}
 
-	sme_set_cckm_ie(hdd_ctx->hHal, adapter->sessionId,
+	sme_set_cckm_ie(hdd_ctx->hHal, adapter->session_id,
 			cckmIe, cckmIeLen);
 	if (NULL != cckmIe) {
 		qdf_mem_free(cckmIe);
@@ -5493,7 +5491,7 @@ static int drv_cmd_ccx_beacon_req(struct hdd_adapter *adapter,
 	}
 
 	status = sme_set_ese_beacon_request(hdd_ctx->hHal,
-					    adapter->sessionId,
+					    adapter->session_id,
 					    &eseBcnReq);
 
 	if (QDF_STATUS_E_RESOURCES == status) {
@@ -5548,7 +5546,7 @@ static int drv_cmd_ccx_plm_req(struct hdd_adapter *adapter,
 		ret = -EINVAL;
 		goto exit;
 	}
-	pPlmRequest->sessionId = adapter->sessionId;
+	pPlmRequest->sessionId = adapter->session_id;
 
 	status = sme_set_plm_request(hdd_ctx->hHal, pPlmRequest);
 	if (QDF_STATUS_SUCCESS != status) {
@@ -5634,7 +5632,7 @@ static int drv_cmd_set_ccx_mode(struct hdd_adapter *adapter,
 
 	hdd_ctx->config->isEseIniFeatureEnabled = eseMode;
 	sme_update_is_ese_feature_enabled(hdd_ctx->hHal,
-					  adapter->sessionId,
+					  adapter->session_id,
 					  eseMode);
 
 exit:
@@ -5773,7 +5771,7 @@ static int drv_cmd_set_dfs_scan_mode(struct hdd_adapter *adapter,
 	}
 
 	hdd_ctx->config->allowDFSChannelRoam = dfsScanMode;
-	sme_update_dfs_scan_mode(hdd_ctx->hHal, adapter->sessionId,
+	sme_update_dfs_scan_mode(hdd_ctx->hHal, adapter->session_id,
 				 dfsScanMode);
 
 exit:
@@ -5842,7 +5840,7 @@ static int drv_cmd_enable_ext_wow(struct hdd_adapter *adapter,
 	}
 
 	return hdd_enable_ext_wow_parser(adapter,
-					 adapter->sessionId,
+					 adapter->session_id,
 					 set_value);
 }
 
@@ -6167,7 +6165,7 @@ static int hdd_set_rx_filter(struct hdd_adapter *adapter, bool action,
 		}
 		filter->ulMulticastAddrCnt = j;
 		/* Set rx filter */
-		sme_8023_multicast_list(handle, adapter->sessionId, filter);
+		sme_8023_multicast_list(handle, adapter->session_id, filter);
 		qdf_mem_free(filter);
 	} else {
 		hdd_debug("mode %d mc_cnt %d",
@@ -6586,7 +6584,7 @@ static int drv_cmd_invalid(struct hdd_adapter *adapter,
 {
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_UNSUPPORTED_IOCTL,
-			 adapter->sessionId, 0));
+			 adapter->session_id, 0));
 
 	hdd_warn("%s: Unsupported driver command \"%s\"",
 		 adapter->dev->name, command);

core/hdd/src/wlan_hdd_ipa.c

@@ -1483,7 +1483,7 @@ void hdd_ipa_set_tx_flow_info(void)
 				adapter->tx_flow_high_watermark_offset =
 				   hdd_ctx->config->TxFlowHighWaterMarkOffset;
 				cdp_fc_ll_set_tx_pause_q_depth(soc,
-					adapter->sessionId,
+					adapter->session_id,
 					hdd_ctx->config->TxFlowMaxQueueDepth);
 				hdd_info("MODE %d,CH %d,LWM %d,HWM %d,TXQDEP %d",
 				    adapter->device_mode,
@@ -1508,7 +1508,7 @@ void hdd_ipa_set_tx_flow_info(void)
 					adapter->
 					tx_flow_high_watermark_offset = 0;
 					cdp_fc_ll_set_tx_pause_q_depth(soc,
-						adapter->sessionId,
+						adapter->session_id,
 						hdd_ctx->config->
 						TxHbwFlowMaxQueueDepth);
 					hdd_info("SCC: MODE %s(%d), CH %d, LWM %d, HWM %d, TXQDEP %d",
@@ -1534,7 +1534,7 @@ void hdd_ipa_set_tx_flow_info(void)
 					preAdapterContext->
 					tx_flow_high_watermark_offset = 0;
 					cdp_fc_ll_set_tx_pause_q_depth(soc,
-						preAdapterContext->sessionId,
+						preAdapterContext->session_id,
 						hdd_ctx->config->
 						TxHbwFlowMaxQueueDepth);
 					hdd_info("SCC: MODE %s(%d), CH %d, LWM %d, HWM %d, TXQDEP %d",
@@ -1584,7 +1584,7 @@ void hdd_ipa_set_tx_flow_info(void)
 						hdd_ctx->config->
 						TxHbwFlowHighWaterMarkOffset;
 					cdp_fc_ll_set_tx_pause_q_depth(soc,
-						adapter5->sessionId,
+						adapter5->session_id,
 						hdd_ctx->config->
 						TxHbwFlowMaxQueueDepth);
 					hdd_info("MCC: MODE %s(%d), CH %d, LWM %d, HWM %d, TXQDEP %d",
@@ -1612,7 +1612,7 @@ void hdd_ipa_set_tx_flow_info(void)
 						hdd_ctx->config->
 						TxLbwFlowHighWaterMarkOffset;
 					cdp_fc_ll_set_tx_pause_q_depth(soc,
-						adapter2_4->sessionId,
+						adapter2_4->session_id,
 						hdd_ctx->config->
 						TxLbwFlowMaxQueueDepth);
 					hdd_info("MCC: MODE %s(%d), CH %d, LWM %d, HWM %d, TXQDEP %d",
@@ -1724,7 +1724,7 @@ static void __hdd_ipa_uc_stat_request(struct hdd_adapter *adapter,
 		hdd_ipa->stat_req_reason = reason;
 		qdf_mutex_release(&hdd_ipa->ipa_lock);
 		sme_ipa_uc_stat_request(WLAN_HDD_GET_HAL_CTX(adapter),
-			adapter->sessionId,
+			adapter->session_id,
 			WMA_VDEV_TXRX_GET_IPA_UC_FW_STATS_CMDID,
 			0, VDEV_CMD);
 	} else {
@@ -1775,7 +1775,7 @@ void hdd_ipa_uc_sharing_stats_request(struct hdd_adapter *adapter,
 	if (false == hdd_ipa->resource_loading) {
 		qdf_mutex_release(&hdd_ipa->ipa_lock);
 		wma_cli_set_command(
-			(int)adapter->sessionId,
+			(int)adapter->session_id,
 			(int)WMA_VDEV_TXRX_GET_IPA_UC_SHARING_STATS_CMDID,
 			reset_stats, VDEV_CMD);
 	} else {
@@ -1814,7 +1814,7 @@ void hdd_ipa_uc_set_quota(struct hdd_adapter *adapter, uint8_t set_quota,
 	if (false == hdd_ipa->resource_loading) {
 		qdf_mutex_release(&hdd_ipa->ipa_lock);
 		wma_cli_set2_command(
-			(int)adapter->sessionId,
+			(int)adapter->session_id,
 			(int)WMA_VDEV_TXRX_SET_IPA_UC_QUOTA_CMDID,
 			(set_quota ? quota_bytes&0xffffffff : 0),
 			(set_quota ? quota_bytes>>32 : 0),
@@ -2345,7 +2345,7 @@ static void hdd_ipa_print_session_info(struct hdd_ipa_priv *hdd_ipa)
 		if (!iface_context || !iface_context->adapter)
 			continue;
 
-		session_id = iface_context->adapter->sessionId;
+		session_id = iface_context->adapter->session_id;
 		if (session_id >= CSR_ROAM_SESSION_MAX)
 			continue;
 
@@ -2788,7 +2788,7 @@ static void hdd_ipa_uc_offload_enable_disable(struct hdd_adapter *adapter,
 		return;
 
 	iface_context = adapter->ipa_context;
-	session_id = adapter->sessionId;
+	session_id = adapter->session_id;
 
 	if (!iface_context) {
 		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
@@ -2813,10 +2813,10 @@ static void hdd_ipa_uc_offload_enable_disable(struct hdd_adapter *adapter,
 		return;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->sessionId)) {
+	if (wlan_hdd_validate_session_id(adapter->session_id)) {
 		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			"invalid session id: %d, offload_type=%d, enable=%d",
-			adapter->sessionId, offload_type, enable);
+			adapter->session_id, offload_type, enable);
 		return;
 	}
 
@@ -2834,7 +2834,7 @@ static void hdd_ipa_uc_offload_enable_disable(struct hdd_adapter *adapter,
 
 	if (QDF_STATUS_SUCCESS !=
 		sme_ipa_offload_enable_disable(WLAN_HDD_GET_HAL_CTX(adapter),
-			adapter->sessionId, &ipa_offload_enable_disable)) {
+			adapter->session_id, &ipa_offload_enable_disable)) {
 		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			"Failure to enable IPA offload (offload_type=%d, vdev_id=%d, enable=%d)",
 			ipa_offload_enable_disable.offload_type,
@@ -4216,7 +4216,7 @@ static enum hdd_ipa_forward_type hdd_ipa_intrabss_forward(
 		if (!ol_txrx_fwd_desc_thresh_check(
 			(struct ol_txrx_vdev_t *)cdp_get_vdev_from_vdev_id(soc,
 						(struct cdp_pdev *)pdev,
-						adapter->sessionId))) {
+						adapter->session_id))) {
 			/* Drop the packet*/
 			hdd_ipa->stats.num_tx_fwd_err++;
 			kfree_skb(skb);
@@ -5093,7 +5093,7 @@ static int hdd_ipa_setup_iface(struct hdd_ipa_priv *hdd_ipa,
 				  adapter->dev->name, adapter->dev->dev_addr,
 				  iface_context->prod_client,
 				  iface_context->cons_client,
-				  adapter->sessionId,
+				  adapter->session_id,
 				  hdd_ipa_is_ipv6_enabled(hdd_ipa->hdd_ctx));
 	if (ret)
 		goto end;
@@ -5374,7 +5374,7 @@ static int __hdd_ipa_wlan_evt(struct hdd_adapter *adapter, uint8_t sta_id,
 			qdf_mutex_acquire(&hdd_ipa->event_lock);
 		}
 
-		hdd_ipa->vdev_to_iface[adapter->sessionId] =
+		hdd_ipa->vdev_to_iface[adapter->session_id] =
 			((struct hdd_ipa_iface_context *)
 			(adapter->ipa_context))->iface_id;
 
@@ -5415,7 +5415,7 @@ static int __hdd_ipa_wlan_evt(struct hdd_adapter *adapter, uint8_t sta_id,
 			qdf_mutex_acquire(&hdd_ipa->event_lock);
 		}
 
-		hdd_ipa->vdev_to_iface[adapter->sessionId] =
+		hdd_ipa->vdev_to_iface[adapter->session_id] =
 			((struct hdd_ipa_iface_context *)
 			(adapter->ipa_context))->iface_id;
 
@@ -5452,7 +5452,7 @@ static int __hdd_ipa_wlan_evt(struct hdd_adapter *adapter, uint8_t sta_id,
 			hdd_ipa_uc_offload_enable_disable(adapter,
 				SIR_STA_RX_DATA_OFFLOAD, false);
 			qdf_mutex_acquire(&hdd_ipa->event_lock);
-			hdd_ipa->vdev_to_iface[adapter->sessionId] =
+			hdd_ipa->vdev_to_iface[adapter->session_id] =
 				CSR_ROAM_SESSION_MAX;
 		}
 
@@ -5503,7 +5503,7 @@ static int __hdd_ipa_wlan_evt(struct hdd_adapter *adapter, uint8_t sta_id,
 			hdd_ipa_uc_offload_enable_disable(adapter,
 				SIR_AP_RX_DATA_OFFLOAD, false);
 			qdf_mutex_acquire(&hdd_ipa->event_lock);
-			hdd_ipa->vdev_to_iface[adapter->sessionId] =
+			hdd_ipa->vdev_to_iface[adapter->session_id] =
 				CSR_ROAM_SESSION_MAX;
 		}
 

core/hdd/src/wlan_hdd_lpass.c

@@ -114,8 +114,8 @@ static int wlan_hdd_gen_wlan_status_pack(struct wlan_status_data *data,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->sessionId)) {
-		hdd_err("invalid session id: %d", adapter->sessionId);
+	if (wlan_hdd_validate_session_id(adapter->session_id)) {
+		hdd_err("invalid session id: %d", adapter->session_id);
 		return -EINVAL;
 	}
 
@@ -137,7 +137,7 @@ static int wlan_hdd_gen_wlan_status_pack(struct wlan_status_data *data,
 
 	sme_get_country_code(hdd_ctx->hHal, data->country_code, &buflen);
 	data->is_on = is_on;
-	data->vdev_id = adapter->sessionId;
+	data->vdev_id = adapter->session_id;
 	data->vdev_mode = adapter->device_mode;
 	if (sta_ctx) {
 		data->is_connected = is_connected;

core/hdd/src/wlan_hdd_main.c

@@ -546,7 +546,7 @@ static int __hdd_netdev_notifier_call(struct notifier_block *nb,
 	case NETDEV_GOING_DOWN:
 		if (adapter->scan_info.mScanPending != false) {
 			wlan_abort_scan(hdd_ctx->hdd_pdev, INVAL_PDEV_ID,
-				adapter->sessionId, INVALID_SCAN_ID, true);
+				adapter->session_id, INVALID_SCAN_ID, true);
 		} else {
 			cds_flush_work(&adapter->scan_block_work);
 			hdd_debug("Scan is not Pending from user");
@@ -798,13 +798,13 @@ int hdd_validate_adapter(struct hdd_adapter *adapter)
 		return -EAGAIN;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->sessionId)) {
+	if (wlan_hdd_validate_session_id(adapter->session_id)) {
 		hdd_info("adapter session is not open");
 		return -EAGAIN;
 	}
 
-	if (adapter->sessionId >= MAX_NUMBER_OF_ADAPTERS) {
-		hdd_err("bad adapter session Id: %u", adapter->sessionId);
+	if (adapter->session_id >= MAX_NUMBER_OF_ADAPTERS) {
+		hdd_err("bad adapter session Id: %u", adapter->session_id);
 		return -EINVAL;
 	}
 
@@ -854,7 +854,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(struct hdd_adapter *adapter)
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	ret = sme_cli_set_command(adapter->sessionId,
+	ret = sme_cli_set_command(adapter->session_id,
 				  WMA_VDEV_IBSS_SET_ATIM_WINDOW_SIZE,
 				  hdd_ctx->config->ibssATIMWinSize,
 				  VDEV_CMD);
@@ -863,7 +863,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(struct hdd_adapter *adapter)
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	ret = sme_cli_set_command(adapter->sessionId,
+	ret = sme_cli_set_command(adapter->session_id,
 				  WMA_VDEV_IBSS_SET_POWER_SAVE_ALLOWED,
 				  hdd_ctx->config->isIbssPowerSaveAllowed,
 				  VDEV_CMD);
@@ -873,7 +873,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(struct hdd_adapter *adapter)
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	ret = sme_cli_set_command(adapter->sessionId,
+	ret = sme_cli_set_command(adapter->session_id,
 				  WMA_VDEV_IBSS_SET_POWER_COLLAPSE_ALLOWED,
 				  hdd_ctx->config->
 				  isIbssPowerCollapseAllowed, VDEV_CMD);
@@ -883,7 +883,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(struct hdd_adapter *adapter)
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	ret = sme_cli_set_command(adapter->sessionId,
+	ret = sme_cli_set_command(adapter->session_id,
 				  WMA_VDEV_IBSS_SET_AWAKE_ON_TX_RX,
 				  hdd_ctx->config->isIbssAwakeOnTxRx,
 				  VDEV_CMD);
@@ -892,7 +892,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(struct hdd_adapter *adapter)
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	ret = sme_cli_set_command(adapter->sessionId,
+	ret = sme_cli_set_command(adapter->session_id,
 				  WMA_VDEV_IBSS_SET_INACTIVITY_TIME,
 				  hdd_ctx->config->ibssInactivityCount,
 				  VDEV_CMD);
@@ -901,7 +901,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(struct hdd_adapter *adapter)
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	ret = sme_cli_set_command(adapter->sessionId,
+	ret = sme_cli_set_command(adapter->session_id,
 				  WMA_VDEV_IBSS_SET_TXSP_END_INACTIVITY_TIME,
 				  hdd_ctx->config->ibssTxSpEndInactivityTime,
 				  VDEV_CMD);
@@ -911,7 +911,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(struct hdd_adapter *adapter)
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	ret = sme_cli_set_command(adapter->sessionId,
+	ret = sme_cli_set_command(adapter->session_id,
 				  WMA_VDEV_IBSS_PS_SET_WARMUP_TIME_SECS,
 				  hdd_ctx->config->ibssPsWarmupTime,
 				  VDEV_CMD);
@@ -921,7 +921,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(struct hdd_adapter *adapter)
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	ret = sme_cli_set_command(adapter->sessionId,
+	ret = sme_cli_set_command(adapter->session_id,
 				  WMA_VDEV_IBSS_PS_SET_1RX_CHAIN_IN_ATIM_WINDOW,
 				  hdd_ctx->config->ibssPs1RxChainInAtimEnable,
 				  VDEV_CMD);
@@ -1866,7 +1866,7 @@ bool hdd_dfs_indicate_radar(struct hdd_context *hdd_ctx)
 			WLAN_HDD_GET_AP_CTX_PTR(adapter)->dfs_cac_block_tx =
 				true;
 			hdd_info("tx blocked for session: %d",
-				adapter->sessionId);
+				adapter->session_id);
 		}
 		status = hdd_get_next_adapter(hdd_ctx, adapterNode, &pNext);
 		adapterNode = pNext;
@@ -2564,7 +2564,7 @@ static int __hdd_open(struct net_device *dev)
 
 	ENTER_DEV(dev);
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_OPEN_REQUEST,
-		adapter->sessionId, adapter->device_mode));
+		adapter->session_id, adapter->device_mode));
 
 	/* Nothing to be done if device is unloading */
 	if (cds_is_driver_unloading()) {
@@ -2673,7 +2673,7 @@ static int __hdd_stop(struct net_device *dev)
 	ENTER_DEV(dev);
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_STOP_REQUEST,
-			 adapter->sessionId, adapter->device_mode));
+			 adapter->session_id, adapter->device_mode));
 
 	ret = wlan_hdd_validate_context(hdd_ctx);
 	if (0 != ret)
@@ -2691,7 +2691,7 @@ static int __hdd_stop(struct net_device *dev)
 	hdd_debug("Disabling Auto Power save timer");
 	sme_ps_disable_auto_ps_timer(
 		WLAN_HDD_GET_HAL_CTX(adapter),
-		adapter->sessionId);
+		adapter->session_id);
 
 	/*
 	 * Disable TX on the interface, after this hard_start_xmit() will not
@@ -3020,7 +3020,7 @@ static void __hdd_set_multicast_list(struct net_device *dev)
 	}
 
 	mc_list_request->psoc = psoc;
-	mc_list_request->vdev_id = adapter->sessionId;
+	mc_list_request->vdev_id = adapter->session_id;
 	mc_list_request->count = mc_count;
 	status = hdd_cache_mc_addr_list(mc_list_request);
 	if (status == 0) {
@@ -3150,7 +3150,7 @@ static struct hdd_adapter *hdd_alloc_station_adapter(struct hdd_context *hdd_ctx
 		adapter->dev = pWlanDev;
 		adapter->hdd_ctx = hdd_ctx;
 		adapter->magic = WLAN_HDD_ADAPTER_MAGIC;
-		adapter->sessionId = HDD_SESSION_ID_INVALID;
+		adapter->session_id = HDD_SESSION_ID_INVALID;
 
 		init_completion(&adapter->session_open_comp_var);
 		init_completion(&adapter->session_close_comp_var);
@@ -3305,11 +3305,11 @@ int hdd_vdev_destroy(struct hdd_adapter *adapter)
 	struct hdd_context *hdd_ctx;
 	unsigned long rc;
 
-	hdd_info("destroying vdev %d", adapter->sessionId);
+	hdd_info("destroying vdev %d", adapter->session_id);
 
 	/* vdev created sanity check */
 	if (!test_bit(SME_SESSION_OPENED, &adapter->event_flags)) {
-		hdd_err("vdev for Id %d does not exist", adapter->sessionId);
+		hdd_err("vdev for Id %d does not exist", adapter->session_id);
 		return -EINVAL;
 	}
 	status = ucfg_reg_11d_vdev_delete_update(adapter->hdd_vdev);
@@ -3323,7 +3323,7 @@ int hdd_vdev_destroy(struct hdd_adapter *adapter)
 	/* close sme session (destroy vdev in firmware via legacy API) */
 	INIT_COMPLETION(adapter->session_close_comp_var);
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	status = sme_close_session(hdd_ctx->hHal, adapter->sessionId,
+	status = sme_close_session(hdd_ctx->hHal, adapter->session_id,
 				   hdd_sme_close_session_callback, adapter);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		hdd_err("failed to close sme session: %d", status);
@@ -3390,7 +3390,7 @@ int hdd_vdev_create(struct hdd_adapter *adapter)
 	INIT_COMPLETION(adapter->session_open_comp_var);
 	status = sme_open_session(hdd_ctx->hHal, hdd_sme_roam_callback, adapter,
 				  (uint8_t *)&adapter->mac_addr,
-				  adapter->sessionId, type, sub_type);
+				  adapter->session_id, type, sub_type);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		hdd_err("failed to open sme session: %d", status);
 		errno = qdf_status_to_os_return(status);
@@ -3415,7 +3415,7 @@ int hdd_vdev_create(struct hdd_adapter *adapter)
 		goto hdd_vdev_destroy_procedure;
 	}
 
-	hdd_info("vdev %d created successfully", adapter->sessionId);
+	hdd_info("vdev %d created successfully", adapter->session_id);
 
 	return 0;
 
@@ -3451,7 +3451,7 @@ QDF_STATUS hdd_init_station_mode(struct hdd_adapter *adapter)
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	sme_set_curr_device_mode(hdd_ctx->hHal, adapter->device_mode);
 	sme_set_pdev_ht_vht_ies(hdd_ctx->hHal, hdd_ctx->config->enable2x2);
-	sme_set_vdev_ies_per_band(hdd_ctx->hHal, adapter->sessionId);
+	sme_set_vdev_ies_per_band(hdd_ctx->hHal, adapter->session_id);
 
 	/* Register wireless extensions */
 	status = hdd_register_wext(adapter->dev);
@@ -3465,7 +3465,7 @@ QDF_STATUS hdd_init_station_mode(struct hdd_adapter *adapter)
 		sizeof(sta_ctx->conn_info.staId), HDD_WLAN_INVALID_STA_ID);
 
 	/* set fast roaming capability in sme session */
-	status = sme_config_fast_roaming(hdd_ctx->hHal, adapter->sessionId,
+	status = sme_config_fast_roaming(hdd_ctx->hHal, adapter->session_id,
 					 adapter->fast_roaming_allowed);
 	/* Set the default operation channel */
 	sta_ctx->conn_info.operationChannel =
@@ -3492,7 +3492,7 @@ QDF_STATUS hdd_init_station_mode(struct hdd_adapter *adapter)
 
 	set_bit(WMM_INIT_DONE, &adapter->event_flags);
 
-	ret_val = sme_cli_set_command(adapter->sessionId,
+	ret_val = sme_cli_set_command(adapter->session_id,
 				      WMI_PDEV_PARAM_BURST_ENABLE,
 				      hdd_ctx->config->enableSifsBurst,
 				      PDEV_CMD);
@@ -3677,7 +3677,7 @@ static void hdd_set_fw_log_params(struct hdd_context *hdd_ctx,
 	/* Enable FW logs based on INI configuration */
 	hdd_ctx->fw_log_settings.dl_type =
 			hdd_ctx->config->enableFwLogType;
-	ret = sme_cli_set_command(adapter->sessionId,
+	ret = sme_cli_set_command(adapter->session_id,
 			WMI_DBGLOG_TYPE,
 			hdd_ctx->config->enableFwLogType,
 			DBG_CMD);
@@ -3687,7 +3687,7 @@ static void hdd_set_fw_log_params(struct hdd_context *hdd_ctx,
 
 	hdd_ctx->fw_log_settings.dl_loglevel =
 			hdd_ctx->config->enableFwLogLevel;
-	ret = sme_cli_set_command(adapter->sessionId,
+	ret = sme_cli_set_command(adapter->session_id,
 			WMI_DBGLOG_LOG_LEVEL,
 			hdd_ctx->config->enableFwLogLevel,
 			DBG_CMD);
@@ -3730,7 +3730,7 @@ static void hdd_set_fw_log_params(struct hdd_context *hdd_ctx,
 
 		value = moduleloglevel[count] << 16;
 		value |= moduleloglevel[count + 1];
-		ret = sme_cli_set_command(adapter->sessionId,
+		ret = sme_cli_set_command(adapter->session_id,
 				WMI_DBGLOG_MOD_LOG_LEVEL,
 				value, DBG_CMD);
 		if (ret != 0)
@@ -3774,7 +3774,7 @@ int hdd_set_fw_params(struct hdd_adapter *adapter)
 		return 0;
 	}
 
-	ret = sme_cli_set_command(adapter->sessionId,
+	ret = sme_cli_set_command(adapter->session_id,
 				WMI_PDEV_PARAM_DTIM_SYNTH,
 				hdd_ctx->config->enable_lprx, PDEV_CMD);
 	if (ret) {
@@ -3783,15 +3783,15 @@ int hdd_set_fw_params(struct hdd_adapter *adapter)
 	}
 
 	if (adapter->device_mode == QDF_STA_MODE) {
-		sme_set_smps_cfg(adapter->sessionId,
+		sme_set_smps_cfg(adapter->session_id,
 					HDD_STA_SMPS_PARAM_UPPER_BRSSI_THRESH,
 					hdd_ctx->config->upper_brssi_thresh);
 
-		sme_set_smps_cfg(adapter->sessionId,
+		sme_set_smps_cfg(adapter->session_id,
 					HDD_STA_SMPS_PARAM_LOWER_BRSSI_THRESH,
 					hdd_ctx->config->lower_brssi_thresh);
 
-		sme_set_smps_cfg(adapter->sessionId,
+		sme_set_smps_cfg(adapter->session_id,
 					HDD_STA_SMPS_PARAM_DTIM_1CHRX_ENABLE,
 					hdd_ctx->config->enable_dtim_1chrx);
 	}
@@ -3799,7 +3799,7 @@ int hdd_set_fw_params(struct hdd_adapter *adapter)
 	if (hdd_ctx->config->enable2x2) {
 		hdd_debug("configuring 2x2 mode fw params");
 
-		ret = sme_cli_set_command(adapter->sessionId,
+		ret = sme_cli_set_command(adapter->session_id,
 				       WMI_PDEV_PARAM_ENABLE_CCK_TXFIR_OVERRIDE,
 				    hdd_ctx->config->enable_cck_tx_fir_override,
 					  PDEV_CMD);
@@ -3819,7 +3819,7 @@ int hdd_set_fw_params(struct hdd_adapter *adapter)
 		 * as param_id << 29 | param_value.
 		 * Below param_value = 0(disable)
 		 */
-		ret = sme_cli_set_command(adapter->sessionId,
+		ret = sme_cli_set_command(adapter->session_id,
 					  WMI_STA_SMPS_PARAM_CMDID,
 					  HDD_DTIM_1CHAIN_RX_ID <<
 					  HDD_SMPS_PARAM_VALUE_S,
@@ -3829,7 +3829,7 @@ int hdd_set_fw_params(struct hdd_adapter *adapter)
 			goto error;
 		}
 
-		ret = sme_cli_set_command(adapter->sessionId,
+		ret = sme_cli_set_command(adapter->session_id,
 					  WMI_PDEV_PARAM_TX_CHAIN_MASK,
 					  hdd_ctx->config->txchainmask1x1,
 					  PDEV_CMD);
@@ -3839,7 +3839,7 @@ int hdd_set_fw_params(struct hdd_adapter *adapter)
 			goto error;
 		}
 
-		ret = sme_cli_set_command(adapter->sessionId,
+		ret = sme_cli_set_command(adapter->session_id,
 					  WMI_PDEV_PARAM_RX_CHAIN_MASK,
 					  hdd_ctx->config->rxchainmask1x1,
 					  PDEV_CMD);
@@ -3852,7 +3852,7 @@ int hdd_set_fw_params(struct hdd_adapter *adapter)
 #undef HDD_SMPS_PARAM_VALUE_S
 	}
 
-	ret = sme_cli_set_command(adapter->sessionId,
+	ret = sme_cli_set_command(adapter->session_id,
 				  WMI_PDEV_PARAM_HYST_EN,
 				  hdd_ctx->config->enableMemDeepSleep,
 				  PDEV_CMD);
@@ -3861,7 +3861,7 @@ int hdd_set_fw_params(struct hdd_adapter *adapter)
 		goto error;
 	}
 
-	ret = sme_cli_set_command(adapter->sessionId,
+	ret = sme_cli_set_command(adapter->session_id,
 				  WMI_VDEV_PARAM_ENABLE_RTSCTS,
 				  hdd_ctx->config->rts_profile,
 				  VDEV_CMD);
@@ -3872,7 +3872,7 @@ int hdd_set_fw_params(struct hdd_adapter *adapter)
 
 	hdd_debug("SET AMSDU num %d", hdd_ctx->config->max_amsdu_num);
 
-	ret = wma_cli_set_command(adapter->sessionId,
+	ret = wma_cli_set_command(adapter->session_id,
 				  GEN_VDEV_PARAM_AMSDU,
 				  hdd_ctx->config->max_amsdu_num,
 				  GEN_CMD);
@@ -4257,7 +4257,7 @@ void wlan_hdd_reset_prob_rspies(struct hdd_adapter *adapter)
 	}
 
 	qdf_copy_macaddr(&updateIE.bssid, bssid);
-	updateIE.smeSessionId = adapter->sessionId;
+	updateIE.smeSessionId = adapter->session_id;
 	updateIE.ieBufferlength = 0;
 	updateIE.pAdditionIEBuffer = NULL;
 	updateIE.append = true;
@@ -4304,13 +4304,13 @@ QDF_STATUS hdd_stop_adapter(struct hdd_context *hdd_ctx, struct hdd_adapter *ada
 			if (QDF_NDI_MODE == adapter->device_mode)
 				qdf_ret_status = sme_roam_disconnect(
 					hdd_ctx->hHal,
-					adapter->sessionId,
+					adapter->session_id,
 					eCSR_DISCONNECT_REASON_NDI_DELETE);
 			else if (pWextState->roamProfile.BSSType ==
 						eCSR_BSS_TYPE_START_IBSS)
 				qdf_ret_status = sme_roam_disconnect(
 					hdd_ctx->hHal,
-					adapter->sessionId,
+					adapter->session_id,
 					eCSR_DISCONNECT_REASON_IBSS_LEAVE);
 			else if (QDF_STA_MODE == adapter->device_mode)
 				qdf_ret_status =
@@ -4318,7 +4318,7 @@ QDF_STATUS hdd_stop_adapter(struct hdd_context *hdd_ctx, struct hdd_adapter *ada
 			else
 				qdf_ret_status = sme_roam_disconnect(
 					hdd_ctx->hHal,
-					adapter->sessionId,
+					adapter->session_id,
 					eCSR_DISCONNECT_REASON_UNSPECIFIED);
 			/* success implies disconnect command got
 			 * queued up successfully
@@ -4424,11 +4424,11 @@ QDF_STATUS hdd_stop_adapter(struct hdd_context *hdd_ctx, struct hdd_adapter *ada
 			clear_bit(SOFTAP_BSS_STARTED, &adapter->event_flags);
 			policy_mgr_decr_session_set_pcl(hdd_ctx->hdd_psoc,
 						adapter->device_mode,
-						adapter->sessionId);
+						adapter->session_id);
 
 			qdf_copy_macaddr(&updateIE.bssid,
 					 &adapter->mac_addr);
-			updateIE.smeSessionId = adapter->sessionId;
+			updateIE.smeSessionId = adapter->session_id;
 			updateIE.ieBufferlength = 0;
 			updateIE.pAdditionIEBuffer = NULL;
 			updateIE.append = false;
@@ -4580,7 +4580,7 @@ QDF_STATUS hdd_reset_all_adapters(struct hdd_context *hdd_ctx)
 
 		hdd_deinit_tx_rx(adapter);
 		policy_mgr_decr_session_set_pcl(hdd_ctx->hdd_psoc,
-				adapter->device_mode, adapter->sessionId);
+				adapter->device_mode, adapter->session_id);
 		if (test_bit(WMM_INIT_DONE, &adapter->event_flags)) {
 			hdd_wmm_adapter_close(adapter);
 			clear_bit(WMM_INIT_DONE, &adapter->event_flags);
@@ -5379,7 +5379,7 @@ struct hdd_adapter *hdd_get_adapter_by_vdev(struct hdd_context *hdd_ctx,
 	while ((NULL != adapterNode) && (QDF_STATUS_SUCCESS == qdf_status)) {
 		adapter = adapterNode->adapter;
 
-		if (adapter->sessionId == vdev_id)
+		if (adapter->session_id == vdev_id)
 			return adapter;
 
 		qdf_status =
@@ -5419,7 +5419,7 @@ hdd_get_adapter_by_sme_session_id(struct hdd_context *hdd_ctx,
 		adapter = adapter_node->adapter;
 
 		if (adapter &&
-			 adapter->sessionId == sme_session_id)
+			 adapter->session_id == sme_session_id)
 			return adapter;
 
 		qdf_status =
@@ -5603,7 +5603,7 @@ QDF_STATUS hdd_abort_mac_scan_all_adapters(struct hdd_context *hdd_ctx)
 		    (adapter->device_mode == QDF_SAP_MODE) ||
 		    (adapter->device_mode == QDF_P2P_GO_MODE)) {
 			wlan_abort_scan(hdd_ctx->hdd_pdev, INVAL_PDEV_ID,
-					adapter->sessionId, INVALID_SCAN_ID,
+					adapter->session_id, INVALID_SCAN_ID,
 					false);
 		}
 		status = hdd_get_next_adapter(hdd_ctx, adapterNode, &pNext);
@@ -6146,7 +6146,7 @@ int hdd_wlan_set_ht2040_mode(struct hdd_adapter *adapter, uint16_t sta_id,
 		return -EINVAL;
 
 	qdf_status = sme_notify_ht2040_mode(hdd_ctx->hHal, sta_id, sta_mac,
-					    adapter->sessionId, channel_type);
+					    adapter->session_id, channel_type);
 	if (QDF_STATUS_SUCCESS != qdf_status) {
 		hdd_err("Fail to send notification with ht2040 mode");
 		return -EINVAL;
@@ -6508,7 +6508,7 @@ static void hdd_bus_bw_work_handler(struct work_struct *work)
 
 			ret = cdp_get_intra_bss_fwd_pkts_count(
 				cds_get_context(QDF_MODULE_ID_SOC),
-				adapter->sessionId,
+				adapter->session_id,
 				&fwd_tx_packets, &fwd_rx_packets);
 			if (ret == A_OK) {
 				fwd_tx_packets_diff += HDD_BW_GET_DIFF(
@@ -6773,7 +6773,7 @@ void wlan_hdd_display_netif_queue_history(struct hdd_context *hdd_ctx)
 
 		hdd_debug("Netif queue operation statistics:");
 		hdd_debug("Session_id %d device mode %d",
-			adapter->sessionId, adapter->device_mode);
+			adapter->session_id, adapter->device_mode);
 		hdd_debug("Current pause_map value %x", adapter->pause_map);
 		curr_time = qdf_system_ticks();
 		total = curr_time - adapter->start_time;
@@ -7164,7 +7164,7 @@ void hdd_switch_sap_channel(struct hdd_adapter *adapter, uint8_t channel)
 			&hdd_ap_ctx->sap_config.ch_params);
 
 	policy_mgr_change_sap_channel_with_csa(hdd_ctx->hdd_psoc,
-		adapter->sessionId, channel,
+		adapter->session_id, channel,
 		hdd_ap_ctx->sap_config.ch_width_orig);
 }
 
@@ -7513,7 +7513,7 @@ void hdd_acs_response_timeout_handler(void *context)
 		wlan_sap_update_next_channel(
 				WLAN_HDD_GET_SAP_CTX_PTR(adapter), 0, 0);
 		sme_update_new_channel_event(WLAN_HDD_GET_HAL_CTX(adapter),
-					     adapter->sessionId);
+					     adapter->session_id);
 		break;
 	/* LTE coex event on current channel */
 	case QCA_WLAN_VENDOR_ACS_SELECT_REASON_LTE_COEX:
@@ -10271,8 +10271,8 @@ void wlan_hdd_disable_roaming(struct hdd_adapter *adapter)
 		QDF_STA_MODE == adapter->device_mode &&
 		policy_mgr_is_sta_active_connection_exists(
 		hdd_ctx->hdd_psoc)) {
-		hdd_debug("Connect received on STA sessionId(%d)",
-		       adapter->sessionId);
+		hdd_debug("Connect received on STA session Id(%d)",
+		       adapter->session_id);
 		/*
 		 * Loop through adapter and disable roaming for each STA device
 		 * mode except the input adapter.
@@ -10282,13 +10282,13 @@ void wlan_hdd_disable_roaming(struct hdd_adapter *adapter)
 		while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) {
 			adapterIdx = adapterNode->adapter;
 
-			if (QDF_STA_MODE == adapterIdx->device_mode
-			    && adapter->sessionId != adapterIdx->sessionId) {
-				hdd_debug("Disable Roaming on sessionId(%d)",
-				       adapterIdx->sessionId);
+			if (QDF_STA_MODE == adapterIdx->device_mode &&
+			    adapter->session_id != adapterIdx->session_id) {
+				hdd_debug("Disable Roaming on session Id(%d)",
+				       adapterIdx->session_id);
 				sme_stop_roaming(WLAN_HDD_GET_HAL_CTX
 							 (adapterIdx),
-						 adapterIdx->sessionId, 0);
+						 adapterIdx->session_id, 0);
 			}
 
 			status = hdd_get_next_adapter(hdd_ctx,
@@ -10323,8 +10323,8 @@ void wlan_hdd_enable_roaming(struct hdd_adapter *adapter)
 		QDF_STA_MODE == adapter->device_mode &&
 		policy_mgr_is_sta_active_connection_exists(
 		hdd_ctx->hdd_psoc)) {
-		hdd_debug("Disconnect received on STA sessionId(%d)",
-		       adapter->sessionId);
+		hdd_debug("Disconnect received on STA session Id(%d)",
+		       adapter->session_id);
 		/*
 		 * Loop through adapter and enable roaming for each STA device
 		 * mode except the input adapter.
@@ -10334,13 +10334,13 @@ void wlan_hdd_enable_roaming(struct hdd_adapter *adapter)
 		while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) {
 			adapterIdx = adapterNode->adapter;
 
-			if (QDF_STA_MODE == adapterIdx->device_mode
-			    && adapter->sessionId != adapterIdx->sessionId) {
-				hdd_debug("Enabling Roaming on sessionId(%d)",
-				       adapterIdx->sessionId);
+			if (QDF_STA_MODE == adapterIdx->device_mode &&
+			    adapter->session_id != adapterIdx->session_id) {
+				hdd_debug("Enabling Roaming on session Id(%d)",
+				       adapterIdx->session_id);
 				sme_start_roaming(WLAN_HDD_GET_HAL_CTX
 							  (adapterIdx),
-						  adapterIdx->sessionId,
+						  adapterIdx->session_id,
 						  REASON_CONNECT);
 			}
 
@@ -10814,7 +10814,7 @@ void wlan_hdd_stop_sap(struct hdd_adapter *ap_adapter)
 		clear_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags);
 		policy_mgr_decr_session_set_pcl(hdd_ctx->hdd_psoc,
 						ap_adapter->device_mode,
-						ap_adapter->sessionId);
+						ap_adapter->session_id);
 		hdd_debug("SAP Stop Success");
 	} else {
 		hdd_err("Can't stop ap because its not started");
@@ -10882,7 +10882,7 @@ void wlan_hdd_start_sap(struct hdd_adapter *ap_adapter, bool reinit)
 	if (hostapd_state->bss_state == BSS_START)
 		policy_mgr_incr_active_session(hdd_ctx->hdd_psoc,
 					ap_adapter->device_mode,
-					ap_adapter->sessionId);
+					ap_adapter->session_id);
 end:
 	mutex_unlock(&hdd_ctx->sap_lock);
 	/* SAP context and beacon cleanup will happen during driver unload
@@ -12361,9 +12361,9 @@ bool hdd_is_connection_in_progress(uint8_t *session_id,
 					conn_info.connState)) {
 			hdd_debug("%pK(%d) Connection is in progress",
 				WLAN_HDD_GET_STATION_CTX_PTR(adapter),
-				adapter->sessionId);
+				adapter->session_id);
 			if (session_id && reason) {
-				*session_id = adapter->sessionId;
+				*session_id = adapter->session_id;
 				*reason = CONNECTION_IN_PROGRESS;
 			}
 			return true;
@@ -12375,13 +12375,13 @@ bool hdd_is_connection_in_progress(uint8_t *session_id,
 		if (((QDF_STA_MODE == adapter->device_mode) &&
 		     sme_neighbor_middle_of_roaming(
 			     WLAN_HDD_GET_HAL_CTX(adapter),
-			     adapter->sessionId)) ||
+			     adapter->session_id)) ||
 		    hdd_is_roaming_in_progress(adapter)) {
 			hdd_debug("%pK(%d) Reassociation in progress",
 				WLAN_HDD_GET_STATION_CTX_PTR(adapter),
-				adapter->sessionId);
+				adapter->session_id);
 			if (session_id && reason) {
-				*session_id = adapter->sessionId;
+				*session_id = adapter->session_id;
 				*reason = REASSOC_IN_PROGRESS;
 			}
 			return true;
@@ -12401,7 +12401,7 @@ bool hdd_is_connection_in_progress(uint8_t *session_id,
 					" is in middle of WPS/EAPOL exchange.",
 					MAC_ADDR_ARRAY(sta_mac));
 				if (session_id && reason) {
-					*session_id = adapter->sessionId;
+					*session_id = adapter->session_id;
 					*reason = EAPOL_IN_PROGRESS;
 				}
 				return true;
@@ -12422,7 +12422,7 @@ bool hdd_is_connection_in_progress(uint8_t *session_id,
 				" of SAP/GO is in middle of WPS/EAPOL exchange",
 				MAC_ADDR_ARRAY(sta_mac));
 				if (session_id && reason) {
-					*session_id = adapter->sessionId;
+					*session_id = adapter->session_id;
 					*reason = SAP_EAPOL_IN_PROGRESS;
 				}
 				return true;
@@ -12476,7 +12476,7 @@ void hdd_restart_sap(struct hdd_adapter *ap_adapter)
 		}
 		clear_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags);
 		policy_mgr_decr_session_set_pcl(hdd_ctx->hdd_psoc,
-			ap_adapter->device_mode, ap_adapter->sessionId);
+			ap_adapter->device_mode, ap_adapter->session_id);
 		hdd_err("SAP Stop Success");
 
 		if (0 != wlan_hdd_cfg80211_update_apies(ap_adapter)) {
@@ -12511,7 +12511,7 @@ void hdd_restart_sap(struct hdd_adapter *ap_adapter)
 		if (hostapd_state->bss_state == BSS_START)
 			policy_mgr_incr_active_session(hdd_ctx->hdd_psoc,
 						ap_adapter->device_mode,
-						ap_adapter->sessionId);
+						ap_adapter->session_id);
 	}
 end:
 	mutex_unlock(&hdd_ctx->sap_lock);
@@ -12608,7 +12608,7 @@ int wlan_hdd_send_p2p_quota(struct hdd_adapter *adapter, int set_value)
 		return -EINVAL;
 	}
 	hdd_info("Send MCC P2P QUOTA to WMA: %d", set_value);
-	sme_cli_set_command(adapter->sessionId,
+	sme_cli_set_command(adapter->session_id,
 			    WMA_VDEV_MCC_SET_TIME_QUOTA,
 			    set_value, VDEV_CMD);
 	return 0;
@@ -12623,7 +12623,7 @@ int wlan_hdd_send_mcc_latency(struct hdd_adapter *adapter, int set_value)
 	}
 
 	hdd_info("Send MCC latency WMA: %d", set_value);
-	sme_cli_set_command(adapter->sessionId,
+	sme_cli_set_command(adapter->session_id,
 			    WMA_VDEV_MCC_SET_TIME_LATENCY,
 			    set_value, VDEV_CMD);
 	return 0;
@@ -12723,7 +12723,7 @@ int hdd_set_limit_off_chan_for_tos(struct hdd_adapter *adapter, enum tos tos,
 				hdd_ctx->config->conc_system_pref);
 	}
 
-	status = sme_send_limit_off_channel_params(hal, adapter->sessionId,
+	status = sme_send_limit_off_channel_params(hal, adapter->session_id,
 			is_tos_active, max_off_chan_time,
 			hdd_ctx->config->nRestTimeConc, true);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
@@ -12760,9 +12760,9 @@ int hdd_reset_limit_off_chan(struct hdd_adapter *adapter)
 	adapter->active_ac = 0;
 
 	hdd_debug("reset ac_bitmap for session %hu active_ac %0x",
-			adapter->sessionId, adapter->active_ac);
+			adapter->session_id, adapter->active_ac);
 
-	status = sme_send_limit_off_channel_params(hal, adapter->sessionId,
+	status = sme_send_limit_off_channel_params(hal, adapter->session_id,
 			false, 0, 0, false);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		hdd_err("failed to reset limit off chan params");

core/hdd/src/wlan_hdd_nan_datapath.c

@@ -261,10 +261,10 @@ static int hdd_ndi_start_bss(struct hdd_adapter *adapter,
 	roam_profile->EncryptionType.encryptionType[0] = eCSR_ENCRYPT_TYPE_NONE;
 
 	ret = sme_roam_connect(WLAN_HDD_GET_HAL_CTX(adapter),
-		adapter->sessionId, roam_profile, &roam_id);
+		adapter->session_id, roam_profile, &roam_id);
 	if (QDF_STATUS_SUCCESS != ret) {
 		hdd_err("NDI sme_RoamConnect session %d failed with status %d -> NotConnected",
-			adapter->sessionId, ret);
+			adapter->session_id, ret);
 		/* change back to NotConnected */
 		hdd_conn_set_connection_state(adapter,
 			eConnectionState_NotConnected);
@@ -567,7 +567,7 @@ static int hdd_ndp_initiator_req_handler(struct hdd_context *hdd_ctx,
 		return -EINVAL;
 	}
 
-	req.vdev_id = adapter->sessionId;
+	req.vdev_id = adapter->session_id;
 
 	if (!tb[QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID]) {
 		hdd_err("Transaction ID is unavailable");
@@ -715,7 +715,7 @@ static int hdd_ndp_responder_req_handler(struct hdd_context *hdd_ctx,
 		return -EAGAIN;
 	}
 
-	req.vdev_id = adapter->sessionId;
+	req.vdev_id = adapter->session_id;
 
 	if (!tb[QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID]) {
 		hdd_err("Transaction ID is unavailable");
@@ -1271,7 +1271,7 @@ static void hdd_ndp_new_peer_ind_handler(struct hdd_adapter *adapter,
 
 	/* this function is called for each new peer */
 	ndp_ctx->active_ndp_peers++;
-	hdd_info("vdev_id: %d, num_peers: %d", adapter->sessionId,
+	hdd_info("vdev_id: %d, num_peers: %d", adapter->session_id,
 		 ndp_ctx->active_ndp_peers);
 
 	hdd_roam_register_sta(adapter, roam_info, new_peer_ind->sta_id,
@@ -1361,7 +1361,7 @@ static void hdd_ndp_confirm_ind_handler(struct hdd_adapter *adapter,
 	idx = hdd_get_peer_idx(sta_ctx, &ndp_confirm->peer_ndi_mac_addr);
 	if (idx == INVALID_PEER_IDX)
 		hdd_err("can't find addr: %pM in vdev_id: %d, peer table.",
-			&ndp_confirm->peer_ndi_mac_addr, adapter->sessionId);
+			&ndp_confirm->peer_ndi_mac_addr, adapter->session_id);
 	else if (ndp_confirm->rsp_code == NDP_RESPONSE_ACCEPT)
 		ndp_ctx->active_ndp_sessions[idx]++;
 
@@ -1910,7 +1910,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->sessionId,
+			os_if_nan_post_ndi_create_rsp(psoc, adapter->session_id,
 							success);
 			return;
 		case eCSR_ROAM_RESULT_NDI_DELETE_RSP:
@@ -1918,7 +1918,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->sessionId,
+			os_if_nan_post_ndi_delete_rsp(psoc, adapter->session_id,
 							success);
 			return;
 		default:
@@ -2121,7 +2121,7 @@ int hdd_init_nan_data_mode(struct hdd_adapter *adapter)
 	/* Configure self HT/VHT capabilities */
 	sme_set_curr_device_mode(hdd_ctx->hHal, adapter->device_mode);
 	sme_set_pdev_ht_vht_ies(hdd_ctx->hHal, hdd_ctx->config->enable2x2);
-	sme_set_vdev_ies_per_band(hdd_ctx->hHal, adapter->sessionId);
+	sme_set_vdev_ies_per_band(hdd_ctx->hHal, adapter->session_id);
 
 	/* Register wireless extensions */
 	ret_val = hdd_register_wext(wlan_dev);
@@ -2150,7 +2150,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->sessionId,
+	ret_val = wma_cli_set_command((int)adapter->session_id,
 			(int)WMI_PDEV_PARAM_BURST_ENABLE,
 			(int)hdd_ctx->config->enableSifsBurst,
 			PDEV_CMD);

core/hdd/src/wlan_hdd_object_manager.c

@@ -207,7 +207,7 @@ int hdd_objmgr_create_and_store_vdev(struct wlan_objmgr_pdev *pdev,
 	wlan_objmgr_vdev_get_ref(vdev, WLAN_HDD_ID_OBJ_MGR);
 
 	adapter->hdd_vdev = vdev;
-	adapter->sessionId = wlan_vdev_get_id(vdev);
+	adapter->session_id = wlan_vdev_get_id(vdev);
 
 	return 0;
 }
@@ -242,7 +242,7 @@ int hdd_objmgr_release_vdev(struct hdd_adapter *adapter)
 	wlan_objmgr_vdev_release_ref(adapter->hdd_vdev, WLAN_HDD_ID_OBJ_MGR);
 
 	adapter->hdd_vdev = NULL;
-	adapter->sessionId = HDD_SESSION_ID_INVALID;
+	adapter->session_id = HDD_SESSION_ID_INVALID;
 
 	return 0;
 }

core/hdd/src/wlan_hdd_ocb.c

@@ -257,7 +257,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->sessionId),
+		(struct cdp_pdev *)pdev, adapter->session_id),
 		adapter, &txrx_ops);
 	adapter->tx_fn = txrx_ops.tx.tx;
 
@@ -503,7 +503,7 @@ static int __iw_set_dot11p_channel_sched(struct net_device *dev,
 	}
 
 	/* Identify the vdev interface */
-	config->session_id = adapter->sessionId;
+	config->session_id = adapter->session_id;
 
 	/* Release all the mac addresses used for OCB */
 	for (i = 0; i < adapter->ocb_mac_addr_count; i++) {
@@ -872,7 +872,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->session_id = adapter->sessionId;
+	config->session_id = adapter->session_id;
 
 	/* Release all the mac addresses used for OCB */
 	for (i = 0; i < adapter->ocb_mac_addr_count; i++) {
@@ -999,7 +999,7 @@ static int __wlan_hdd_cfg80211_ocb_set_utc_time(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (!wma_is_vdev_up(adapter->sessionId)) {
+	if (!wma_is_vdev_up(adapter->session_id)) {
 		hdd_err("The device has not been started");
 		return -EINVAL;
 	}
@@ -1038,7 +1038,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->sessionId;
+	utc->vdev_id = adapter->session_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);
@@ -1109,7 +1109,7 @@ __wlan_hdd_cfg80211_ocb_start_timing_advert(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (!wma_is_vdev_up(adapter->sessionId)) {
+	if (!wma_is_vdev_up(adapter->session_id)) {
 		hdd_err("The device has not been started");
 		return -EINVAL;
 	}
@@ -1119,7 +1119,7 @@ __wlan_hdd_cfg80211_ocb_start_timing_advert(struct wiphy *wiphy,
 		hdd_err("qdf_mem_malloc failed");
 		return -ENOMEM;
 	}
-	timing_advert->vdev_id = adapter->sessionId;
+	timing_advert->vdev_id = adapter->session_id;
 
 	/* Parse the netlink message */
 	if (hdd_nla_parse(tb, QCA_WLAN_VENDOR_ATTR_OCB_START_TIMING_ADVERT_MAX,
@@ -1225,7 +1225,7 @@ __wlan_hdd_cfg80211_ocb_stop_timing_advert(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (!wma_is_vdev_up(adapter->sessionId)) {
+	if (!wma_is_vdev_up(adapter->session_id)) {
 		hdd_err("The device has not been started");
 		return -EINVAL;
 	}
@@ -1235,7 +1235,7 @@ __wlan_hdd_cfg80211_ocb_stop_timing_advert(struct wiphy *wiphy,
 		hdd_err("qdf_mem_malloc failed");
 		return -ENOMEM;
 	}
-	timing_advert->vdev_id = adapter->sessionId;
+	timing_advert->vdev_id = adapter->session_id;
 
 	/* Parse the netlink message */
 	if (hdd_nla_parse(tb, QCA_WLAN_VENDOR_ATTR_OCB_STOP_TIMING_ADVERT_MAX,
@@ -1405,7 +1405,7 @@ __wlan_hdd_cfg80211_ocb_get_tsf_timer(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (!wma_is_vdev_up(adapter->sessionId)) {
+	if (!wma_is_vdev_up(adapter->session_id)) {
 		hdd_err("The device has not been started");
 		return -EINVAL;
 	}
@@ -1417,7 +1417,7 @@ __wlan_hdd_cfg80211_ocb_get_tsf_timer(struct wiphy *wiphy,
 	}
 	cookie = hdd_request_cookie(hdd_request);
 
-	request.vdev_id = adapter->sessionId;
+	request.vdev_id = adapter->session_id;
 	/* Call the SME function */
 	status = sme_ocb_get_tsf_timer(hdd_ctx->hHal, cookie,
 				       hdd_ocb_get_tsf_timer_callback,
@@ -1629,7 +1629,7 @@ static int __wlan_hdd_cfg80211_dcc_get_stats(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (!wma_is_vdev_up(adapter->sessionId)) {
+	if (!wma_is_vdev_up(adapter->session_id)) {
 		hdd_err("The device has not been started");
 		return -EINVAL;
 	}
@@ -1662,7 +1662,7 @@ static int __wlan_hdd_cfg80211_dcc_get_stats(struct wiphy *wiphy,
 	}
 	cookie = hdd_request_cookie(hdd_request);
 
-	request.vdev_id = adapter->sessionId;
+	request.vdev_id = adapter->session_id;
 	request.channel_count = channel_count;
 	request.request_array_len = request_array_len;
 	request.request_array = request_array;
@@ -1758,7 +1758,7 @@ static int __wlan_hdd_cfg80211_dcc_clear_stats(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (!wma_is_vdev_up(adapter->sessionId)) {
+	if (!wma_is_vdev_up(adapter->session_id)) {
 		hdd_err("The device has not been started");
 		return -EINVAL;
 	}
@@ -1777,7 +1777,7 @@ static int __wlan_hdd_cfg80211_dcc_clear_stats(struct wiphy *wiphy,
 	}
 
 	/* Call the SME function */
-	if (sme_dcc_clear_stats(hdd_ctx->hHal, adapter->sessionId,
+	if (sme_dcc_clear_stats(hdd_ctx->hHal, adapter->session_id,
 		nla_get_u32(
 			tb[QCA_WLAN_VENDOR_ATTR_DCC_CLEAR_STATS_BITMAP])) !=
 			QDF_STATUS_SUCCESS) {
@@ -1887,7 +1887,7 @@ static int __wlan_hdd_cfg80211_dcc_update_ndl(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (!wma_is_vdev_up(adapter->sessionId)) {
+	if (!wma_is_vdev_up(adapter->session_id)) {
 		hdd_err("The device has not been started");
 		return -EINVAL;
 	}
@@ -1926,7 +1926,7 @@ static int __wlan_hdd_cfg80211_dcc_update_ndl(struct wiphy *wiphy,
 	cookie = hdd_request_cookie(hdd_request);
 
 	/* Copy the parameters to the request structure. */
-	request.vdev_id = adapter->sessionId;
+	request.vdev_id = adapter->session_id;
 	request.channel_count = channel_count;
 	request.dcc_ndl_chan_list_len = ndl_channel_array_len;
 	request.dcc_ndl_chan_list = ndl_channel_array;

core/hdd/src/wlan_hdd_oemdata.c

@@ -92,10 +92,10 @@ static int populate_oem_data_cap(struct hdd_adapter *adapter,
 	data_cap->allowed_dwell_time_max = config->nNeighborScanMaxChanTime;
 	data_cap->curr_dwell_time_min =
 		sme_get_neighbor_scan_min_chan_time(hdd_ctx->hHal,
-						    adapter->sessionId);
+						    adapter->session_id);
 	data_cap->curr_dwell_time_max =
 		sme_get_neighbor_scan_max_chan_time(hdd_ctx->hHal,
-						    adapter->sessionId);
+						    adapter->session_id);
 	data_cap->supported_bands = config->nBandCapability;
 
 	/* request for max num of channels */
@@ -224,7 +224,7 @@ static void send_oem_reg_rsp_nlink_msg(void)
 			deviceMode = buf++;
 			vdevId = buf++;
 			*deviceMode = adapter->device_mode;
-			*vdevId = adapter->sessionId;
+			*vdevId = adapter->session_id;
 			(*numInterfaces)++;
 			hdd_debug("numInterfaces: %d, deviceMode: %d, vdevId: %d",
 				   *numInterfaces, *deviceMode,

core/hdd/src/wlan_hdd_p2p.c

@@ -146,8 +146,8 @@ static int __wlan_hdd_cfg80211_remain_on_channel(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->sessionId)) {
-		hdd_err("invalid session id: %d", adapter->sessionId);
+	if (wlan_hdd_validate_session_id(adapter->session_id)) {
+		hdd_err("invalid session id: %d", adapter->session_id);
 		return -EINVAL;
 	}
 
@@ -191,8 +191,8 @@ __wlan_hdd_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->sessionId)) {
-		hdd_err("invalid session id: %d", adapter->sessionId);
+	if (wlan_hdd_validate_session_id(adapter->session_id)) {
+		hdd_err("invalid session id: %d", adapter->session_id);
 		return -EINVAL;
 	}
 
@@ -234,8 +234,8 @@ static int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->sessionId)) {
-		hdd_err("invalid session id: %d", adapter->sessionId);
+	if (wlan_hdd_validate_session_id(adapter->session_id)) {
+		hdd_err("invalid session id: %d", adapter->session_id);
 		return -EINVAL;
 	}
 
@@ -292,8 +292,8 @@ static int __wlan_hdd_cfg80211_mgmt_tx_cancel_wait(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->sessionId)) {
-		hdd_err("invalid session id: %d", adapter->sessionId);
+	if (wlan_hdd_validate_session_id(adapter->session_id)) {
+		hdd_err("invalid session id: %d", adapter->session_id);
 		return -EINVAL;
 	}
 
@@ -382,7 +382,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->sessionId;
+	noa.vdev_id = adapter->session_id;
 
 	hdd_debug("P2P_PS_ATTR:oppPS %d ctWindow %d duration %d "
 		  "interval %d count %d single noa duration %d "
@@ -493,7 +493,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->sessionId;
+		noa.vdev_id = adapter->session_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,
@@ -520,7 +520,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->sessionId;
+	noa.vdev_id = adapter->session_id;
 
 	return wlan_hdd_set_power_save(adapter, &noa);
 }
@@ -597,11 +597,11 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy,
 
 	adapter = hdd_get_adapter(hdd_ctx, QDF_STA_MODE);
 	if ((adapter != NULL) &&
-		!(wlan_hdd_validate_session_id(adapter->sessionId))) {
+		!(wlan_hdd_validate_session_id(adapter->session_id))) {
 		scan_info = &adapter->scan_info;
 		if (scan_info->mScanPending) {
 			wlan_abort_scan(hdd_ctx->hdd_pdev, INVAL_PDEV_ID,
-				adapter->sessionId, INVALID_SCAN_ID, false);
+				adapter->session_id, INVALID_SCAN_ID, false);
 			hdd_debug("Abort Scan while adding virtual interface");
 		}
 	}
@@ -776,7 +776,7 @@ int __wlan_hdd_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev)
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_DEL_VIRTUAL_INTF,
-			 pVirtAdapter->sessionId, pVirtAdapter->device_mode));
+			 pVirtAdapter->session_id, pVirtAdapter->device_mode));
 	hdd_debug("Device_mode %s(%d)",
 		   hdd_device_mode_to_string(pVirtAdapter->device_mode),
 		   pVirtAdapter->device_mode);
@@ -910,7 +910,7 @@ void __hdd_indicate_mgmt_frame(struct hdd_adapter *adapter,
 
 	/* Indicate Frame Over Normal Interface */
 	hdd_debug("Indicate Frame over NL80211 sessionid : %d, idx :%d",
-		   adapter->sessionId, adapter->dev->ifindex);
+		   adapter->session_id, adapter->dev->ifindex);
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
 	cfg80211_rx_mgmt(adapter->dev->ieee80211_ptr,
@@ -1010,7 +1010,7 @@ int wlan_hdd_listen_offload_stop(struct hdd_adapter *adapter)
 		return -EINVAL;
 	}
 
-	vdev_id = (uint32_t)adapter->sessionId;
+	vdev_id = (uint32_t)adapter->session_id;
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	psoc = hdd_ctx->hdd_psoc;
 	if (!psoc) {
@@ -1268,7 +1268,7 @@ int wlan_hdd_set_mcc_p2p_quota(struct hdd_adapter *adapter,
 
 
 		set_value = set_second_connection_operating_channel(
-			hdd_ctx, set_value, adapter->sessionId);
+			hdd_ctx, set_value, adapter->session_id);
 
 
 		ret = wlan_hdd_send_p2p_quota(adapter, set_value);

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->sessionId);
+					    adapter->session_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->sessionId);
+					    adapter->session_id);
 			filter_id++;
 		}
 		filters = filters >> 1;

core/hdd/src/wlan_hdd_power.c

@@ -228,7 +228,7 @@ static int __wlan_hdd_ipv6_changed(struct notifier_block *nb,
 		}
 
 		hdd_debug("invoking sme_dhcp_done_ind");
-		sme_dhcp_done_ind(hdd_ctx->hHal, adapter->sessionId);
+		sme_dhcp_done_ind(hdd_ctx->hHal, adapter->session_id);
 		schedule_work(&adapter->ipv6_notifier_work);
 	}
 
@@ -386,7 +386,7 @@ void hdd_enable_ns_offload(struct hdd_adapter *adapter,
 	}
 
 	ns_req->psoc = psoc;
-	ns_req->vdev_id = adapter->sessionId;
+	ns_req->vdev_id = adapter->session_id;
 	ns_req->trigger = trigger;
 	ns_req->count = 0;
 
@@ -696,7 +696,7 @@ static int hdd_set_grat_arp_keepalive(struct hdd_adapter *adapter)
 
 	qdf_copy_macaddr(&req.bssid, &sta_ctx->conn_info.bssId);
 	req.timePeriod = hdd_ctx->config->infraStaKeepAlivePeriod;
-	req.sessionId = adapter->sessionId;
+	req.sessionId = adapter->session_id;
 
 	hdd_debug("Setting gratuitous ARP keepalive; ipv4_addr:%u.%u.%u.%u",
 		 req.hostIpv4Addr[0], req.hostIpv4Addr[1],
@@ -756,7 +756,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->hHal, adapter->sessionId,
+		sme_send_hlp_ie_info(hdd_ctx->hHal, adapter->session_id,
 				     roam_profile, ifa->ifa_local);
 exit:
 	EXIT();
@@ -821,7 +821,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->hHal, adapter->sessionId);
+		sme_dhcp_done_ind(hdd_ctx->hHal, adapter->session_id);
 
 		if (!hdd_ctx->config->fhostArpOffload) {
 			hdd_debug("Offload not enabled ARPOffload=%d",
@@ -911,7 +911,7 @@ void hdd_enable_arp_offload(struct hdd_adapter *adapter,
 	}
 
 	arp_req->psoc = psoc;
-	arp_req->vdev_id = adapter->sessionId;
+	arp_req->vdev_id = adapter->session_id;
 	arp_req->trigger = trigger;
 
 	ifa = hdd_get_ipv4_local_interface(adapter);
@@ -975,7 +975,7 @@ void hdd_enable_mc_addr_filtering(struct hdd_adapter *adapter,
 		goto out;
 
 	status = pmo_ucfg_enable_mc_addr_filtering_in_fwr(psoc,
-				adapter->sessionId, trigger);
+				adapter->session_id, trigger);
 	if (status != QDF_STATUS_SUCCESS)
 		hdd_info("failed to enable mc list status %d", status);
 out:
@@ -995,7 +995,7 @@ void hdd_disable_mc_addr_filtering(struct hdd_adapter *adapter,
 		goto out;
 
 	status = pmo_ucfg_disable_mc_addr_filtering_in_fwr(psoc,
-				adapter->sessionId, trigger);
+				adapter->session_id, trigger);
 	if (status != QDF_STATUS_SUCCESS)
 		hdd_info("failed to disable mc list status %d", status);
 out:
@@ -1030,12 +1030,12 @@ void hdd_disable_and_flush_mc_addr_list(struct hdd_adapter *adapter,
 	ENTER();
 	/* disable mc list first */
 	status = pmo_ucfg_disable_mc_addr_filtering_in_fwr(psoc,
-			adapter->sessionId, trigger);
+			adapter->session_id, trigger);
 	if (status != QDF_STATUS_SUCCESS)
 		hdd_info("fail to disable mc list");
 
 	/* flush mc list */
-	status = pmo_ucfg_flush_mc_addr_list(psoc, adapter->sessionId);
+	status = pmo_ucfg_flush_mc_addr_list(psoc, adapter->session_id);
 	if (status != QDF_STATUS_SUCCESS)
 		hdd_info("fail to flush mc list status %d", status);
 	EXIT();
@@ -1064,7 +1064,7 @@ static void hdd_update_conn_state_mask(struct hdd_adapter *adapter,
 
 	if (connState == eConnectionState_Associated ||
 			connState == eConnectionState_IbssConnected)
-		*conn_state_mask |= (1 << adapter->sessionId);
+		*conn_state_mask |= (1 << adapter->session_id);
 }
 
 /**
@@ -1101,8 +1101,8 @@ hdd_suspend_wlan(void)
 	status = hdd_get_front_adapter(hdd_ctx, &pAdapterNode);
 	while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) {
 		adapter = pAdapterNode->adapter;
-		if (wlan_hdd_validate_session_id(adapter->sessionId)) {
-			hdd_err("invalid session id: %d", adapter->sessionId);
+		if (wlan_hdd_validate_session_id(adapter->session_id)) {
+			hdd_err("invalid session id: %d", adapter->session_id);
 			goto next_adapter;
 		}
 
@@ -1168,8 +1168,8 @@ static int hdd_resume_wlan(void)
 
 	while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) {
 		adapter = pAdapterNode->adapter;
-		if (wlan_hdd_validate_session_id(adapter->sessionId)) {
-			hdd_err("invalid session id: %d", adapter->sessionId);
+		if (wlan_hdd_validate_session_id(adapter->session_id)) {
+			hdd_err("invalid session id: %d", adapter->session_id);
 			goto next_adapter;
 		}
 		/* Disable supported OffLoads */
@@ -1362,7 +1362,7 @@ static void hdd_send_default_scan_ies(struct hdd_context *hdd_ctx)
 		    (adapter->device_mode == QDF_STA_MODE ||
 		    adapter->device_mode == QDF_P2P_DEVICE_MODE)) {
 			sme_set_default_scan_ie(hdd_ctx->hHal,
-				      adapter->sessionId,
+				      adapter->session_id,
 				      adapter->scan_info.default_scan_ies,
 				      adapter->scan_info.default_scan_ies_len);
 		}
@@ -1521,7 +1521,7 @@ int wlan_hdd_set_powersave(struct hdd_adapter *adapter,
 			hdd_debug("Disabling Auto Power save timer");
 			sme_ps_disable_auto_ps_timer(
 				WLAN_HDD_GET_HAL_CTX(adapter),
-				adapter->sessionId);
+				adapter->session_id);
 		}
 
 		if (hdd_ctx->config && hdd_ctx->config->is_ps_enabled) {
@@ -1531,7 +1531,7 @@ int wlan_hdd_set_powersave(struct hdd_adapter *adapter,
 			 * Enter Power Save command received from GUI
 			 * this means DHCP is completed
 			 */
-			sme_ps_enable_disable(hal, adapter->sessionId,
+			sme_ps_enable_disable(hal, adapter->session_id,
 					SME_PS_ENABLE);
 		} else {
 			hdd_debug("Power Save is not enabled in the cfg");
@@ -1544,10 +1544,10 @@ int wlan_hdd_set_powersave(struct hdd_adapter *adapter,
 		 * this means we are disconnected
 		 */
 		sme_ps_disable_auto_ps_timer(WLAN_HDD_GET_HAL_CTX(adapter),
-			adapter->sessionId);
-		sme_ps_enable_disable(hal, adapter->sessionId, SME_PS_DISABLE);
+			adapter->session_id);
+		sme_ps_enable_disable(hal, adapter->session_id, SME_PS_DISABLE);
 		sme_ps_enable_auto_ps_timer(WLAN_HDD_GET_HAL_CTX(adapter),
-			adapter->sessionId, timeout);
+			adapter->session_id, timeout);
 	}
 
 	return 0;
@@ -1789,8 +1789,8 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy,
 	while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) {
 		adapter = pAdapterNode->adapter;
 
-		if (wlan_hdd_validate_session_id(adapter->sessionId)) {
-			hdd_err("invalid session id: %d", adapter->sessionId);
+		if (wlan_hdd_validate_session_id(adapter->session_id)) {
+			hdd_err("invalid session id: %d", adapter->session_id);
 			goto next_adapter;
 		}
 
@@ -1832,7 +1832,7 @@ next_adapter:
 		scan_info = &adapter->scan_info;
 
 		if (sme_neighbor_middle_of_roaming
-			    (hdd_ctx->hHal, adapter->sessionId)) {
+			    (hdd_ctx->hHal, adapter->session_id)) {
 			hdd_err("Roaming in progress, do not allow suspend");
 			wlan_hdd_inc_suspend_stats(hdd_ctx,
 						   SUSPEND_FAIL_ROAM);
@@ -1840,7 +1840,7 @@ next_adapter:
 		}
 
 		wlan_abort_scan(hdd_ctx->hdd_pdev, INVAL_PDEV_ID,
-				adapter->sessionId, INVALID_SCAN_ID, false);
+				adapter->session_id, INVALID_SCAN_ID, false);
 
 		status = hdd_get_next_adapter(hdd_ctx, pAdapterNode, &pNext);
 		pAdapterNode = pNext;
@@ -1851,7 +1851,7 @@ next_adapter:
 	while (pAdapterNode && QDF_IS_STATUS_SUCCESS(status)) {
 		adapter = pAdapterNode->adapter;
 
-		sme_ps_timer_flush_sync(hdd_ctx->hHal, adapter->sessionId);
+		sme_ps_timer_flush_sync(hdd_ctx->hHal, adapter->session_id);
 
 		status = hdd_get_next_adapter(hdd_ctx, pAdapterNode,
 					      &pAdapterNode);
@@ -1962,7 +1962,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->hHal, adapter->device_mode,
 			  adapter->mac_addr.bytes,
-			  adapter->sessionId);
+			  adapter->session_id);
 	hdd_allow_suspend(WIFI_POWER_EVENT_WAKELOCK_DHCP);
 	qdf_runtime_pm_allow_suspend(&adapter->connect_rpm_ctx.connect);
 }
@@ -1986,7 +1986,7 @@ static void hdd_start_dhcp_ind(struct hdd_adapter *adapter)
 				    WIFI_POWER_EVENT_WAKELOCK_DHCP);
 	sme_dhcp_start_ind(hdd_ctx->hHal, adapter->device_mode,
 			   adapter->mac_addr.bytes,
-			   adapter->sessionId);
+			   adapter->session_id);
 }
 
 /**
@@ -2020,14 +2020,14 @@ static int __wlan_hdd_cfg80211_set_power_mgmt(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->sessionId)) {
-		hdd_err("invalid session id: %d", adapter->sessionId);
+	if (wlan_hdd_validate_session_id(adapter->session_id)) {
+		hdd_err("invalid session id: %d", adapter->session_id);
 		return -EINVAL;
 	}
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_SET_POWER_MGMT,
-			 adapter->sessionId, timeout));
+			 adapter->session_id, timeout));
 
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	status = wlan_hdd_validate_context(hdd_ctx);
@@ -2205,8 +2205,8 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy,
 	}
 
 	/* Validate adapter sessionId */
-	if (wlan_hdd_validate_session_id(adapter->sessionId)) {
-		hdd_err("invalid session id: %d", adapter->sessionId);
+	if (wlan_hdd_validate_session_id(adapter->session_id)) {
+		hdd_err("invalid session id: %d", adapter->session_id);
 		return -EINVAL;
 	}
 
@@ -2229,7 +2229,7 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy,
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_GET_TXPOWER,
-			 adapter->sessionId, adapter->device_mode));
+			 adapter->session_id, adapter->device_mode));
 	wlan_hdd_get_class_astats(adapter);
 	*dbm = adapter->hdd_stats.class_a_stat.max_pwr;
 
@@ -2293,7 +2293,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->sessionId, qpower);
+	status = wma_set_qpower_config(adapter->session_id, qpower);
 	if (status != QDF_STATUS_SUCCESS) {
 		hdd_err("failed to configure qpower: %d", status);
 		return -EINVAL;

core/hdd/src/wlan_hdd_rx_monitor.c

@@ -135,5 +135,5 @@ int hdd_enable_monitor_mode(struct net_device *dev)
 
 	return cdp_set_monitor_mode(soc,
 			(struct cdp_vdev *)cdp_get_vdev_from_vdev_id(soc,
-			(struct cdp_pdev *)pdev, adapter->sessionId), false);
+			(struct cdp_pdev *)pdev, adapter->session_id), false);
 }

core/hdd/src/wlan_hdd_scan.c

@@ -466,8 +466,8 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->sessionId)) {
-		hdd_err("invalid session id: %d", adapter->sessionId);
+	if (wlan_hdd_validate_session_id(adapter->session_id)) {
+		hdd_err("invalid session id: %d", adapter->session_id);
 		return -EINVAL;
 	}
 
@@ -477,9 +477,9 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_SCAN,
-			 adapter->sessionId, request->n_channels));
+			 adapter->session_id, request->n_channels));
 
-	if (!sme_is_session_id_valid(hdd_ctx->hHal, adapter->sessionId))
+	if (!sme_is_session_id_valid(hdd_ctx->hHal, adapter->session_id))
 		return -EINVAL;
 
 	if ((eConnectionState_Associated ==
@@ -788,7 +788,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
 		(request->n_channels != WLAN_HDD_P2P_SINGLE_CHANNEL_SCAN)) {
 		hdd_debug("Flushing P2P Results");
 		sme_scan_flush_p2p_result(WLAN_HDD_GET_HAL_CTX(adapter),
-			adapter->sessionId);
+			adapter->session_id);
 	}
 	if (request->ie_len) {
 		pP2pIe = wlan_hdd_get_p2p_ie_ptr((uint8_t *) request->ie,
@@ -844,7 +844,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
 		sme_scan_flush_result(WLAN_HDD_GET_HAL_CTX(adapter));
 #endif
 	status = sme_scan_request(WLAN_HDD_GET_HAL_CTX(adapter),
-				adapter->sessionId, &scan_req,
+				adapter->session_id, &scan_req,
 				&hdd_cfg80211_scan_done_callback, dev);
 
 	if (QDF_STATUS_SUCCESS != status) {
@@ -1431,7 +1431,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->hdd_pdev, INVAL_PDEV_ID,
-			adapter->sessionId, INVALID_SCAN_ID, true);
+			adapter->session_id, INVALID_SCAN_ID, true);
 
 	return 0;
 }
@@ -1463,8 +1463,8 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->sessionId)) {
-		hdd_err("invalid session id: %d", adapter->sessionId);
+	if (wlan_hdd_validate_session_id(adapter->session_id)) {
+		hdd_err("invalid session id: %d", adapter->session_id);
 		return -EINVAL;
 	}
 
@@ -1492,7 +1492,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy,
 		return -EBUSY;
 	}
 
-	if (!sme_is_session_id_valid(hdd_ctx->hHal, adapter->sessionId))
+	if (!sme_is_session_id_valid(hdd_ctx->hHal, adapter->session_id))
 		return -EINVAL;
 
 	hHal = WLAN_HDD_GET_HAL_CTX(adapter);
@@ -1540,8 +1540,8 @@ int wlan_hdd_sched_scan_stop(struct net_device *dev)
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->sessionId)) {
-		hdd_err("invalid session id: %d", adapter->sessionId);
+	if (wlan_hdd_validate_session_id(adapter->session_id)) {
+		hdd_err("invalid session id: %d", adapter->session_id);
 		return -EINVAL;
 	}
 
@@ -1663,8 +1663,8 @@ static void __wlan_hdd_cfg80211_abort_scan(struct wiphy *wiphy,
 		return;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->sessionId)) {
-		hdd_err("invalid session id: %d", adapter->sessionId);
+	if (wlan_hdd_validate_session_id(adapter->session_id)) {
+		hdd_err("invalid session id: %d", adapter->session_id);
 		return;
 	}
 

core/hdd/src/wlan_hdd_softap_tx_rx.c

@@ -434,7 +434,7 @@ static int __hdd_softap_hard_start_xmit(struct sk_buff *skb,
 	adapter->sta_info[STAId].last_tx_rx_ts = qdf_system_ticks();
 
 	hdd_event_eapol_log(skb, QDF_TX);
-	qdf_dp_trace_log_pkt(adapter->sessionId, skb, QDF_TX,
+	qdf_dp_trace_log_pkt(adapter->session_id, skb, QDF_TX,
 			QDF_TRACE_DEFAULT_PDEV_ID);
 	QDF_NBUF_CB_TX_PACKET_TRACK(skb) = QDF_NBUF_TX_PKT_DATA_TRACK;
 	QDF_NBUF_UPDATE_TX_PKT_COUNT(skb, QDF_NBUF_TX_PKT_HDD);
@@ -761,7 +761,7 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *context, qdf_nbuf_t rxBuf)
 		}
 	}
 		hdd_event_eapol_log(skb, QDF_RX);
-		proto_pkt_logged = qdf_dp_trace_log_pkt(adapter->sessionId,
+		proto_pkt_logged = qdf_dp_trace_log_pkt(adapter->session_id,
 						skb, QDF_RX,
 						QDF_TRACE_DEFAULT_PDEV_ID);
 		DPTRACE(qdf_dp_trace(skb,
@@ -929,11 +929,11 @@ QDF_STATUS hdd_softap_register_sta(struct hdd_adapter *adapter,
 	txrx_ops.rx.rx = hdd_softap_rx_packet_cbk;
 	cdp_vdev_register(soc,
 		(struct cdp_vdev *)cdp_get_vdev_from_vdev_id(soc,
-		(struct cdp_pdev *)pdev, adapter->sessionId),
+		(struct cdp_pdev *)pdev, adapter->session_id),
 		adapter, &txrx_ops);
 	adapter->txrx_vdev = (void *)cdp_get_vdev_from_vdev_id(soc,
 					(struct cdp_pdev *)pdev,
-					adapter->sessionId);
+					adapter->session_id);
 	adapter->tx_fn = txrx_ops.tx.tx;
 
 	qdf_status = cdp_peer_register(soc,

core/hdd/src/wlan_hdd_stats.c

@@ -503,7 +503,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->sessionId);
+				adapter->session_id);
 			pInfo->state = WIFI_ASSOCIATING;
 		}
 		if ((eConnectionState_Associated ==
@@ -1246,7 +1246,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->sessionId;
+	LinkLayerStatsSetReq.staId = adapter->session_id;
 
 	hdd_debug("LL_STATS_SET reqId = %d, staId = %d, mpduSizeThreshold = %d, Statistics Gathering = %d",
 		LinkLayerStatsSetReq.reqId, LinkLayerStatsSetReq.staId,
@@ -1364,14 +1364,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->sessionId;
+	get_req.staId = adapter->session_id;
 
 	rtnl_lock();
 	ret = wlan_hdd_send_ll_stats_req(hdd_ctx, &get_req);
 	rtnl_unlock();
 	if (0 != ret)
 		hdd_err("Send LL stats req failed, id:%u, mask:%d, session:%d",
-			req_id, req_mask, adapter->sessionId);
+			req_id, req_mask, adapter->session_id);
 
 	EXIT();
 	return ret;
@@ -1447,10 +1447,10 @@ __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->sessionId;
+	LinkLayerStatsGetReq.staId = adapter->session_id;
 
-	if (wlan_hdd_validate_session_id(adapter->sessionId)) {
-		hdd_err("invalid session id: %d", adapter->sessionId);
+	if (wlan_hdd_validate_session_id(adapter->session_id)) {
+		hdd_err("invalid session id: %d", adapter->session_id);
 		return -EINVAL;
 	}
 
@@ -1565,7 +1565,7 @@ __wlan_hdd_cfg80211_ll_stats_clear(struct wiphy *wiphy,
 	 */
 	LinkLayerStatsClearReq.reqId = 1;
 
-	LinkLayerStatsClearReq.staId = adapter->sessionId;
+	LinkLayerStatsClearReq.staId = adapter->session_id;
 
 	hdd_debug("LL_STATS_CLEAR reqId = %d, staId = %d, statsClearReqMask = 0x%X, stopReq = %d",
 		LinkLayerStatsClearReq.reqId,
@@ -2734,7 +2734,7 @@ set_thresh:
 
 set_period:
 	hdd_info("send period to target");
-	status = wma_cli_set_command(adapter->sessionId,
+	status = wma_cli_set_command(adapter->session_id,
 				     WMI_PDEV_PARAM_STATS_OBSERVATION_PERIOD,
 				     period, PDEV_CMD);
 	if (status) {
@@ -2805,7 +2805,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->sessionId, &stats_ext_req);
+	status = sme_stats_ext_request(adapter->session_id, &stats_ext_req);
 
 	if (QDF_STATUS_SUCCESS != status)
 		ret_val = -EINVAL;
@@ -3933,8 +3933,8 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy,
 	if (status)
 		return status;
 
-	if (wlan_hdd_validate_session_id(adapter->sessionId)) {
-		hdd_err("invalid session id: %d", adapter->sessionId);
+	if (wlan_hdd_validate_session_id(adapter->session_id)) {
+		hdd_err("invalid session id: %d", adapter->session_id);
 		return -EINVAL;
 	}
 
@@ -4374,7 +4374,7 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy,
 			sinfo->signal_avg = sinfo->chain_signal_avg[i];
 
 		hdd_debug("RSSI for chain %d, vdev_id %d is %d",
-			i, adapter->sessionId, sinfo->chain_signal_avg[i]);
+			i, adapter->session_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_cfg80211_get_station(struct wiphy *wiphy,
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_GET_STA,
-			 adapter->sessionId, maxRate));
+			 adapter->session_id, maxRate));
 
 	EXIT();
 
@@ -4571,7 +4571,7 @@ static bool wlan_hdd_update_survey_info(struct wiphy *wiphy,
 	struct hdd_context *hdd_ctx;
 
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	sme_get_operation_channel(hdd_ctx->hHal, &channel, adapter->sessionId);
+	sme_get_operation_channel(hdd_ctx->hHal, &channel, adapter->session_id);
 	hdd_wlan_get_freq(channel, &opfreq);
 
 	mutex_lock(&hdd_ctx->chan_info_lock);
@@ -4894,7 +4894,7 @@ static int __wlan_hdd_get_rcpi(struct hdd_adapter *adapter,
 	cookie = hdd_request_cookie(request);
 
 	rcpi_req->mac_addr = mac_addr;
-	rcpi_req->session_id = adapter->sessionId;
+	rcpi_req->session_id = adapter->session_id;
 	rcpi_req->measurement_type = measurement_type;
 	rcpi_req->rcpi_callback = wlan_hdd_get_rcpi_cb;
 	rcpi_req->rcpi_context = cookie;

core/hdd/src/wlan_hdd_subnet_detect.c

@@ -146,7 +146,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->sessionId;
+	req.session_id = adapter->session_id;
 
 	hdd_info("**** Gateway Parameters: ****");
 	hdd_info("session id: %d", req.session_id);

core/hdd/src/wlan_hdd_tdls.c

@@ -227,7 +227,7 @@ int wlan_hdd_tdls_set_params(struct net_device *dev,
 		return -ENOMEM;
 	}
 
-	tdlsParams->vdev_id = adapter->sessionId;
+	tdlsParams->vdev_id = adapter->session_id;
 	tdlsParams->tdls_state = config->tdls;
 	tdlsParams->notification_interval_ms = config->tx_period_t;
 	tdlsParams->tx_discovery_threshold = config->tx_packet_n;
@@ -641,14 +641,14 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->sessionId)) {
-		hdd_err("invalid session id: %d", adapter->sessionId);
+	if (wlan_hdd_validate_session_id(adapter->session_id)) {
+		hdd_err("invalid session id: %d", adapter->session_id);
 		return -EINVAL;
 	}
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_TDLS_MGMT,
-			 adapter->sessionId, action_code));
+			 adapter->session_id, action_code));
 
 	if (wlan_hdd_validate_context(hdd_ctx))
 		return -EINVAL;
@@ -817,14 +817,14 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_session_id(adapter->sessionId)) {
-		hdd_err("invalid session id: %d", adapter->sessionId);
+	if (wlan_hdd_validate_session_id(adapter->session_id)) {
+		hdd_err("invalid session id: %d", adapter->session_id);
 		return -EINVAL;
 	}
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_TDLS_OPER,
-			 adapter->sessionId, oper));
+			 adapter->session_id, oper));
 	if (NULL == peer) {
 		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid arguments", __func__);

core/hdd/src/wlan_hdd_tsf.c

@@ -136,8 +136,8 @@ static int hdd_tsf_reset_gpio(struct hdd_adapter *adapter)
 {
 	int ret;
 
-	ret = wma_cli_set_command((int)adapter->sessionId,
-			(int)GEN_PARAM_RESET_TSF_GPIO, adapter->sessionId,
+	ret = wma_cli_set_command((int)adapter->session_id,
+			(int)GEN_PARAM_RESET_TSF_GPIO, adapter->session_id,
 			GEN_CMD);
 
 	if (ret != 0) {
@@ -195,9 +195,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->sessionId,
+	ret = wma_cli_set_command((int)adapter->session_id,
 				  (int)GEN_PARAM_CAPTURE_TSF,
-				  adapter->sessionId, GEN_CMD);
+				  adapter->session_id, GEN_CMD);
 	if (QDF_STATUS_SUCCESS != ret) {
 		hdd_err("cap tsf fail");
 		buf[0] = TSF_CAPTURE_FAIL;

core/hdd/src/wlan_hdd_tx_rx.c

@@ -262,7 +262,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->sessionId, flow_control_fp, adapter,
+		adapter->session_id, flow_control_fp, adapter,
 		flow_control_is_pause_fp);
 }
 
@@ -275,7 +275,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->sessionId);
+			adapter->session_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);
@@ -724,7 +724,7 @@ static int __hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 		++adapter->stats.tx_packets;
 
 	hdd_event_eapol_log(skb, QDF_TX);
-	pkt_proto_logged = qdf_dp_trace_log_pkt(adapter->sessionId,
+	pkt_proto_logged = qdf_dp_trace_log_pkt(adapter->session_id,
 						skb, QDF_TX,
 						QDF_TRACE_DEFAULT_PDEV_ID);
 	QDF_NBUF_CB_TX_PACKET_TRACK(skb) = QDF_NBUF_TX_PKT_DATA_TRACK;
@@ -1273,7 +1273,7 @@ QDF_STATUS hdd_rx_packet_cbk(void *context, qdf_nbuf_t rxBuf)
 		}
 
 		hdd_event_eapol_log(skb, QDF_RX);
-		proto_pkt_logged = qdf_dp_trace_log_pkt(adapter->sessionId,
+		proto_pkt_logged = qdf_dp_trace_log_pkt(adapter->session_id,
 						skb, QDF_RX,
 						QDF_TRACE_DEFAULT_PDEV_ID);
 
@@ -1743,7 +1743,7 @@ int hdd_set_mon_rx_cb(struct net_device *dev)
 	hdd_monitor_set_rx_monitor_cb(&txrx_ops, hdd_rx_monitor_callback);
 	cdp_vdev_register(soc,
 		(struct cdp_vdev *)cdp_get_vdev_from_vdev_id(soc,
-		(struct cdp_pdev *)pdev, adapter->sessionId),
+		(struct cdp_pdev *)pdev, adapter->session_id),
 		adapter, &txrx_ops);
 	/* peer is created wma_vdev_attach->wma_create_peer */
 	qdf_status = cdp_peer_register(soc,

core/hdd/src/wlan_hdd_wmm.c

@@ -170,7 +170,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->sessionId,
+					   direction, psb, adapter->session_id,
 					   hdd_ctx->config->DelayedTriggerFrmInt);
 
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
@@ -209,7 +209,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->sessionId);
+						    acType, adapter->session_id);
 
 		if (!QDF_IS_STATUS_SUCCESS(status)) {
 			hdd_err("Failed to disable U-APSD for AC=%d", acType);
@@ -1164,7 +1164,7 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work)
 	    SME_QOS_WMM_TS_ACK_POLICY_HT_IMMEDIATE_BLOCK_ACK) {
 		if (!sme_qos_is_ts_info_ack_policy_valid
 			    ((tpAniSirGlobal) WLAN_HDD_GET_HAL_CTX(adapter), &qosInfo,
-			    adapter->sessionId)) {
+			    adapter->session_id)) {
 			qosInfo.ts_info.ack_policy =
 				SME_QOS_WMM_TS_ACK_POLICY_NORMAL_ACK;
 		}
@@ -1176,7 +1176,7 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work)
 
 #ifndef WLAN_MDM_CODE_REDUCTION_OPT
 	smeStatus = sme_qos_setup_req(WLAN_HDD_GET_HAL_CTX(adapter),
-				      adapter->sessionId,
+				      adapter->session_id,
 				      &qosInfo,
 				      hdd_wmm_sme_callback,
 				      pQosContext,
@@ -1835,7 +1835,7 @@ QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *adapter,
 						   hdd_ctx->config->InfraUapsdVoSrvIntv,
 						   hdd_ctx->config->InfraUapsdVoSuspIntv,
 						   SME_QOS_WMM_TS_DIR_BOTH, 1,
-						   adapter->sessionId,
+						   adapter->session_id,
 						   hdd_ctx->config->DelayedTriggerFrmInt);
 
 		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(status));
@@ -1849,7 +1849,7 @@ QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *adapter,
 						   hdd_ctx->config->InfraUapsdViSrvIntv,
 						   hdd_ctx->config->InfraUapsdViSuspIntv,
 						   SME_QOS_WMM_TS_DIR_BOTH, 1,
-						   adapter->sessionId,
+						   adapter->session_id,
 						   hdd_ctx->config->DelayedTriggerFrmInt);
 
 		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(status));
@@ -1863,7 +1863,7 @@ QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *adapter,
 						   hdd_ctx->config->InfraUapsdBkSrvIntv,
 						   hdd_ctx->config->InfraUapsdBkSuspIntv,
 						   SME_QOS_WMM_TS_DIR_BOTH, 1,
-						   adapter->sessionId,
+						   adapter->session_id,
 						   hdd_ctx->config->DelayedTriggerFrmInt);
 
 		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(status));
@@ -1877,7 +1877,7 @@ QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *adapter,
 						   hdd_ctx->config->InfraUapsdBeSrvIntv,
 						   hdd_ctx->config->InfraUapsdBeSuspIntv,
 						   SME_QOS_WMM_TS_DIR_BOTH, 1,
-						   adapter->sessionId,
+						   adapter->session_id,
 						   hdd_ctx->config->DelayedTriggerFrmInt);
 
 		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(status));
@@ -1885,7 +1885,7 @@ QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *adapter,
 
 	status = sme_update_dsc_pto_up_mapping(hdd_ctx->hHal,
 					       adapter->hddWmmDscpToUpMap,
-					       adapter->sessionId);
+					       adapter->session_id);
 
 	if (!QDF_IS_STATUS_SUCCESS(status))
 		hdd_wmm_init(adapter);
@@ -1962,7 +1962,7 @@ QDF_STATUS hdd_wmm_connect(struct hdd_adapter *adapter,
 			if (!roam_info->fReassocReq &&
 			    !sme_neighbor_roam_is11r_assoc(
 			    WLAN_HDD_GET_HAL_CTX(adapter),
-			    adapter->sessionId) &&
+			    adapter->session_id) &&
 			    !sme_roam_is_ese_assoc(roam_info)) {
 				adapter->hdd_wmm_status.wmmAcStatus[ac].
 					wmmAcTspecValid = false;
@@ -2185,7 +2185,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(struct hdd_adapter *adapter,
 
 #ifndef WLAN_MDM_CODE_REDUCTION_OPT
 	smeStatus = sme_qos_setup_req(WLAN_HDD_GET_HAL_CTX(adapter),
-				      adapter->sessionId,
+				      adapter->session_id,
 				      pTspec,
 				      hdd_wmm_sme_callback,
 				      pQosContext,
@@ -2291,7 +2291,7 @@ hdd_wlan_wmm_status_e hdd_wmm_delts(struct hdd_adapter *adapter,
 #ifndef WLAN_MDM_CODE_REDUCTION_OPT
 	smeStatus =
 		sme_qos_release_req(WLAN_HDD_GET_HAL_CTX(adapter),
-				    adapter->sessionId, qosFlowId);
+				    adapter->session_id, qosFlowId);
 
 	hdd_debug("SME flow %d released, SME status %d", qosFlowId, smeStatus);
 

core/hdd/src/wlan_hdd_wowl.c

@@ -109,7 +109,7 @@ bool hdd_add_wowl_ptrn(struct hdd_adapter *adapter, const char *ptrn)
 	QDF_STATUS qdf_ret_status;
 	const char *temp;
 	tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(adapter);
-	uint8_t sessionId = adapter->sessionId;
+	uint8_t sessionId = adapter->session_id;
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
 	len = find_ptrn_len(ptrn);
@@ -269,7 +269,7 @@ bool hdd_del_wowl_ptrn(struct hdd_adapter *adapter, const char *ptrn)
 	tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(adapter);
 	bool patternFound = false;
 	QDF_STATUS qdf_ret_status;
-	uint8_t sessionId = adapter->sessionId;
+	uint8_t sessionId = adapter->session_id;
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
 	/* Detect pattern */
@@ -320,7 +320,7 @@ bool hdd_add_wowl_ptrn_debugfs(struct hdd_adapter *adapter, uint8_t pattern_idx,
 	struct wow_add_pattern localPattern;
 	QDF_STATUS qdf_ret_status;
 	tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(adapter);
-	uint8_t session_id = adapter->sessionId;
+	uint8_t session_id = adapter->session_id;
 	uint16_t pattern_len, mask_len, i;
 
 	if (pattern_idx > (WOWL_MAX_PTRNS_ALLOWED - 1)) {
@@ -432,7 +432,7 @@ bool hdd_del_wowl_ptrn_debugfs(struct hdd_adapter *adapter,
 	struct wow_delete_pattern delPattern;
 	tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(adapter);
 	QDF_STATUS qdf_ret_status;
-	uint8_t sessionId = adapter->sessionId;
+	uint8_t sessionId = adapter->session_id;
 
 	if (pattern_idx > (WOWL_MAX_PTRNS_ALLOWED - 1)) {
 		hdd_err("WoW pattern index %d is not in the range (0 ~ %d).",
@@ -486,7 +486,7 @@ bool hdd_enter_wowl(struct hdd_adapter *adapter,
 
 	wowParams.ucPatternFilteringEnable = enable_pbm;
 	wowParams.ucMagicPktEnable = enable_mp;
-	wowParams.sessionId = adapter->sessionId;
+	wowParams.sessionId = adapter->session_id;
 	if (enable_mp) {
 		qdf_copy_macaddr(&wowParams.magic_ptrn,
 				 &adapter->mac_addr);
@@ -505,7 +505,7 @@ bool hdd_enter_wowl(struct hdd_adapter *adapter,
 					hdd_wowl_wake_indication_callback,
 					adapter,
 #endif /* WLAN_WAKEUP_EVENTS */
-					&wowParams, adapter->sessionId);
+					&wowParams, adapter->session_id);
 
 	if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) {
 		if (QDF_STATUS_PMC_PENDING != qdf_ret_status) {
@@ -530,7 +530,7 @@ bool hdd_exit_wowl(struct hdd_adapter *adapter)
 	tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(adapter);
 	QDF_STATUS qdf_ret_status;
 
-	wowParams.sessionId = adapter->sessionId;
+	wowParams.sessionId = adapter->session_id;
 
 	qdf_ret_status = sme_exit_wowl(hHal, &wowParams);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) {