qcacld-3.0: Rename hdd_adapter sessionCtx field

Per the Linux coding style "mixed-case names are frowned upon" so rename field sessionCtx in struct hdd_adapter. Change-Id: I726adb12694860a57e1c9a46071ed97dafdc46e9 CRs-Fixed: 2134952
2017-10-30 08:49:35 -07:00
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -690,10 +690,10 @@ enum bss_state {
 * @qdf_stop_bss_event: Event to synchronize Stop BSS. When Stop BSS
 *    is issued userspace thread can wait on this event. The event will
 *    be set when the Stop BSS processing in UMAC has completed.
- * @qdf_sta_disassoc_event: Event to synchronize STA
- *    Disassociation. When a STA is disassociated userspace thread can
- *    wait on this event. The event will * be set when the STA
- *    Disassociation processing in UMAC has completed.
+ * @qdf_sta_disassoc_event: Event to synchronize STA Disassociation.
+ *    When a STA is disassociated userspace thread can wait on this
+ *    event. The event will be set when the STA Disassociation
+ *    processing in UMAC has completed.
 * @qdf_status: Used to communicate state from other threads to the
 *    userspace thread.
 */
@@ -945,9 +945,9 @@ struct hdd_chan_change_params {

 /**
 * struct hdd_runtime_pm_context - context to prevent/allow runtime pm
- * @scan: scan context to prvent/allow runtime pm
+ * @dfs: dfs context to prevent/allow runtime pm
 *
- * Prevent Runtime PM for scan
+ * Runtime PM control for underlying activities
 */
 struct hdd_runtime_pm_context {
 	qdf_runtime_lock_t dfs;
@@ -1001,7 +1001,7 @@ struct hdd_context;
 struct hdd_adapter {
 	/* Magic cookie for adapter sanity verification.  Note that this
 	 * needs to be at the beginning of the private data structure so
-	 * that it will exists at the beginning of dev->priv and hence
+	 * that it will exist at the beginning of dev->priv and hence
 	 * will always be in mapped memory
 	 */
 	uint32_t magic;
@@ -1113,7 +1113,7 @@ struct hdd_adapter {
 	union {
 		struct hdd_station_ctx station;
 		struct hdd_ap_ctx ap;
-	} sessionCtx;
+	} session;

 #ifdef WLAN_FEATURE_TSF
 	/* tsf value received from firmware */
@@ -1231,20 +1231,20 @@ struct hdd_adapter {
 	struct rcpi_info rcpi;
 };

-#define WLAN_HDD_GET_STATION_CTX_PTR(adapter) (&(adapter)->sessionCtx.station)
-#define WLAN_HDD_GET_AP_CTX_PTR(adapter) (&(adapter)->sessionCtx.ap)
+#define WLAN_HDD_GET_STATION_CTX_PTR(adapter) (&(adapter)->session.station)
+#define WLAN_HDD_GET_AP_CTX_PTR(adapter) (&(adapter)->session.ap)
 #define WLAN_HDD_GET_WEXT_STATE_PTR(adapter) \
-				(&(adapter)->sessionCtx.station.wext_state)
+				(&(adapter)->session.station.wext_state)
 #define WLAN_HDD_GET_CTX(adapter) ((adapter)->hdd_ctx)
 #define WLAN_HDD_GET_HAL_CTX(adapter)  ((adapter)->hdd_ctx->hHal)
 #define WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter) \
-				(&(adapter)->sessionCtx.ap.hostapd_state)
-#define WLAN_HDD_GET_SAP_CTX_PTR(adapter) ((adapter)->sessionCtx.ap.sap_context)
+				(&(adapter)->session.ap.hostapd_state)
+#define WLAN_HDD_GET_SAP_CTX_PTR(adapter) ((adapter)->session.ap.sap_context)

 #ifdef WLAN_FEATURE_NAN_DATAPATH
 #ifndef WLAN_FEATURE_NAN_CONVERGENCE
 #define WLAN_HDD_GET_NDP_CTX_PTR(adapter) \
-		(&(adapter)->sessionCtx.station.ndp_ctx)
+		(&(adapter)->session.station.ndp_ctx)
 #endif /* WLAN_FEATURE_NAN_CONVERGENCE */
 #define WLAN_HDD_IS_NDP_ENABLED(hdd_ctx) ((hdd_ctx)->nan_datapath_enabled)
 #else
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -1544,9 +1544,9 @@ int wlan_hdd_sap_cfg_dfs_override(struct hdd_adapter *adapter)
 	if (!con_sap_adapter)
 		return 0;

-	sap_config = &adapter->sessionCtx.ap.sap_config;
-	con_sap_config = &con_sap_adapter->sessionCtx.ap.sap_config;
-	con_ch = con_sap_adapter->sessionCtx.ap.operating_channel;
+	sap_config = &adapter->session.ap.sap_config;
+	con_sap_config = &con_sap_adapter->session.ap.sap_config;
+	con_ch = con_sap_adapter->session.ap.operating_channel;

 	if (!wlan_reg_is_dfs_ch(hdd_ctx->hdd_pdev, con_ch))
 		return 0;
@@ -1817,7 +1817,7 @@ int wlan_hdd_cfg80211_start_acs(struct hdd_adapter *adapter)
 		return -EINVAL;
 	}
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	sap_config = &adapter->sessionCtx.ap.sap_config;
+	sap_config = &adapter->session.ap.sap_config;
 	if (hdd_ctx->acs_policy.acs_channel)
 		sap_config->channel = hdd_ctx->acs_policy.acs_channel;
 	else
@@ -1972,7 +1972,7 @@ static int hdd_update_reg_chan_info(struct hdd_adapter *adapter,
 	struct ch_params ch_params = {0};
 	uint8_t bw_offset = 0, chan = 0;
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	tsap_Config_t *sap_config = &adapter->sessionCtx.ap.sap_config;
+	tsap_Config_t *sap_config = &adapter->session.ap.sap_config;

 	/* memory allocation */
 	sap_config->channel_info = qdf_mem_malloc(
@@ -2242,7 +2242,7 @@ int hdd_cfg80211_update_acs_config(struct hdd_adapter *adapter,
 	}

 	ENTER();
-	sap_config = &adapter->sessionCtx.ap.sap_config;
+	sap_config = &adapter->session.ap.sap_config;
 	/* When first 2 connections are on the same frequency band,
 	 * then PCL would include only channels from the other
 	 * frequency band on which no connections are active
@@ -2270,7 +2270,7 @@ int hdd_cfg80211_update_acs_config(struct hdd_adapter *adapter,
 		}
 	}

-	hdd_get_scan_band(hdd_ctx, &adapter->sessionCtx.ap.sap_config, &band);
+	hdd_get_scan_band(hdd_ctx, &adapter->session.ap.sap_config, &band);

 	if (sap_config->acs_cfg.ch_list) {
 		/* Copy INI or hostapd provided ACS channel range*/
@@ -2288,7 +2288,7 @@ int hdd_cfg80211_update_acs_config(struct hdd_adapter *adapter,
 	hdd_update_reg_chan_info(adapter, channel_count, channel_list);
 	hdd_get_freq_list(channel_list, freq_list, channel_count);
 	/* Get phymode */
-	phy_mode = adapter->sessionCtx.ap.sap_config.acs_cfg.hw_mode;
+	phy_mode = adapter->session.ap.sap_config.acs_cfg.hw_mode;

 	skb = cfg80211_vendor_event_alloc(hdd_ctx->wiphy,
 			&(adapter->wdev),
@@ -2404,7 +2404,7 @@ static int hdd_create_acs_timer(struct hdd_adapter *adapter)
 	struct hdd_external_acs_timer_context *timer_context;
 	QDF_STATUS status;

-	if (adapter->sessionCtx.ap.vendor_acs_timer_initialized)
+	if (adapter->session.ap.vendor_acs_timer_initialized)
 		return 0;

 	hdd_debug("Starting vendor app based ACS");
@@ -2416,14 +2416,14 @@ static int hdd_create_acs_timer(struct hdd_adapter *adapter)
 	timer_context->adapter = adapter;

 	set_bit(VENDOR_ACS_RESPONSE_PENDING, &adapter->event_flags);
-	status = qdf_mc_timer_init(&adapter->sessionCtx.ap.vendor_acs_timer,
+	status = qdf_mc_timer_init(&adapter->session.ap.vendor_acs_timer,
 		  QDF_TIMER_TYPE_SW,
 		  hdd_acs_response_timeout_handler, timer_context);
 	if (status != QDF_STATUS_SUCCESS) {
 		hdd_err("Failed to initialize acs response timeout timer");
 		return -EFAULT;
 	}
-	adapter->sessionCtx.ap.vendor_acs_timer_initialized = true;
+	adapter->session.ap.vendor_acs_timer_initialized = true;
 	return 0;
 }

@@ -2525,7 +2525,7 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
 		goto out;
 	}

-	sap_config = &adapter->sessionCtx.ap.sap_config;
+	sap_config = &adapter->session.ap.sap_config;
 	qdf_mem_zero(&sap_config->acs_cfg, sizeof(struct sap_acs_cfg));

 	status = hdd_nla_parse(tb, QCA_WLAN_VENDOR_ATTR_ACS_MAX, data, data_len,
@@ -2793,9 +2793,9 @@ void wlan_hdd_undo_acs(struct hdd_adapter *adapter)
 {
 	if (adapter == NULL)
 		return;
-	if (adapter->sessionCtx.ap.sap_config.acs_cfg.ch_list) {
-		qdf_mem_free(adapter->sessionCtx.ap.sap_config.acs_cfg.ch_list);
-		adapter->sessionCtx.ap.sap_config.acs_cfg.ch_list = NULL;
+	if (adapter->session.ap.sap_config.acs_cfg.ch_list) {
+		qdf_mem_free(adapter->session.ap.sap_config.acs_cfg.ch_list);
+		adapter->session.ap.sap_config.acs_cfg.ch_list = NULL;
 	}
 }

@@ -9268,7 +9268,7 @@ int wlan_hdd_sap_get_valid_channellist(struct hdd_adapter *adapter,
 	uint8_t i;
 	QDF_STATUS status;

-	sap_config = &adapter->sessionCtx.ap.sap_config;
+	sap_config = &adapter->session.ap.sap_config;

 	status =
 		policy_mgr_get_valid_chans(hdd_ctx->hdd_psoc,
@@ -9515,31 +9515,31 @@ int wlan_hdd_request_pre_cac(uint8_t channel)
 	 * other active SAP interface. In regular scenarios, these IEs would
 	 * come from the user space entity
 	 */
-	pre_cac_adapter->sessionCtx.ap.beacon = qdf_mem_malloc(
-			sizeof(*ap_adapter->sessionCtx.ap.beacon));
-	if (!pre_cac_adapter->sessionCtx.ap.beacon) {
+	pre_cac_adapter->session.ap.beacon = qdf_mem_malloc(
+			sizeof(*ap_adapter->session.ap.beacon));
+	if (!pre_cac_adapter->session.ap.beacon) {
 		hdd_err("failed to alloc mem for beacon");
 		goto stop_close_pre_cac_adapter;
 	}
-	qdf_mem_copy(pre_cac_adapter->sessionCtx.ap.beacon,
-			ap_adapter->sessionCtx.ap.beacon,
-			sizeof(*pre_cac_adapter->sessionCtx.ap.beacon));
-	pre_cac_adapter->sessionCtx.ap.sap_config.ch_width_orig =
-			ap_adapter->sessionCtx.ap.sap_config.ch_width_orig;
-	pre_cac_adapter->sessionCtx.ap.sap_config.authType =
-			ap_adapter->sessionCtx.ap.sap_config.authType;
+	qdf_mem_copy(pre_cac_adapter->session.ap.beacon,
+			ap_adapter->session.ap.beacon,
+			sizeof(*pre_cac_adapter->session.ap.beacon));
+	pre_cac_adapter->session.ap.sap_config.ch_width_orig =
+			ap_adapter->session.ap.sap_config.ch_width_orig;
+	pre_cac_adapter->session.ap.sap_config.authType =
+			ap_adapter->session.ap.sap_config.authType;

 	/* Premise is that on moving from 2.4GHz to 5GHz, the SAP will continue
 	 * to operate on the same bandwidth as that of the 2.4GHz operations.
 	 * Only bandwidths 20MHz/40MHz are possible on 2.4GHz band.
 	 */
-	switch (ap_adapter->sessionCtx.ap.sap_config.ch_width_orig) {
+	switch (ap_adapter->session.ap.sap_config.ch_width_orig) {
 	case CH_WIDTH_20MHZ:
 		channel_type = NL80211_CHAN_HT20;
 		break;
 	case CH_WIDTH_40MHZ:
-		if (ap_adapter->sessionCtx.ap.sap_config.sec_ch >
-				ap_adapter->sessionCtx.ap.sap_config.channel)
+		if (ap_adapter->session.ap.sap_config.sec_ch >
+				ap_adapter->session.ap.sap_config.channel)
 			channel_type = NL80211_CHAN_HT40PLUS;
 		else
 			channel_type = NL80211_CHAN_HT40MINUS;
@@ -9559,7 +9559,7 @@ int wlan_hdd_request_pre_cac(uint8_t channel)
 	cfg80211_chandef_create(&chandef, chan, channel_type);

 	hdd_debug("orig width:%d channel_type:%d freq:%d",
-		ap_adapter->sessionCtx.ap.sap_config.ch_width_orig,
+		ap_adapter->session.ap.sap_config.ch_width_orig,
 		channel_type, freq);
 	/*
 	 * Doing update after opening and starting pre-cac adapter will make
@@ -9617,8 +9617,8 @@ int wlan_hdd_request_pre_cac(uint8_t channel)

 stop_close_pre_cac_adapter:
 	hdd_stop_adapter(hdd_ctx, pre_cac_adapter, true);
-	qdf_mem_free(pre_cac_adapter->sessionCtx.ap.beacon);
-	pre_cac_adapter->sessionCtx.ap.beacon = NULL;
+	qdf_mem_free(pre_cac_adapter->session.ap.beacon);
+	pre_cac_adapter->session.ap.beacon = NULL;
 close_pre_cac_adapter:
 	hdd_close_adapter(hdd_ctx, pre_cac_adapter, false);
 release_intf_addr_and_return_failure:
@@ -9801,7 +9801,7 @@ uint8_t hdd_get_sap_operating_band(struct hdd_context *hdd_ctx)
 			adapter_node = next;
 			continue;
 		}
-		operating_channel = adapter->sessionCtx.ap.operating_channel;
+		operating_channel = adapter->session.ap.operating_channel;
 		if (IS_24G_CH(operating_channel))
 			sap_operating_band = eCSR_BAND_24;
 		else if (IS_5G_CH(operating_channel))
@@ -10630,12 +10630,12 @@ static int hdd_update_acs_channel(struct hdd_adapter *adapter, uint8_t reason,
 	QDF_STATUS status = QDF_STATUS_SUCCESS;

 	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
-	sap_config = &adapter->sessionCtx.ap.sap_config;
+	sap_config = &adapter->session.ap.sap_config;

 	if (QDF_TIMER_STATE_RUNNING ==
-	    qdf_mc_timer_get_current_state(&adapter->sessionCtx.
+	    qdf_mc_timer_get_current_state(&adapter->session.
 					ap.vendor_acs_timer)) {
-		qdf_mc_timer_stop(&adapter->sessionCtx.ap.vendor_acs_timer);
+		qdf_mc_timer_stop(&adapter->session.ap.vendor_acs_timer);
 	}

 	if (channel_list && channel_list->pri_ch == 0) {
@@ -13749,12 +13749,12 @@ static int __wlan_hdd_cfg80211_change_bss(struct wiphy *wiphy,
 	 * want to update this parameter
 	 */
 	if (-1 != params->ap_isolate) {
-		adapter->sessionCtx.ap.disable_intrabss_fwd =
+		adapter->session.ap.disable_intrabss_fwd =
 			!!params->ap_isolate;

 		qdf_ret_status = sme_ap_disable_intra_bss_fwd(hdd_ctx->hHal,
 							      adapter->sessionId,
-							      adapter->sessionCtx.
+							      adapter->session.
 							      ap.
 							      disable_intrabss_fwd);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status))
@@ -13808,7 +13808,7 @@ static int wlan_hdd_change_client_iface_to_new_mode(struct net_device *ndev,
 			(type == NL80211_IFTYPE_STATION) ?
 			QDF_STA_MODE : QDF_P2P_CLIENT_MODE;
 	}
-	memset(&adapter->sessionCtx, 0, sizeof(adapter->sessionCtx));
+	memset(&adapter->session, 0, sizeof(adapter->session));
 	hdd_set_station_ops(adapter->dev);
 	wext = WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
 	wext->roamProfile.pAddIEScan = adapter->scan_info.scan_add_ie.addIEdata;
@@ -13961,8 +13961,8 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy,
 			hdd_stop_adapter(hdd_ctx, adapter, true);
 			/* De-init the adapter */
 			hdd_deinit_adapter(hdd_ctx, adapter, true);
-			memset(&adapter->sessionCtx, 0,
-			       sizeof(adapter->sessionCtx));
+			memset(&adapter->session, 0,
+			       sizeof(adapter->session));
 			adapter->device_mode =
 				(type ==
 				 NL80211_IFTYPE_AP) ? QDF_SAP_MODE :
@@ -14383,7 +14383,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 	}
 	if ((QDF_IBSS_MODE == adapter->device_mode) && !pairwise) {
 		/* if a key is already installed, block all subsequent ones */
-		if (adapter->sessionCtx.station.ibss_enc_key_installed) {
+		if (adapter->session.station.ibss_enc_key_installed) {
 			hdd_debug("IBSS key installed already");
 			return 0;
 		}
@@ -14400,10 +14400,10 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 		/* Save the keys here and call sme_roam_set_key for setting
 		 * the PTK after peer joins the IBSS network
 		 */
-		qdf_mem_copy(&adapter->sessionCtx.station.ibss_enc_key,
+		qdf_mem_copy(&adapter->session.station.ibss_enc_key,
 			     &setKey, sizeof(tCsrRoamSetKey));

-		adapter->sessionCtx.station.ibss_enc_key_installed = 1;
+		adapter->session.station.ibss_enc_key_installed = 1;
 		return status;
 	}
 	if ((adapter->device_mode == QDF_SAP_MODE) ||
@@ -19363,7 +19363,7 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy,
 			 TRACE_CODE_HDD_CFG80211_SET_MAC_ACL,
 			 adapter->sessionId, adapter->device_mode));
 	if (QDF_SAP_MODE == adapter->device_mode) {
-		pConfig = &adapter->sessionCtx.ap.sap_config;
+		pConfig = &adapter->session.ap.sap_config;

 		/* default value */
 		pConfig->num_accept_mac = 0;
--- a/core/hdd/src/wlan_hdd_hostapd.c
+++ b/core/hdd/src/wlan_hdd_hostapd.c
@@ -234,7 +234,7 @@ hdd_hostapd_init_sap_session(struct hdd_adapter *adapter,
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);

 	if (reinit)
-		sap_ctx = adapter->sessionCtx.ap.sap_context;
+		sap_ctx = adapter->session.ap.sap_context;
 	else
 		sap_ctx = wlansap_open();

@@ -256,7 +256,7 @@ hdd_hostapd_init_sap_session(struct hdd_adapter *adapter,
 			       adapter->sessionId);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		hdd_err("wlansap_start failed!! status: %d", status);
-		adapter->sessionCtx.ap.sap_context = NULL;
+		adapter->session.ap.sap_context = NULL;

 		/*
 		 * In this case, we need to cleanup in the same order as create.
@@ -303,7 +303,7 @@ int hdd_hostapd_deinit_sap_session(struct hdd_adapter *adapter)
 		hdd_err("Error closing the sap session");
 		status = -EINVAL;
 	}
-	adapter->sessionCtx.ap.sap_context = NULL;
+	adapter->session.ap.sap_context = NULL;

 	if (!wlan_hdd_validate_session_id(adapter->sessionId)) {
 		if (hdd_objmgr_release_vdev(adapter)) {
@@ -1898,7 +1898,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 	{
 		int i;
 		tsap_Config_t *sap_config =
-				&adapter->sessionCtx.ap.sap_config;
+				&adapter->session.ap.sap_config;

 		hdd_dfs_indicate_radar(hdd_ctx);
 		wlan_hdd_send_svc_nlink_msg(hdd_ctx->radio_index,
@@ -3520,7 +3520,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	{
 		uint8_t preamble = 0, nss = 0, rix = 0;
 		tsap_Config_t *pConfig =
-			&adapter->sessionCtx.ap.sap_config;
+			&adapter->session.ap.sap_config;

 		hdd_debug("SET_HT_RATE val %d", set_value);

@@ -3583,7 +3583,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	{
 		uint8_t preamble = 0, nss = 0, rix = 0;
 		tsap_Config_t *pConfig =
-			&adapter->sessionCtx.ap.sap_config;
+			&adapter->session.ap.sap_config;

 		if (pConfig->SapHw_mode != eCSR_DOT11_MODE_11ac &&
 		    pConfig->SapHw_mode != eCSR_DOT11_MODE_11ac_ONLY) {
@@ -3900,7 +3900,7 @@ static __iw_softap_setparam(struct net_device *dev,
 		break;
 	case QCASAP_SET_11AX_RATE:
 		ret = hdd_set_11ax_rate(adapter, set_value,
-					&adapter->sessionCtx.ap.
+					&adapter->session.ap.
 					sap_config);
 		break;
 	case QCASAP_SET_PEER_RATE:
@@ -6163,9 +6163,9 @@ QDF_STATUS hdd_init_ap_mode(struct hdd_adapter *adapter, bool reinit)

 	hdd_info("SSR in progress: %d", reinit);

-	if (adapter->sessionCtx.ap.sap_context) {
+	if (adapter->session.ap.sap_context) {
 		hdd_debug("sap context is not NULL, %pK",
-			  adapter->sessionCtx.ap.sap_context);
+			  adapter->session.ap.sap_context);
 		return QDF_STATUS_SUCCESS;
 	}

@@ -6175,11 +6175,11 @@ QDF_STATUS hdd_init_ap_mode(struct hdd_adapter *adapter, bool reinit)
 		return QDF_STATUS_E_FAULT;
 	}
 	if (!reinit) {
-		adapter->sessionCtx.ap.sap_context = sapContext;
-		adapter->sessionCtx.ap.sap_config.channel =
+		adapter->session.ap.sap_context = sapContext;
+		adapter->session.ap.sap_config.channel =
 			hdd_ctx->acs_policy.acs_channel;
 		acs_dfs_mode = hdd_ctx->acs_policy.acs_dfs_mode;
-		adapter->sessionCtx.ap.sap_config.acs_dfs_mode =
+		adapter->session.ap.sap_config.acs_dfs_mode =
 			wlan_hdd_get_dfs_mode(acs_dfs_mode);
 	}

@@ -6247,9 +6247,9 @@ QDF_STATUS hdd_init_ap_mode(struct hdd_adapter *adapter, bool reinit)
 		hdd_err("WMI_PDEV_PARAM_BURST_ENABLE set failed: %d", ret);

 	if (!reinit) {
-		adapter->sessionCtx.ap.sap_config.acs_cfg.acs_mode = false;
-		qdf_mem_free(adapter->sessionCtx.ap.sap_config.acs_cfg.ch_list);
-		qdf_mem_zero(&adapter->sessionCtx.ap.sap_config.acs_cfg,
+		adapter->session.ap.sap_config.acs_cfg.acs_mode = false;
+		qdf_mem_free(adapter->session.ap.sap_config.acs_cfg.ch_list);
+		qdf_mem_zero(&adapter->session.ap.sap_config.acs_cfg,
 			     sizeof(struct sap_acs_cfg));
 	}

@@ -6422,7 +6422,7 @@ static bool wlan_hdd_get_sap_obss(struct hdd_adapter *adapter)
 	uint8_t ht_cap_ie[DOT11F_IE_HTCAPS_MAX_LEN];
 	tDot11fIEHTCaps dot11_ht_cap_ie = {0};
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	struct hdd_beacon_data *beacon = adapter->sessionCtx.ap.beacon;
+	struct hdd_beacon_data *beacon = adapter->session.ap.beacon;
 	const uint8_t *ie = NULL;

 	ie = wlan_get_ie_ptr_from_eid(WLAN_EID_HT_CAPABILITY,
@@ -6684,7 +6684,7 @@ static int wlan_hdd_add_extn_ie(struct hdd_adapter *adapter, uint8_t *genie,
 {
 	const uint8_t *ie;
 	uint16_t ielen = 0;
-	struct hdd_beacon_data *beacon = adapter->sessionCtx.ap.beacon;
+	struct hdd_beacon_data *beacon = adapter->session.ap.beacon;

 	ie = wlan_get_ext_ie_ptr_from_ext_id(oui, oui_size,
 					      beacon->tail,
@@ -6715,7 +6715,7 @@ static void wlan_hdd_add_hostapd_conf_vsie(struct hdd_adapter *adapter,
 					   uint8_t *genie,
 					   uint16_t *total_ielen)
 {
-	struct hdd_beacon_data *pBeacon = adapter->sessionCtx.ap.beacon;
+	struct hdd_beacon_data *pBeacon = adapter->session.ap.beacon;
 	int left = pBeacon->tail_len;
 	uint8_t *ptr = pBeacon->tail;
 	uint8_t elem_id, elem_len;
@@ -6783,7 +6783,7 @@ static void wlan_hdd_add_extra_ie(struct hdd_adapter *adapter,
 				  uint8_t *genie, uint16_t *total_ielen,
 				  uint8_t temp_ie_id)
 {
-	struct hdd_beacon_data *pBeacon = adapter->sessionCtx.ap.beacon;
+	struct hdd_beacon_data *pBeacon = adapter->session.ap.beacon;
 	int left = pBeacon->tail_len;
 	uint8_t *ptr = pBeacon->tail;
 	uint8_t elem_id, elem_len;
@@ -6845,7 +6845,7 @@ wlan_hdd_cfg80211_alloc_new_beacon(struct hdd_adapter *adapter,
 		return -EINVAL;
 	}

-	old = adapter->sessionCtx.ap.beacon;
+	old = adapter->session.ap.beacon;

 	if (!params->head && !old) {
 		hdd_err("session: %d old and new heads points to NULL",
@@ -6923,7 +6923,7 @@ wlan_hdd_cfg80211_alloc_new_beacon(struct hdd_adapter *adapter,

 	*ppBeacon = beacon;

-	adapter->sessionCtx.ap.beacon = NULL;
+	adapter->session.ap.beacon = NULL;
 	qdf_mem_free(old);

 	return 0;
@@ -6999,8 +6999,8 @@ int wlan_hdd_cfg80211_update_apies(struct hdd_adapter *adapter)
 	uint16_t proberesp_ies_len;
 	uint8_t *proberesp_ies = NULL;

-	pConfig = &adapter->sessionCtx.ap.sap_config;
-	beacon = adapter->sessionCtx.ap.beacon;
+	pConfig = &adapter->session.ap.sap_config;
+	beacon = adapter->session.ap.beacon;

 	genie = qdf_mem_malloc(MAX_GENIE_LEN);

@@ -7130,8 +7130,8 @@ done:
 */
 static void wlan_hdd_set_sap_hwmode(struct hdd_adapter *adapter)
 {
-	tsap_Config_t *pConfig = &adapter->sessionCtx.ap.sap_config;
-	struct hdd_beacon_data *pBeacon = adapter->sessionCtx.ap.beacon;
+	tsap_Config_t *pConfig = &adapter->session.ap.sap_config;
+	struct hdd_beacon_data *pBeacon = adapter->session.ap.beacon;
 	struct ieee80211_mgmt *pMgmt_frame =
 		(struct ieee80211_mgmt *)pBeacon->head;
 	u8 checkRatesfor11g = true;
@@ -7198,7 +7198,7 @@ QDF_STATUS wlan_hdd_config_acs(struct hdd_context *hdd_ctx, struct hdd_adapter *
 	tHalHandle hal;

 	hal = WLAN_HDD_GET_HAL_CTX(adapter);
-	sap_config = &adapter->sessionCtx.ap.sap_config;
+	sap_config = &adapter->session.ap.sap_config;
 	ini_config = hdd_ctx->config;

 	sap_config->enOverLapCh = !!hdd_ctx->config->gEnableOverLapCh;
@@ -7214,7 +7214,7 @@ QDF_STATUS wlan_hdd_config_acs(struct hdd_context *hdd_ctx, struct hdd_adapter *

 		if (con_sap_adapter)
 			con_sap_config =
-				&con_sap_adapter->sessionCtx.ap.sap_config;
+				&con_sap_adapter->session.ap.sap_config;

 		sap_config->acs_cfg.skip_scan_status = eSAP_DO_NEW_ACS_SCAN;

@@ -7325,7 +7325,7 @@ QDF_STATUS wlan_hdd_config_acs(struct hdd_context *hdd_ctx, struct hdd_adapter *
 */
 static int wlan_hdd_sap_p2p_11ac_overrides(struct hdd_adapter *ap_adapter)
 {
-	tsap_Config_t *sap_cfg = &ap_adapter->sessionCtx.ap.sap_config;
+	tsap_Config_t *sap_cfg = &ap_adapter->session.ap.sap_config;
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(ap_adapter);

 	/* Fixed channel 11AC override:
@@ -7396,7 +7396,7 @@ static int wlan_hdd_sap_p2p_11ac_overrides(struct hdd_adapter *ap_adapter)
 */
 static int wlan_hdd_setup_acs_overrides(struct hdd_adapter *ap_adapter)
 {
-	tsap_Config_t *sap_cfg = &ap_adapter->sessionCtx.ap.sap_config;
+	tsap_Config_t *sap_cfg = &ap_adapter->session.ap.sap_config;
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(ap_adapter);

 	hdd_debug("** Driver force ACS override **");
@@ -7571,9 +7571,9 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 	clear_bit(ACS_PENDING, &adapter->event_flags);
 	clear_bit(ACS_IN_PROGRESS, &hdd_ctx->g_event_flags);

-	pConfig = &adapter->sessionCtx.ap.sap_config;
+	pConfig = &adapter->session.ap.sap_config;

-	pBeacon = adapter->sessionCtx.ap.beacon;
+	pBeacon = adapter->session.ap.beacon;

 	pMgmt_frame = (struct ieee80211_mgmt *)pBeacon->head;

@@ -8133,10 +8133,10 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,

 error:
 	clear_bit(SOFTAP_INIT_DONE, &adapter->event_flags);
-	if (adapter->sessionCtx.ap.sap_config.acs_cfg.ch_list) {
-		qdf_mem_free(adapter->sessionCtx.ap.sap_config.
+	if (adapter->session.ap.sap_config.acs_cfg.ch_list) {
+		qdf_mem_free(adapter->session.ap.sap_config.
 			acs_cfg.ch_list);
-		adapter->sessionCtx.ap.sap_config.acs_cfg.ch_list = NULL;
+		adapter->session.ap.sap_config.acs_cfg.ch_list = NULL;
 	}

 free:
@@ -8148,24 +8148,24 @@ int hdd_destroy_acs_timer(struct hdd_adapter *adapter)
 {
 	QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;

-	if (!adapter->sessionCtx.ap.vendor_acs_timer_initialized)
+	if (!adapter->session.ap.vendor_acs_timer_initialized)
 		return 0;

-	adapter->sessionCtx.ap.vendor_acs_timer_initialized = false;
+	adapter->session.ap.vendor_acs_timer_initialized = false;

 	if (QDF_TIMER_STATE_RUNNING ==
-			adapter->sessionCtx.ap.vendor_acs_timer.state) {
+			adapter->session.ap.vendor_acs_timer.state) {
 		qdf_status =
-			qdf_mc_timer_stop(&adapter->sessionCtx.ap.
+			qdf_mc_timer_stop(&adapter->session.ap.
 					vendor_acs_timer);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
 			hdd_err("Failed to stop ACS timer");
 	}

-	if (adapter->sessionCtx.ap.vendor_acs_timer.user_data)
-		qdf_mem_free(adapter->sessionCtx.ap.vendor_acs_timer.user_data);
+	if (adapter->session.ap.vendor_acs_timer.user_data)
+		qdf_mem_free(adapter->session.ap.vendor_acs_timer.user_data);

-	qdf_mc_timer_destroy(&adapter->sessionCtx.ap.vendor_acs_timer);
+	qdf_mc_timer_destroy(&adapter->session.ap.vendor_acs_timer);

 	return 0;
 }
@@ -8271,16 +8271,16 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 		hdd_ctx->is_sap_restart_required = false;
 		qdf_spin_unlock(&hdd_ctx->sap_update_info_lock);
 	}
-	adapter->sessionCtx.ap.sap_config.acs_cfg.acs_mode = false;
+	adapter->session.ap.sap_config.acs_cfg.acs_mode = false;
 	wlan_hdd_undo_acs(adapter);
-	qdf_mem_zero(&adapter->sessionCtx.ap.sap_config.acs_cfg,
+	qdf_mem_zero(&adapter->session.ap.sap_config.acs_cfg,
 						sizeof(struct sap_acs_cfg));
 	hdd_debug("Disabling queues");
 	wlan_hdd_netif_queue_control(adapter,
 				     WLAN_STOP_ALL_NETIF_QUEUE_N_CARRIER,
 				     WLAN_CONTROL_PATH);

-	old = adapter->sessionCtx.ap.beacon;
+	old = adapter->session.ap.beacon;
 	if (!old) {
 		hdd_err("Session id: %d beacon data points to NULL",
 		       adapter->sessionId);
@@ -8310,7 +8310,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 		policy_mgr_decr_session_set_pcl(hdd_ctx->hdd_psoc,
 						adapter->device_mode,
 						adapter->sessionId);
-		adapter->sessionCtx.ap.beacon = NULL;
+		adapter->session.ap.beacon = NULL;
 		qdf_mem_free(old);
 	}
 	mutex_unlock(&hdd_ctx->sap_lock);
@@ -8463,12 +8463,12 @@ static void hdd_update_beacon_rate(struct hdd_adapter *adapter,
 	band = params->chandef.chan->band;
 	beacon_rate_mask = &params->beacon_rate;
 	if (beacon_rate_mask->control[band].legacy) {
-		adapter->sessionCtx.ap.sap_config.beacon_tx_rate =
+		adapter->session.ap.sap_config.beacon_tx_rate =
 			hdd_get_data_rate_from_rate_mask(wiphy, band,
 					beacon_rate_mask);
 		hdd_debug("beacon mask value %u, rate %hu",
 			  params->beacon_rate.control[0].legacy,
-			  adapter->sessionCtx.ap.sap_config.beacon_tx_rate);
+			  adapter->session.ap.sap_config.beacon_tx_rate);
 	}
 }
 #else
@@ -8546,7 +8546,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 	if (cds_is_sub_20_mhz_enabled()) {
 		enum channel_state ch_state;
 		enum phy_ch_width sub_20_ch_width = CH_WIDTH_INVALID;
-		tsap_Config_t *sap_cfg = &adapter->sessionCtx.ap.sap_config;
+		tsap_Config_t *sap_cfg = &adapter->session.ap.sap_config;

 		/* Avoid ACS/DFS, and overwrite ch wd to 20 */
 		if (channel == 0) {
@@ -8634,7 +8634,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 		tsap_Config_t *sap_config =
 			&((WLAN_HDD_GET_AP_CTX_PTR(adapter))->sap_config);

-		old = adapter->sessionCtx.ap.beacon;
+		old = adapter->session.ap.beacon;

 		if (old)
 			return -EALREADY;
@@ -8648,7 +8648,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 			hdd_err("Error!!! Allocating the new beacon");
 			return -EINVAL;
 		}
-		adapter->sessionCtx.ap.beacon = new;
+		adapter->session.ap.beacon = new;

 		if (params->chandef.width < NL80211_CHAN_WIDTH_80)
 			channel_type = cfg80211_get_chandef_type(
@@ -8666,18 +8666,18 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 		/* set authentication type */
 		switch (params->auth_type) {
 		case NL80211_AUTHTYPE_OPEN_SYSTEM:
-			adapter->sessionCtx.ap.sap_config.authType =
+			adapter->session.ap.sap_config.authType =
 				eSAP_OPEN_SYSTEM;
 			break;
 		case NL80211_AUTHTYPE_SHARED_KEY:
-			adapter->sessionCtx.ap.sap_config.authType =
+			adapter->session.ap.sap_config.authType =
 				eSAP_SHARED_KEY;
 			break;
 		default:
-			adapter->sessionCtx.ap.sap_config.authType =
+			adapter->session.ap.sap_config.authType =
 				eSAP_AUTO_SWITCH;
 		}
-		adapter->sessionCtx.ap.sap_config.ch_width_orig =
+		adapter->session.ap.sap_config.ch_width_orig =
 						params->chandef.width;
 		status =
 			wlan_hdd_cfg80211_start_bss(adapter,
@@ -8718,9 +8718,9 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 	goto success;

 err_start_bss:
-	if (adapter->sessionCtx.ap.beacon)
-		qdf_mem_free(adapter->sessionCtx.ap.beacon);
-	adapter->sessionCtx.ap.beacon = NULL;
+	if (adapter->session.ap.beacon)
+		qdf_mem_free(adapter->session.ap.beacon);
+	adapter->session.ap.beacon = NULL;

 success:
 	EXIT();
@@ -8795,7 +8795,7 @@ static int __wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy,
 		return -EOPNOTSUPP;
 	}

-	old = adapter->sessionCtx.ap.beacon;
+	old = adapter->session.ap.beacon;

 	if (!old) {
 		hdd_err("session id: %d beacon data points to NULL",
@@ -8810,7 +8810,7 @@ static int __wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy,
 		return -EINVAL;
 	}

-	adapter->sessionCtx.ap.beacon = new;
+	adapter->session.ap.beacon = new;
 	hdd_debug("update beacon for P2P GO/SAP");
 	status = wlan_hdd_cfg80211_start_bss(adapter, params, NULL,
 					0, 0, false);
--- a/core/hdd/src/wlan_hdd_ipa.c
+++ b/core/hdd/src/wlan_hdd_ipa.c
@@ -4337,7 +4337,7 @@ static void __hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt,
 		/* Disable to forward Intra-BSS Rx packets when
 		 * ap_isolate=1 in hostapd.conf
 		 */
-		if (!adapter->sessionCtx.ap.disable_intrabss_fwd) {
+		if (!adapter->session.ap.disable_intrabss_fwd) {
 			/*
 			 * When INTRA_BSS_FWD_OFFLOAD is enabled, FW will send
 			 * all Rx packets to IPA uC, which need to be forwarded
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -3143,7 +3143,7 @@ static struct hdd_adapter *hdd_alloc_station_adapter(struct hdd_context *hdd_ctx
 		adapter = (struct hdd_adapter *) netdev_priv(pWlanDev);

 		qdf_mem_zero(adapter, sizeof(struct hdd_adapter));
-		sta_ctx = &adapter->sessionCtx.station;
+		sta_ctx = &adapter->session.station;
 		qdf_mem_set(sta_ctx->conn_info.staId,
 			sizeof(sta_ctx->conn_info.staId),
 			HDD_WLAN_INVALID_STA_ID);
@@ -3437,7 +3437,7 @@ hdd_vdev_destroy_procedure:

 QDF_STATUS hdd_init_station_mode(struct hdd_adapter *adapter)
 {
-	struct hdd_station_ctx *sta_ctx = &adapter->sessionCtx.station;
+	struct hdd_station_ctx *sta_ctx = &adapter->session.station;
 	struct hdd_context *hdd_ctx;
 	QDF_STATUS status;
 	int ret_val;
@@ -4449,8 +4449,8 @@ QDF_STATUS hdd_stop_adapter(struct hdd_context *hdd_ctx, struct hdd_adapter *ada
 			/* Reset WNI_CFG_PROBE_RSP Flags */
 			wlan_hdd_reset_prob_rspies(adapter);
 		}
-		qdf_mem_free(adapter->sessionCtx.ap.beacon);
-		adapter->sessionCtx.ap.beacon = NULL;
+		qdf_mem_free(adapter->session.ap.beacon);
+		adapter->session.ap.beacon = NULL;
 		/*
 		 * If Do_Not_Break_Stream was enabled clear avoid channel list.
 		 */
@@ -4576,7 +4576,7 @@ QDF_STATUS hdd_reset_all_adapters(struct hdd_context *hdd_ctx)
 					   WLAN_CONTROL_PATH);
 		}

-		adapter->sessionCtx.station.hdd_reassoc_scenario = false;
+		adapter->session.station.hdd_reassoc_scenario = false;

 		hdd_deinit_tx_rx(adapter);
 		policy_mgr_decr_session_set_pcl(hdd_ctx->hdd_psoc,
@@ -5199,7 +5199,7 @@ QDF_STATUS hdd_start_all_adapters(struct hdd_context *hdd_ctx)
 				memset(wrqu.ap_addr.sa_data, '\0', ETH_ALEN);
 				wireless_send_event(adapter->dev, SIOCGIWAP,
 						    &wrqu, NULL);
-				adapter->sessionCtx.station.
+				adapter->session.station.
 				hdd_reassoc_scenario = false;

 				/* indicate disconnected event to nl80211 */
@@ -7067,16 +7067,16 @@ static uint8_t hdd_get_safe_channel_from_pcl_and_acs_range(
 		hdd_debug("pcl length is zero!");

 	hdd_debug("start:%d end:%d",
-		adapter->sessionCtx.ap.sap_config.acs_cfg.start_ch,
-		adapter->sessionCtx.ap.sap_config.acs_cfg.end_ch);
+		adapter->session.ap.sap_config.acs_cfg.start_ch,
+		adapter->session.ap.sap_config.acs_cfg.end_ch);

 	/* PCL already takes unsafe channel into account */
 	for (i = 0; i < pcl.pcl_len; i++) {
 		hdd_debug("chan[%d]:%d", i, pcl.pcl_list[i]);
 		if ((pcl.pcl_list[i] >=
-		   adapter->sessionCtx.ap.sap_config.acs_cfg.start_ch) &&
+		   adapter->session.ap.sap_config.acs_cfg.start_ch) &&
 		   (pcl.pcl_list[i] <=
-		   adapter->sessionCtx.ap.sap_config.acs_cfg.end_ch)) {
+		   adapter->session.ap.sap_config.acs_cfg.end_ch)) {
 			hdd_debug("found PCL safe chan:%d", pcl.pcl_list[i]);
 			return pcl.pcl_list[i];
 		}
@@ -7109,9 +7109,9 @@ static uint8_t hdd_get_safe_channel_from_pcl_and_acs_range(
 			continue;

 		if ((pcl.pcl_list[i] >=
-		   adapter->sessionCtx.ap.sap_config.acs_cfg.start_ch) &&
+		   adapter->session.ap.sap_config.acs_cfg.start_ch) &&
 		   (pcl.pcl_list[i] <=
-		   adapter->sessionCtx.ap.sap_config.acs_cfg.end_ch)) {
+		   adapter->session.ap.sap_config.acs_cfg.end_ch)) {
 			hdd_debug("found safe chan:%d", pcl.pcl_list[i]);
 			return pcl.pcl_list[i];
 		}
@@ -7177,15 +7177,15 @@ int hdd_update_acs_timer_reason(struct hdd_adapter *adapter, uint8_t reason)
 	set_bit(VENDOR_ACS_RESPONSE_PENDING, &adapter->event_flags);

 	if (QDF_TIMER_STATE_RUNNING ==
-	    qdf_mc_timer_get_current_state(&adapter->sessionCtx.
+	    qdf_mc_timer_get_current_state(&adapter->session.
 					ap.vendor_acs_timer)) {
-		qdf_mc_timer_stop(&adapter->sessionCtx.ap.vendor_acs_timer);
+		qdf_mc_timer_stop(&adapter->session.ap.vendor_acs_timer);
 	}
 	timer_context = (struct hdd_external_acs_timer_context *)
-			adapter->sessionCtx.ap.vendor_acs_timer.user_data;
+			adapter->session.ap.vendor_acs_timer.user_data;
 	timer_context->reason = reason;
 	qdf_status =
-		qdf_mc_timer_start(&adapter->sessionCtx.ap.vendor_acs_timer,
+		qdf_mc_timer_start(&adapter->session.ap.vendor_acs_timer,
 				   WLAN_VENDOR_ACS_WAIT_TIME);
 	if (qdf_status != QDF_STATUS_SUCCESS) {
 		hdd_err("failed to start external acs timer");
@@ -7227,28 +7227,28 @@ void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
 		}

 		if (!((adapter_temp->device_mode == QDF_SAP_MODE) &&
-		   (adapter_temp->sessionCtx.ap.sap_config.acs_cfg.acs_mode))) {
+		   (adapter_temp->session.ap.sap_config.acs_cfg.acs_mode))) {
 			hdd_debug("skip device mode:%d acs:%d",
 				adapter_temp->device_mode,
-				adapter_temp->sessionCtx.ap.sap_config.
+				adapter_temp->session.ap.sap_config.
 				acs_cfg.acs_mode);
 			goto next_adapater;
 		}

 		found = false;
 		for (i = 0; i < hdd_ctxt->unsafe_channel_count; i++) {
-			if (adapter_temp->sessionCtx.ap.operating_channel ==
+			if (adapter_temp->session.ap.operating_channel ==
 				hdd_ctxt->unsafe_channel_list[i]) {
 				found = true;
 				hdd_debug("operating ch:%d is unsafe",
-				  adapter_temp->sessionCtx.ap.operating_channel);
+				  adapter_temp->session.ap.operating_channel);
 				break;
 			}
 		}

 		if (!found) {
 			hdd_debug("ch:%d is safe. no need to change channel",
-				adapter_temp->sessionCtx.ap.operating_channel);
+				adapter_temp->session.ap.operating_channel);
 			goto next_adapater;
 		}

@@ -7272,7 +7272,7 @@ void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
 			 * the ACS while restart.
 			 */
 			hdd_ctxt->acs_policy.acs_channel = AUTO_CHANNEL_SELECT;
-			adapter_temp->sessionCtx.ap.sap_config.channel =
+			adapter_temp->session.ap.sap_config.channel =
 							AUTO_CHANNEL_SELECT;
 			hdd_debug("sending coex indication");
 			wlan_hdd_send_svc_nlink_msg(hdd_ctxt->radio_index,
@@ -7343,7 +7343,7 @@ static void hdd_lte_coex_restart_sap(struct hdd_adapter *adapter,
 	 * the ACS while restart.
 	 */
 	hdd_ctx->acs_policy.acs_channel = AUTO_CHANNEL_SELECT;
-	adapter->sessionCtx.ap.sap_config.channel = AUTO_CHANNEL_SELECT;
+	adapter->session.ap.sap_config.channel = AUTO_CHANNEL_SELECT;

 	hdd_debug("sending coex indication");

@@ -10851,7 +10851,7 @@ void wlan_hdd_start_sap(struct hdd_adapter *ap_adapter, bool reinit)
 	hdd_ctx = WLAN_HDD_GET_CTX(ap_adapter);
 	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter);
 	hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(ap_adapter);
-	sap_config = &ap_adapter->sessionCtx.ap.sap_config;
+	sap_config = &ap_adapter->session.ap.sap_config;

 	mutex_lock(&hdd_ctx->sap_lock);
 	if (test_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags))
@@ -12553,12 +12553,12 @@ void hdd_check_and_restart_sap_with_non_dfs_acs(void)
 	if (ap_adapter != NULL && test_bit(SOFTAP_BSS_STARTED,
 			&ap_adapter->event_flags) &&
 			wlan_reg_is_dfs_ch(hdd_ctx->hdd_pdev,
-				ap_adapter->sessionCtx.ap.operating_channel)) {
+				ap_adapter->session.ap.operating_channel)) {

 		hdd_warn("STA-AP Mode DFS not supported. Restart SAP with Non DFS ACS");
-		ap_adapter->sessionCtx.ap.sap_config.channel =
+		ap_adapter->session.ap.sap_config.channel =
 			AUTO_CHANNEL_SELECT;
-		ap_adapter->sessionCtx.ap.sap_config.
+		ap_adapter->session.ap.sap_config.
 			acs_cfg.acs_mode = true;

 		hdd_restart_sap(ap_adapter);
--- a/core/hdd/src/wlan_hdd_nan_datapath.h
+++ b/core/hdd/src/wlan_hdd_nan_datapath.h
@@ -44,7 +44,7 @@ struct wireless_dev;

 #define WLAN_HDD_IS_NDI_CONNECTED(adapter) ( \
 	eConnectionState_NdiConnected ==\
-		(adapter)->sessionCtx.station.conn_info.connState)
+		(adapter)->session.station.conn_info.connState)
 #else
 #define WLAN_HDD_IS_NDI(adapter)	(false)
 #define WLAN_HDD_IS_NDI_CONNECTED(adapter) (false)
--- a/core/hdd/src/wlan_hdd_power.c
+++ b/core/hdd/src/wlan_hdd_power.c
@@ -1508,7 +1508,7 @@ int wlan_hdd_set_powersave(struct hdd_adapter *adapter,
 	 */
 	if (allow_power_save &&
 	    adapter->device_mode == QDF_STA_MODE &&
-	    !adapter->sessionCtx.station.ap_supports_immediate_power_save) {
+	    !adapter->session.station.ap_supports_immediate_power_save) {
 		/* override user's requested flag */
 		allow_power_save = false;
 		timeout = AUTO_PS_DEFER_TIMEOUT_MS;
--- a/core/hdd/src/wlan_hdd_scan.c
+++ b/core/hdd/src/wlan_hdd_scan.c
@@ -520,10 +520,10 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
 	/* Block All Scan during DFS operation and send null scan result */
 	con_sap_adapter = hdd_get_con_sap_adapter(adapter, true);
 	if (con_sap_adapter) {
-		con_dfs_ch = con_sap_adapter->sessionCtx.ap.sap_config.channel;
+		con_dfs_ch = con_sap_adapter->session.ap.sap_config.channel;
 		if (con_dfs_ch == AUTO_CHANNEL_SELECT)
 			con_dfs_ch =
-				con_sap_adapter->sessionCtx.ap.operating_channel;
+				con_sap_adapter->session.ap.operating_channel;

 		if (!policy_mgr_is_hw_dbs_capable(hdd_ctx->hdd_psoc) &&
 			wlan_reg_is_dfs_ch(hdd_ctx->hdd_pdev, con_dfs_ch)) {
@@ -1040,9 +1040,9 @@ static void hdd_process_vendor_acs_response(struct hdd_adapter *adapter)
 {
 	if (test_bit(VENDOR_ACS_RESPONSE_PENDING, &adapter->event_flags)) {
 		if (QDF_TIMER_STATE_RUNNING ==
-		    qdf_mc_timer_get_current_state(&adapter->sessionCtx.
+		    qdf_mc_timer_get_current_state(&adapter->session.
 					ap.vendor_acs_timer)) {
-			qdf_mc_timer_stop(&adapter->sessionCtx.
+			qdf_mc_timer_stop(&adapter->session.
 					ap.vendor_acs_timer);
 		}
 	}
--- a/core/hdd/src/wlan_hdd_tx_rx.c
+++ b/core/hdd/src/wlan_hdd_tx_rx.c
@@ -569,7 +569,7 @@ static int __hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
 	bool granted;
 	uint8_t STAId;
-	struct hdd_station_ctx *sta_ctx = &adapter->sessionCtx.station;
+	struct hdd_station_ctx *sta_ctx = &adapter->session.station;
 	struct qdf_mac_addr *mac_addr;
 	bool pkt_proto_logged = false;
 #ifdef QCA_PKT_PROTO_TRACE
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -8417,14 +8417,14 @@ static int __iw_setnone_getnone(struct net_device *dev,
 		tSirMacAddr bssid;
 		uint32_t roamId = INVALID_ROAM_ID;
 		uint8_t operating_ch =
-			adapter->sessionCtx.station.conn_info.operationChannel;
+			adapter->session.station.conn_info.operationChannel;
 		tCsrRoamModifyProfileFields modProfileFields;

 		sme_get_modify_profile_fields(hHal, adapter->sessionId,
 					      &modProfileFields);
 		if (roaming_offload_enabled(hdd_ctx)) {
 			qdf_mem_copy(bssid,
-				&adapter->sessionCtx.station.conn_info.bssId,
+				&adapter->session.station.conn_info.bssId,
 				sizeof(bssid));
 			hdd_wma_send_fastreassoc_cmd(adapter,
 						     bssid, operating_ch);