qcacld-3.0: Use link_info pointer to get AP context

As part of single netdev multi vdev changes, AP context
is now per link. To get the AP context for a particular
link, pass the link_info pointer instead of adapter.

Change-Id: I0ffbafdf5c73c47d8ba335706d4065d55b7e45cb
CRs-Fixed: 3447599

core/hdd/inc/wlan_hdd_main.h

@@ -1371,7 +1371,7 @@ struct hdd_adapter {
 };
 
 #define WLAN_HDD_GET_STATION_CTX_PTR(link_info) (&(link_info)->session.station)
-#define WLAN_HDD_GET_AP_CTX_PTR(adapter) (&(adapter)->deflink->session.ap)
+#define WLAN_HDD_GET_AP_CTX_PTR(link_info) (&(link_info)->session.ap)
 #define WLAN_HDD_GET_CTX(adapter) ((adapter)->hdd_ctx)
 #define WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter) \
 				(&(adapter)->deflink->session.ap.hostapd_state)

core/hdd/src/wlan_hdd_cfg80211.c

@@ -4207,8 +4207,7 @@ static uint16_t wlan_hdd_acs_get_puncture_bitmap(struct sap_acs_cfg *acs_cfg)
 void wlan_hdd_cfg80211_acs_ch_select_evt(struct hdd_adapter *adapter)
 {
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	struct sap_config *sap_cfg =
-				&(WLAN_HDD_GET_AP_CTX_PTR(adapter))->sap_config;
+	struct sap_config *sap_cfg;
 	struct sk_buff *vendor_event;
 	int ret_val;
 	uint16_t ch_width;
@@ -4216,12 +4215,15 @@ void wlan_hdd_cfg80211_acs_ch_select_evt(struct hdd_adapter *adapter)
 	uint8_t ht_sec_channel;
 	uint8_t vht_seg0_center_ch, vht_seg1_center_ch;
 	uint32_t id = QCA_NL80211_VENDOR_SUBCMD_DO_ACS_INDEX;
-	uint32_t len = hdd_get_acs_evt_data_len(sap_cfg);
+	uint32_t len;
 	uint16_t puncture_bitmap;
 
 	qdf_atomic_set(&adapter->deflink->session.ap.acs_in_progress, 0);
 	qdf_event_set(&adapter->acs_complete_event);
 
+	sap_cfg = &(WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink))->sap_config;
+	len = hdd_get_acs_evt_data_len(sap_cfg);
+
 	vendor_event = wlan_cfg80211_vendor_event_alloc(hdd_ctx->wiphy,
 							&adapter->wdev, len, id,
 							GFP_KERNEL);
@@ -7007,7 +7009,7 @@ static bool wlan_hdd_check_dfs_channel_for_adapter(struct hdd_context *hdd_ctx,
 		if ((device_mode == adapter->device_mode) &&
 		    (device_mode == QDF_SAP_MODE)) {
 			ap_ctx =
-				WLAN_HDD_GET_AP_CTX_PTR(adapter);
+				WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 			/*
 			 *  if there is SAP already running on DFS channel,
 			 *  do not disable scan on dfs channels. Note that
@@ -14284,6 +14286,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 	struct net_device *dev = wdev->netdev;
 	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
 	struct hdd_station_ctx *hdd_sta_ctx;
+	struct hdd_ap_ctx *ap_ctx;
 	struct hdd_station_info *sta_info;
 	struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_MAX+1];
 	uint8_t peer_mac[QDF_MAC_ADDR_SIZE];
@@ -14359,8 +14362,9 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 			return -EINVAL;
 		}
 
+		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 		nss = sta_info->nss;
-		freq = (WLAN_HDD_GET_AP_CTX_PTR(adapter))->operating_chan_freq;
+		freq = ap_ctx->operating_chan_freq;
 		rate_flags = sta_info->rate_flags;
 		hdd_put_sta_info_ref(&adapter->sta_info_list, &sta_info, true,
 				     STA_INFO_CFG80211_GET_LINK_PROPERTIES);
@@ -15235,7 +15239,7 @@ __wlan_hdd_cfg80211_sap_configuration_set(struct wiphy *wiphy,
 			return -ENOTSUPP;
 		}
 
-		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(hostapd_adapter);
+		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(hostapd_adapter->deflink);
 		ap_ctx->sap_config.chan_freq = chan_freq;
 		ap_ctx->sap_config.ch_params.ch_width =
 					ap_ctx->sap_config.ch_width_orig;
@@ -15807,7 +15811,7 @@ static int hdd_update_acs_channel(struct hdd_adapter *adapter, uint8_t reason,
 		return -EINVAL;
 	}
 
-	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 	sap_config = &adapter->deflink->session.ap.sap_config;
 
 	if (QDF_TIMER_STATE_RUNNING ==
@@ -20602,7 +20606,7 @@ static int __wlan_hdd_cfg80211_change_bss(struct wiphy *wiphy,
 {
 	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	struct hdd_ap_ctx *ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+	struct hdd_ap_ctx *ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 	int ret = 0;
 	QDF_STATUS qdf_ret_status;
 	mac_handle_t mac_handle;
@@ -21145,7 +21149,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
 	if ((adapter->device_mode == QDF_SAP_MODE) ||
 	    (adapter->device_mode == QDF_P2P_GO_MODE)) {
 		if (params->sta_flags_set & BIT(NL80211_STA_FLAG_AUTHORIZED)) {
-			ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+			ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 			/*
 			 * For Encrypted SAP session, this will be done as
 			 * part of eSAP_STA_SET_KEY_EVENT
@@ -21620,7 +21624,7 @@ done:
 	switch (adapter->device_mode) {
 	case QDF_SAP_MODE:
 	case QDF_P2P_GO_MODE:
-		hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+		hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 		if (hdd_ap_ctx->during_auth_offload) {
 			hdd_err("don't need install key during auth");
 			return -EINVAL;
@@ -22548,7 +22552,7 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy,
 			ret = -EINVAL;
 			goto out;
 		}
-		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 		ap_ctx->wep_def_key_idx = key_index;
 	}
 
@@ -26240,7 +26244,7 @@ static int __wlan_hdd_cfg80211_get_channel(struct wiphy *wiphy,
 			(adapter->device_mode == QDF_P2P_GO_MODE)) {
 		struct hdd_ap_ctx *ap_ctx;
 
-		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 
 		if (!test_bit(SOFTAP_BSS_STARTED, &adapter->event_flags))
 			return -EINVAL;

core/hdd/src/wlan_hdd_cm_connect.c

@@ -584,7 +584,7 @@ bool wlan_hdd_cm_handle_sap_sta_dfs_conc(struct hdd_context *hdd_ctx,
 	 * log and return error, if we allow STA to go through, we don't
 	 * know what is going to happen better stop sta connection
 	 */
-	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter);
+	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter->deflink);
 	if (!hdd_ap_ctx) {
 		hdd_err("AP context not found");
 		return false;

core/hdd/src/wlan_hdd_dcs.c

@@ -424,7 +424,7 @@ QDF_STATUS hdd_dcs_hostapd_set_chan(struct hdd_context *hdd_ctx,
 			return QDF_STATUS_E_INVAL;
 		}
 
-		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 
 		if (ap_ctx->operating_chan_freq != dcs_ch_freq) {
 			hdd_ctx->acs_policy.acs_chan_freq = AUTO_CHANNEL_SELECT;

core/hdd/src/wlan_hdd_green_ap.c

@@ -219,7 +219,7 @@ __wlan_hdd_enter_sap_low_pwr_mode(struct wiphy *wiphy,
 	QDF_STATUS status;
 	struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
 	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(wdev->netdev);
-	struct hdd_ap_ctx *ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+	struct hdd_ap_ctx *ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 	struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_DOZED_AP_MAX + 1];
 	struct sk_buff *skb;
 

core/hdd/src/wlan_hdd_hostapd.c

@@ -846,7 +846,7 @@ static void hdd_clear_sta(struct hdd_adapter *adapter,
 	struct hdd_ap_ctx *ap_ctx;
 	struct csr_del_sta_params del_sta_params;
 
-	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 
 	if (qdf_is_macaddr_broadcast(&sta_info->sta_mac))
 		return;
@@ -1826,7 +1826,7 @@ hdd_hostapd_update_beacon_country_ie(struct hdd_adapter *adapter)
 		return;
 	}
 
-	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 
 	hdd_for_each_sta_ref_safe(adapter->sta_info_list, sta_info, tmp,
 				  STA_INFO_HOSTAPD_SAP_EVENT_CB) {
@@ -1939,7 +1939,7 @@ hdd_hostapd_check_channel_post_csa(struct hdd_context *hdd_ctx,
 	uint8_t sta_cnt, sap_cnt;
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
 
-	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 	if (ap_ctx->sap_context->csa_reason ==
 	    CSA_REASON_UNSAFE_CHANNEL)
 		qdf_status = hdd_unsafe_channel_restart_sap(hdd_ctx);
@@ -2043,7 +2043,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 	}
 
 	hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter);
-	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 
 	if (!sap_event) {
 		hdd_err("sap_event is null");
@@ -3754,7 +3754,7 @@ QDF_STATUS wlan_hdd_get_channel_for_sap_restart(
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter);
+	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter->deflink);
 	mac_handle = hdd_ctx->mac_handle;
 	if (!mac_handle) {
 		hdd_err("mac_handle is NULL");
@@ -3934,7 +3934,7 @@ wlan_get_ap_prefer_conc_ch_params(
 		hdd_err("invalid adapter");
 		return QDF_STATUS_E_FAILURE;
 	}
-	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter);
+	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter->deflink);
 	sap_context = hdd_ap_ctx->sap_context;
 	if (!sap_context) {
 		hdd_err("sap_context is null");
@@ -3993,7 +3993,7 @@ uint32_t hdd_get_ap_6ghz_capable(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id)
 		return 0;
 	}
 
-	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter);
+	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter->deflink);
 	sap_config = &ap_ctx->sap_config;
 	sap_context = ap_ctx->sap_context;
 	if (QDF_IS_STATUS_ERROR(wlansap_context_get(sap_context))) {
@@ -4493,6 +4493,7 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
 	mac_handle_t mac_handle;
 	struct sme_config_params *sme_config;
 	struct sap_config *sap_config;
+	struct hdd_ap_ctx *ap_ctx;
 
 	if (!dev) {
 		hdd_err("Called with dev = NULL");
@@ -4549,8 +4550,9 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
 	}
 
 	if (adapter->device_mode == QDF_SAP_MODE ||
-		   adapter->device_mode == QDF_P2P_GO_MODE) {
-		sap_config = &((WLAN_HDD_GET_AP_CTX_PTR(adapter))->sap_config);
+	    adapter->device_mode == QDF_P2P_GO_MODE) {
+		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
+		sap_config = &ap_ctx->sap_config;
 		sap_config->chan_freq = chandef->chan->center_freq;
 		sap_config->ch_params.center_freq_seg1 = channel_seg2;
 		sap_config->ch_params.center_freq_seg0 =
@@ -6160,6 +6162,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 	struct sap_context *sap_ctx;
 	struct wlan_objmgr_vdev *vdev;
 	uint32_t user_config_freq = 0;
+	struct hdd_ap_ctx *ap_ctx;
 
 	hdd_enter();
 
@@ -6174,6 +6177,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 	if (!vdev)
 		return -EINVAL;
 
+	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 	ucfg_mlme_get_sap_force_11n_for_11ac(hdd_ctx->psoc,
 					     &sap_force_11n_for_11ac);
 	ucfg_mlme_get_go_force_11n_for_11ac(hdd_ctx->psoc,
@@ -6203,7 +6207,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 
 	hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter);
 
-	config = &adapter->deflink->session.ap.sap_config;
+	config = &ap_ctx->sap_config;
 	if (!config->chan_freq) {
 		hdd_err("Invalid channel");
 		ret = -EINVAL;
@@ -6234,7 +6238,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 					REASON_OPER_CHANNEL_DISABLED_INDOOR);
 	}
 
-	beacon = adapter->deflink->session.ap.beacon;
+	beacon = ap_ctx->beacon;
 
 	/*
 	 * beacon_fixed_len is the fixed length of beacon
@@ -6272,81 +6276,70 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 
 	ucfg_policy_mgr_get_mcc_scc_switch(hdd_ctx->psoc, &mcc_to_scc_switch);
 
-	if (adapter->device_mode == QDF_SAP_MODE ||
-	    adapter->device_mode == QDF_P2P_GO_MODE) {
-		ie = wlan_get_ie_ptr_from_eid(DOT11F_EID_EXTCAP,
-						   beacon->tail,
-						   beacon->tail_len);
-		if (ie && (ie[0] != DOT11F_EID_EXTCAP ||
-		    ie[1] > DOT11F_IE_EXTCAP_MAX_LEN)) {
-			hdd_err("Invalid IEs eid: %d elem_len: %d", ie[0],
-				ie[1]);
-			ret = -EINVAL;
-			goto error;
-		}
-		if (ie) {
-			bool target_bigtk_support = false;
-
-			memcpy(&p_ext_cap, &ie[2], (ie[1] > sizeof(p_ext_cap)) ?
-			       sizeof(p_ext_cap) : ie[1]);
+	ie = wlan_get_ie_ptr_from_eid(DOT11F_EID_EXTCAP, beacon->tail,
+				      beacon->tail_len);
+	if (ie && (ie[0] != DOT11F_EID_EXTCAP ||
+		   ie[1] > DOT11F_IE_EXTCAP_MAX_LEN)) {
+		hdd_err("Invalid IEs eid: %d elem_len: %d", ie[0], ie[1]);
+		ret = -EINVAL;
+		goto error;
+	}
 
-			hdd_debug("beacon protection %d",
-				  p_ext_cap.beacon_protection_enable);
+	if (ie) {
+		bool target_bigtk_support = false;
 
-			ucfg_mlme_get_bigtk_support(hdd_ctx->psoc,
-						    &target_bigtk_support);
-			if (target_bigtk_support &&
-			    p_ext_cap.beacon_protection_enable)
-				mlme_set_bigtk_support(vdev, true);
-		}
+		memcpy(&p_ext_cap, &ie[2], (ie[1] > sizeof(p_ext_cap)) ?
+		       sizeof(p_ext_cap) : ie[1]);
 
-		/* Overwrite second AP's channel with first only when:
-		 * 1. If operating mode is single mac
-		 * 2. or if 2nd AP is coming up on 5G band channel
-		 */
-		ret = 0;
-		if (!policy_mgr_is_hw_dbs_capable(hdd_ctx->psoc) ||
-		    !WLAN_REG_IS_24GHZ_CH_FREQ(config->chan_freq)) {
-			ret = wlan_hdd_sap_cfg_dfs_override(adapter);
-			if (ret < 0)
-				goto error;
-		}
-		if (!ret && wlan_reg_is_dfs_for_freq(hdd_ctx->pdev,
-						     config->chan_freq))
-			hdd_ctx->dev_dfs_cac_status = DFS_CAC_NEVER_DONE;
+		hdd_debug("beacon protection %d",
+			  p_ext_cap.beacon_protection_enable);
 
-		if (QDF_STATUS_SUCCESS !=
-		    wlan_hdd_validate_operation_channel(adapter,
-							config->chan_freq)) {
-			hdd_err("Invalid Ch_freq: %d", config->chan_freq);
-			ret = -EINVAL;
-			goto error;
-		}
-		ucfg_scan_cfg_get_dfs_chan_scan_allowed(hdd_ctx->psoc,
-							&enable_dfs_scan);
+		ucfg_mlme_get_bigtk_support(hdd_ctx->psoc,
+					    &target_bigtk_support);
+		if (target_bigtk_support && p_ext_cap.beacon_protection_enable)
+			mlme_set_bigtk_support(vdev, true);
+	}
 
-		/* reject SAP if DFS channel scan is not allowed */
-		if (!(enable_dfs_scan) &&
-		    (CHANNEL_STATE_DFS ==
-		     wlan_reg_get_channel_state_from_secondary_list_for_freq(
-							hdd_ctx->pdev,
-							config->chan_freq))) {
-			hdd_err("No SAP start on DFS channel");
-			ret = -EOPNOTSUPP;
+	/* Overwrite second AP's channel with first only when:
+	 * 1. If operating mode is single mac
+	 * 2. or if 2nd AP is coming up on 5G band channel
+	 */
+	ret = 0;
+	if (!policy_mgr_is_hw_dbs_capable(hdd_ctx->psoc) ||
+	    !WLAN_REG_IS_24GHZ_CH_FREQ(config->chan_freq)) {
+		ret = wlan_hdd_sap_cfg_dfs_override(adapter);
+		if (ret < 0)
 			goto error;
-		}
+	}
+	if (!ret && wlan_reg_is_dfs_for_freq(hdd_ctx->pdev, config->chan_freq))
+		hdd_ctx->dev_dfs_cac_status = DFS_CAC_NEVER_DONE;
 
-		status = ucfg_mlme_get_dfs_ignore_cac(hdd_ctx->psoc,
-						      &ignore_cac);
-		if (!QDF_IS_STATUS_SUCCESS(status))
-			hdd_err("can't get ignore cac flag");
+	if (QDF_STATUS_SUCCESS !=
+	    wlan_hdd_validate_operation_channel(adapter, config->chan_freq)) {
+		hdd_err("Invalid Ch_freq: %d", config->chan_freq);
+		ret = -EINVAL;
+		goto error;
+	}
+	ucfg_scan_cfg_get_dfs_chan_scan_allowed(hdd_ctx->psoc,
+						&enable_dfs_scan);
 
-		wlansap_set_dfs_ignore_cac(mac_handle, ignore_cac);
+	/* reject SAP if DFS channel scan is not allowed */
+	if (!enable_dfs_scan &&
+	    CHANNEL_STATE_DFS ==
+	    wlan_reg_get_channel_state_from_secondary_list_for_freq(hdd_ctx->pdev,
+								    config->chan_freq)) {
+		hdd_err("No SAP start on DFS channel");
+		ret = -EOPNOTSUPP;
+		goto error;
+	}
 
-		wlansap_set_dfs_preferred_channel_location(mac_handle);
+	status = ucfg_mlme_get_dfs_ignore_cac(hdd_ctx->psoc, &ignore_cac);
+	if (!QDF_IS_STATUS_SUCCESS(status))
+		hdd_err("can't get ignore cac flag");
 
-		wlan_hdd_set_sap_mcc_chnl_avoid(hdd_ctx);
-	}
+	wlansap_set_dfs_ignore_cac(mac_handle, ignore_cac);
+	wlansap_set_dfs_preferred_channel_location(mac_handle);
+	wlan_hdd_set_sap_mcc_chnl_avoid(hdd_ctx);
 
 	tgt_dfs_set_tx_leakage_threshold(hdd_ctx->pdev);
 
@@ -6355,7 +6348,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 	config->privacy = (mgmt_frame->u.beacon.capab_info &
 			    WLAN_CAPABILITY_PRIVACY) ? true : false;
 
-	(WLAN_HDD_GET_AP_CTX_PTR(adapter))->privacy = config->privacy;
+	ap_ctx->privacy = config->privacy;
 
 	/*Set wps station to configured */
 	ie = wlan_hdd_get_wps_ie_ptr(beacon->tail, beacon->tail_len);
@@ -6383,8 +6376,8 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 	} else {
 		config->wps_state = SAP_WPS_DISABLED;
 	}
-	(WLAN_HDD_GET_AP_CTX_PTR(adapter))->encryption_type =
-		eCSR_ENCRYPT_TYPE_NONE;
+
+	ap_ctx->encryption_type = eCSR_ENCRYPT_TYPE_NONE;
 
 	config->RSNWPAReqIELength = 0;
 	memset(&config->RSNWPAReqIE[0], 0, sizeof(config->RSNWPAReqIE));
@@ -6426,8 +6419,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 			/* Now copy over all the security attributes you have
 			 * parsed out. Use the cipher type in the RSN IE
 			 */
-			(WLAN_HDD_GET_AP_CTX_PTR(adapter))->
-			encryption_type = rsn_encrypt_type;
+			ap_ctx->encryption_type = rsn_encrypt_type;
 			hdd_debug("CSR Encryption: %d mcEncryption: %d num_akm_suites:%d",
 				  rsn_encrypt_type, mc_rsn_encrypt_type,
 				  config->akm_list.numEntries);
@@ -6479,8 +6471,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 				ret = -EINVAL;
 				goto error;
 			} else {
-				(WLAN_HDD_GET_AP_CTX_PTR(adapter))->
-				encryption_type = rsn_encrypt_type;
+				ap_ctx->encryption_type = rsn_encrypt_type;
 				hdd_debug("CSR Encryption: %d mcEncryption: %d num_akm_suites:%d",
 					  rsn_encrypt_type, mc_rsn_encrypt_type,
 					  config->akm_list.numEntries);
@@ -6768,7 +6759,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 
 	sap_event_callback = hdd_hostapd_sap_event_cb;
 
-	(WLAN_HDD_GET_AP_CTX_PTR(adapter))->dfs_cac_block_tx = true;
+	ap_ctx->dfs_cac_block_tx = true;
 	set_bit(SOFTAP_INIT_DONE, &adapter->event_flags);
 
 	ucfg_dp_set_dfs_cac_tx(vdev, true);
@@ -6854,7 +6845,7 @@ error:
 		sme_update_channel_list(mac_handle);
 	}
 	clear_bit(SOFTAP_INIT_DONE, &adapter->event_flags);
-	qdf_atomic_set(&adapter->deflink->session.ap.acs_in_progress, 0);
+	qdf_atomic_set(&ap_ctx->acs_in_progress, 0);
 	wlansap_reset_sap_config_add_ie(config, eUPDATE_IE_ALL);
 
 free:
@@ -6883,7 +6874,7 @@ deliver_start_err:
 
 int hdd_destroy_acs_timer(struct hdd_adapter *adapter)
 {
-	struct hdd_ap_ctx *ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+	struct hdd_ap_ctx *ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 	QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;
 
 	if (!ap_ctx->vendor_acs_timer_initialized)
@@ -7198,7 +7189,7 @@ static void hdd_update_beacon_rate(struct hdd_adapter *adapter,
 		struct wiphy *wiphy,
 		struct cfg80211_ap_settings *params)
 {
-	struct hdd_ap_ctx *ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+	struct hdd_ap_ctx *ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 	struct cfg80211_bitrate_mask *beacon_rate_mask;
 	enum nl80211_band band;
 
@@ -7631,6 +7622,8 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 	enum policy_mgr_con_mode intf_pm_mode;
 	struct wlan_objmgr_vdev *vdev;
 	uint16_t link_id = 0;
+	struct sap_config *sap_config;
+	struct hdd_ap_ctx *ap_ctx;
 
 	hdd_enter();
 
@@ -7657,6 +7650,9 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 	if (0 != status)
 		return status;
 
+	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
+	sap_config = &ap_ctx->sap_config;
+
 	hdd_nofl_info("%s(vdevid-%d): START AP: mode %s(%d) %d bw %d sub20 %d",
 		      dev->name, adapter->deflink->vdev_id,
 		      qdf_opmode_str(adapter->device_mode),
@@ -7696,14 +7692,12 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 		policy_mgr_init_sap_mandatory_chan(hdd_ctx->psoc,
 						   chandef->chan->center_freq);
 
-	adapter->deflink->session.ap.sap_config.ch_params.center_freq_seg0 =
+	sap_config->ch_params.center_freq_seg0 =
 				cds_freq_to_chan(chandef->center_freq1);
-	adapter->deflink->session.ap.sap_config.ch_params.center_freq_seg1 =
+	sap_config->ch_params.center_freq_seg1 =
 				cds_freq_to_chan(chandef->center_freq2);
-	adapter->deflink->session.ap.sap_config.ch_params.mhz_freq_seg0 =
-							chandef->center_freq1;
-	adapter->deflink->session.ap.sap_config.ch_params.mhz_freq_seg1 =
-							chandef->center_freq2;
+	sap_config->ch_params.mhz_freq_seg0 = chandef->center_freq1;
+	sap_config->ch_params.mhz_freq_seg1 = chandef->center_freq2;
 
 	status = policy_mgr_is_sap_allowed_on_dfs_freq(
 						hdd_ctx->pdev,
@@ -7744,8 +7738,6 @@ 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;
-		struct sap_config *sap_cfg =
-				&adapter->deflink->session.ap.sap_config;
 		struct ch_params ch_params;
 
 		if (CHANNEL_STATE_DFS ==
@@ -7778,7 +7770,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 			hdd_err("Given ch width not supported by reg domain");
 			return -EINVAL;
 		}
-		sap_cfg->SapHw_mode = eCSR_DOT11_MODE_abg;
+		sap_config->SapHw_mode = eCSR_DOT11_MODE_abg;
 	}
 
 	sta_cnt = policy_mgr_get_mode_specific_conn_info(hdd_ctx->psoc, NULL,
@@ -7836,12 +7828,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 	 * back to single MAC 2x2 (if initial was 2x2).
 	 */
 
-	policy_mgr_checkn_update_hw_mode_single_mac_mode(
-		hdd_ctx->psoc, freq);
-	if (status != QDF_STATUS_SUCCESS) {
-		hdd_err("Failed to stop DBS opportunistic timer");
-		return -EINVAL;
-	}
+	policy_mgr_checkn_update_hw_mode_single_mac_mode(hdd_ctx->psoc, freq);
 
 	status = policy_mgr_current_connections_update(
 			hdd_ctx->psoc, adapter->deflink->vdev_id,
@@ -7867,8 +7854,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 		p2p_adapter = hdd_get_adapter(hdd_ctx, QDF_P2P_DEVICE_MODE);
 		if (p2p_adapter) {
 			hdd_debug("Cancel active p2p device ROC before GO starting");
-			wlan_hdd_cancel_existing_remain_on_channel(
-				p2p_adapter);
+			wlan_hdd_cancel_existing_remain_on_channel(p2p_adapter);
 		}
 	}
 
@@ -7877,10 +7863,8 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 	    ) {
 		struct hdd_beacon_data *old, *new;
 		enum nl80211_channel_type channel_type;
-		struct sap_config *sap_config =
-			&((WLAN_HDD_GET_AP_CTX_PTR(adapter))->sap_config);
 
-		old = adapter->deflink->session.ap.beacon;
+		old = ap_ctx->beacon;
 
 		if (old)
 			return -EALREADY;
@@ -7894,36 +7878,30 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 			hdd_err("Error!!! Allocating the new beacon");
 			return -EINVAL;
 		}
-		adapter->deflink->session.ap.beacon = new;
+		ap_ctx->beacon = new;
 
 		if (chandef->width < NL80211_CHAN_WIDTH_80)
-			channel_type = cfg80211_get_chandef_type(
-						chandef);
+			channel_type = cfg80211_get_chandef_type(chandef);
 		else
 			channel_type = NL80211_CHAN_HT40PLUS;
 
 
-		wlan_hdd_set_channel(wiphy, dev,
-				     chandef,
-				     channel_type);
+		wlan_hdd_set_channel(wiphy, dev, chandef, channel_type);
 
 		hdd_update_beacon_rate(adapter, wiphy, params);
 
 		/* set authentication type */
 		switch (params->auth_type) {
 		case NL80211_AUTHTYPE_OPEN_SYSTEM:
-			adapter->deflink->session.ap.sap_config.authType =
-				eSAP_OPEN_SYSTEM;
+			sap_config->authType = eSAP_OPEN_SYSTEM;
 			break;
 		case NL80211_AUTHTYPE_SHARED_KEY:
-			adapter->deflink->session.ap.sap_config.authType =
-				eSAP_SHARED_KEY;
+			sap_config->authType = eSAP_SHARED_KEY;
 			break;
 		default:
-			adapter->deflink->session.ap.sap_config.authType =
-				eSAP_AUTO_SWITCH;
+			sap_config->authType = eSAP_AUTO_SWITCH;
 		}
-		adapter->deflink->session.ap.sap_config.ch_width_orig =
+		sap_config->ch_width_orig =
 					hdd_map_nl_chan_width(chandef->width);
 
 		/*
@@ -7936,11 +7914,10 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 		hdd_update_he_obss_pd(adapter, params);
 
 		hdd_place_marker(adapter, "TRY TO START", NULL);
-		status =
-			wlan_hdd_cfg80211_start_bss(adapter,
-				&params->beacon,
-				params->ssid, params->ssid_len,
-				params->hidden_ssid, true);
+		status = wlan_hdd_cfg80211_start_bss(adapter, &params->beacon,
+						     params->ssid,
+						     params->ssid_len,
+						     params->hidden_ssid, true);
 
 		if (status != 0) {
 			hdd_err("Error Start bss Failed");
@@ -7989,9 +7966,8 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 
 err_start_bss:
 	hdd_place_marker(adapter, "START with FAILURE", NULL);
-	if (adapter->deflink->session.ap.beacon)
-		qdf_mem_free(adapter->deflink->session.ap.beacon);
-	adapter->deflink->session.ap.beacon = NULL;
+	qdf_mem_free(ap_ctx->beacon);
+	ap_ctx->beacon = NULL;
 
 success:
 	if (QDF_IS_STATUS_SUCCESS(status))

core/hdd/src/wlan_hdd_hostapd_wext.c

@@ -878,7 +878,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCASAP_SET_RADAR_CMD:
 	{
-		struct hdd_ap_ctx *ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+		struct hdd_ap_ctx *ap_ctx;
 		struct wlan_objmgr_pdev *pdev;
 		struct radar_found_info radar;
 
@@ -890,6 +890,7 @@ static __iw_softap_setparam(struct net_device *dev,
 			return -EINVAL;
 		}
 
+		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 		qdf_mem_zero(&radar, sizeof(radar));
 		if (wlansap_is_channel_in_nol_list(ap_ctx->sap_context,
 						   ap_ctx->operating_chan_freq,
@@ -1517,7 +1518,7 @@ static __iw_softap_getchannel(struct net_device *dev,
 		return ret;
 
 	*value = 0;
-	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 	if (test_bit(SOFTAP_BSS_STARTED, &adapter->event_flags))
 		*value = wlan_reg_freq_to_chan(
 				hdd_ctx->pdev,

core/hdd/src/wlan_hdd_ioctl.c

@@ -6408,7 +6408,7 @@ static void disconnect_sta_and_restart_sap(struct hdd_context *hdd_ctx,
 			goto next_adapter;
 		}
 
-		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 		if (check_disable_channels(hdd_ctx, ap_ctx->operating_chan_freq))
 			policy_mgr_check_sap_restart(hdd_ctx->psoc,
 						     adapter->deflink->vdev_id);

core/hdd/src/wlan_hdd_main.c

@@ -2930,14 +2930,13 @@ bool hdd_dfs_indicate_radar(struct hdd_context *hdd_ctx)
 
 	hdd_for_each_adapter_dev_held_safe(hdd_ctx, adapter, next_adapter,
 					   NET_DEV_HOLD_DFS_INDICATE_RADAR) {
-		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 
 		if ((QDF_SAP_MODE == adapter->device_mode ||
 		    QDF_P2P_GO_MODE == adapter->device_mode) &&
 		    (wlan_reg_is_passive_or_disable_for_pwrmode(hdd_ctx->pdev,
 		     ap_ctx->operating_chan_freq, REG_CURRENT_PWR_MODE))) {
-			WLAN_HDD_GET_AP_CTX_PTR(adapter)->dfs_cac_block_tx =
-				true;
+			ap_ctx->dfs_cac_block_tx = true;
 			hdd_info("tx blocked for vdev: %d",
 				adapter->deflink->vdev_id);
 			if (adapter->deflink->vdev_id != WLAN_UMAC_VDEV_ID_MAX)
@@ -8609,7 +8608,7 @@ QDF_STATUS hdd_stop_adapter_ext(struct hdd_context *hdd_ctx,
 		fallthrough;
 
 	case QDF_P2P_GO_MODE:
-		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 		wlansap_cleanup_cac_timer(ap_ctx->sap_context);
 
 		cds_flush_work(&adapter->sap_stop_bss_work);
@@ -10891,7 +10890,7 @@ bool wlan_hdd_get_ap_client_count(hdd_cb_handle context, uint8_t vdev_id,
 		return false;
 	}
 
-	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 	if (!ap_ctx->ap_active)
 		return false;
 	for (i = QCA_WLAN_802_11_MODE_11B; i < QCA_WLAN_802_11_MODE_INVALID;
@@ -10996,7 +10995,7 @@ static inline bool hdd_is_ap_active(hdd_cb_handle context, uint8_t vdev_id)
 		hdd_err("adapter is null");
 		return false;
 	}
-	return WLAN_HDD_GET_AP_CTX_PTR(adapter)->ap_active;
+	return WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink)->ap_active;
 }
 
 /**
@@ -11939,7 +11938,7 @@ QDF_STATUS hdd_switch_sap_channel(struct hdd_adapter *adapter, uint8_t channel,
 		return QDF_STATUS_E_INVAL;
 	}
 
-	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 
 	mac_handle = hdd_adapter_get_mac_handle(adapter);
 	if (!mac_handle) {
@@ -11974,7 +11973,7 @@ QDF_STATUS hdd_switch_sap_chan_freq(struct hdd_adapter *adapter,
 	if(wlan_hdd_validate_context(hdd_ctx))
 		return QDF_STATUS_E_INVAL;
 
-	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 
 	hdd_debug("chan freq:%d width:%d org bw %d",
 		  chan_freq, ch_width, hdd_ap_ctx->sap_config.ch_width_orig);
@@ -12140,7 +12139,7 @@ QDF_STATUS hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
 
 	hdd_for_each_adapter_dev_held_safe(hdd_ctxt, adapter, next_adapter,
 					   dbgid) {
-		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 		if (!(adapter->device_mode == QDF_SAP_MODE &&
 		    ap_ctx->sap_config.acs_cfg.acs_mode)) {
 			hdd_debug_rl("skip device mode:%d acs:%d",
@@ -16794,7 +16793,7 @@ void wlan_hdd_auto_shutdown_enable(struct hdd_context *hdd_ctx, bool enable)
 			}
 
 			if (adapter->device_mode == QDF_SAP_MODE) {
-				if (WLAN_HDD_GET_AP_CTX_PTR(adapter)->
+				if (WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink)->
 				    ap_active == true) {
 					ap_connected = true;
 					hdd_adapter_dev_put_debug(adapter,
@@ -16890,7 +16889,7 @@ bool hdd_is_any_adapter_connected(struct hdd_context *hdd_ctx)
 		}
 
 		if (hdd_adapter_is_ap(adapter) &&
-		    WLAN_HDD_GET_AP_CTX_PTR(adapter)->ap_active) {
+		    WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink)->ap_active) {
 			hdd_adapter_dev_put_debug(adapter, dbgid);
 			if (next_adapter)
 				hdd_adapter_dev_put_debug(next_adapter,
@@ -16959,7 +16958,7 @@ void wlan_hdd_stop_sap(struct hdd_adapter *ap_adapter)
 		return;
 	}
 
-	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter);
+	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter->deflink);
 	hdd_ctx = WLAN_HDD_GET_CTX(ap_adapter);
 	if (wlan_hdd_validate_context(hdd_ctx))
 		return;
@@ -17063,7 +17062,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);
+	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter->deflink);
 	hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(ap_adapter);
 	sap_config = &ap_adapter->deflink->session.ap.sap_config;
 
@@ -19752,7 +19751,7 @@ void hdd_restart_sap(struct hdd_adapter *ap_adapter)
 	struct sap_config *sap_config;
 	void *sap_ctx;
 
-	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter);
+	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter->deflink);
 	sap_config = &hdd_ap_ctx->sap_config;
 	sap_ctx = hdd_ap_ctx->sap_context;
 

core/hdd/src/wlan_hdd_p2p.c

@@ -261,7 +261,7 @@ static int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
 	uint32_t assoc_resp_len, ft_info_len = 0;
 	const uint8_t  *assoc_resp;
 	void *ft_info;
-	struct hdd_ap_ctx *hdd_ap_ctx;
+	struct hdd_ap_ctx *ap_ctx;
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -302,8 +302,8 @@ static int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
 			if ((auth_algo == eSIR_FT_AUTH) &&
 			    (adapter->device_mode == QDF_SAP_MODE ||
 			     adapter->device_mode == QDF_P2P_GO_MODE)) {
-				hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
-				hdd_ap_ctx->during_auth_offload = false;
+				ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
+				ap_ctx->during_auth_offload = false;
 			}
 		}
 
@@ -341,10 +341,10 @@ static int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
 		if (!ft_info || !ft_info_len)
 			return -EINVAL;
 		hdd_debug("get ft_info_len from Assoc rsp :%d", ft_info_len);
-		hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
-		qdf_status = wlansap_update_ft_info(hdd_ap_ctx->sap_context,
-				((struct ieee80211_mgmt *)buf)->da,
-				ft_info, ft_info_len, 0);
+		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
+		qdf_status = wlansap_update_ft_info(ap_ctx->sap_context,
+						    ((struct ieee80211_mgmt *)buf)->da,
+						    ft_info, ft_info_len, 0);
 		qdf_mem_free(ft_info);
 
 		if (QDF_IS_STATUS_SUCCESS(qdf_status))
@@ -1067,7 +1067,7 @@ __hdd_indicate_mgmt_frame_to_user(struct hdd_adapter *adapter,
 	bool is_pasn_auth_frame = false;
 	struct hdd_adapter *assoc_adapter;
 	bool eht_capab;
-	struct hdd_ap_ctx *hdd_ap_ctx;
+	struct hdd_ap_ctx *ap_ctx;
 
 	hdd_debug("Frame Type = %d Frame Length = %d freq = %d",
 		  frame_type, frm_len, rx_freq);
@@ -1098,12 +1098,11 @@ __hdd_indicate_mgmt_frame_to_user(struct hdd_adapter *adapter,
 					  sizeof(struct wlan_frame_hdr));
 		if (auth_algo == eSIR_AUTH_TYPE_PASN) {
 			is_pasn_auth_frame = true;
-		} else if (auth_algo == eSIR_FT_AUTH) {
-			if (adapter->device_mode == QDF_SAP_MODE ||
-			    adapter->device_mode == QDF_P2P_GO_MODE) {
-				hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
-				hdd_ap_ctx->during_auth_offload = true;
-			}
+		} else if (auth_algo == eSIR_FT_AUTH &&
+			   (adapter->device_mode == QDF_SAP_MODE ||
+			    adapter->device_mode == QDF_P2P_GO_MODE)) {
+			ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
+			ap_ctx->during_auth_offload = true;
 		}
 	}
 

core/hdd/src/wlan_hdd_power.c

@@ -2584,7 +2584,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy,
 			if (BSS_START ==
 			    WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter)->bss_state &&
 			    true ==
-			    WLAN_HDD_GET_AP_CTX_PTR(adapter)->
+			    WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink)->
 			    dfs_cac_block_tx) {
 				hdd_err("RADAR detection in progress, do not allow suspend");
 				wlan_hdd_inc_suspend_stats(hdd_ctx,

core/hdd/src/wlan_hdd_pre_cac.c

@@ -251,7 +251,7 @@ static int __wlan_hdd_request_pre_cac(struct hdd_context *hdd_ctx,
 
 	mac_handle = hdd_ctx->mac_handle;
 
-	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter);
+	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter->deflink);
 	if (!hdd_ap_ctx) {
 		hdd_err("SAP context is NULL");
 		return -EINVAL;
@@ -528,7 +528,7 @@ wlan_hdd_pre_cac_conditional_freq_switch_ind(struct wlan_objmgr_vdev *vdev,
 	}
 
 	if (completed) {
-		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 		ap_ctx->dfs_cac_block_tx = false;
 		ucfg_ipa_set_dfs_cac_tx(adapter->hdd_ctx->pdev,
 					ap_ctx->dfs_cac_block_tx);

core/hdd/src/wlan_hdd_scan.c

@@ -518,7 +518,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
 
 	con_sap_adapter = hdd_get_con_sap_adapter(adapter, true);
 	if (con_sap_adapter) {
-		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(con_sap_adapter);
+		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(con_sap_adapter->deflink);
 		con_dfs_ch_freq = ap_ctx->sap_config.chan_freq;
 		con_dfs_ch_width = ap_ctx->sap_config.ch_params.ch_width;
 		if (con_dfs_ch_freq == AUTO_CHANNEL_SELECT)

core/hdd/src/wlan_hdd_softap_tx_rx.c

@@ -502,7 +502,7 @@ QDF_STATUS hdd_softap_deregister_sta(struct hdd_adapter *adapter,
 	ucfg_dp_del_latency_critical_client(vdev, sta->dot11_mode);
 	hdd_objmgr_put_vdev_by_user(vdev, WLAN_DP_ID);
 
-	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 	if (!QDF_IS_ADDR_BROADCAST(sta->sta_mac.bytes) &&
 	    sta->dot11_mode < QCA_WLAN_802_11_MODE_INVALID)
 		ap_ctx->client_count[sta->dot11_mode]--;
@@ -538,7 +538,7 @@ QDF_STATUS hdd_softap_register_sta(struct hdd_adapter *adapter,
 		dot11mode = hdd_convert_dot11mode_from_phymode(event->chan_info.info);
 	}
 
-	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 
 	/*
 	 * If the address is a broadcast address, then provide the self mac addr
@@ -666,7 +666,7 @@ QDF_STATUS hdd_softap_register_bc_sta(struct hdd_adapter *adapter,
 	struct qdf_mac_addr broadcast_macaddr = QDF_MAC_ADDR_BCAST_INIT;
 	struct hdd_ap_ctx *ap_ctx;
 	uint8_t sta_id;
-	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 	sta_id = ap_ctx->broadcast_sta_id;
 
 	if (sta_id >= WLAN_MAX_STA_COUNT) {

core/hdd/src/wlan_hdd_son.c

@@ -912,7 +912,7 @@ static int hdd_son_set_phymode(struct wlan_objmgr_vdev *vdev,
 
 	vendor_phy_mode = hdd_son_phy_mode_to_vendor_phy_mode(mode);
 
-	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 	sap_config = &hdd_ap_ctx->sap_config;
 	status = wlansap_son_update_sap_config_phymode(vdev, sap_config,
 						       vendor_phy_mode);

core/hdd/src/wlan_hdd_sysfs_channel.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -46,7 +47,7 @@ static ssize_t __show_channel_number(struct net_device *net_dev, char *buf)
 	if (0 != ret_val)
 		goto exit;
 
-	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 	if (test_bit(SOFTAP_BSS_STARTED, &adapter->event_flags)) {
 		chan_num = wlan_reg_freq_to_chan(hdd_ctx->pdev,
 						 ap_ctx->operating_chan_freq);

core/hdd/src/wlan_hdd_sysfs_radar.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -31,7 +32,7 @@ __hdd_sysfs_radar_store(struct net_device *net_dev,
 			char const *buf, size_t count)
 {
 	struct hdd_adapter *adapter = netdev_priv(net_dev);
-	struct hdd_ap_ctx *ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+	struct hdd_ap_ctx *ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 	char buf_local[MAX_SYSFS_USER_COMMAND_SIZE_LENGTH + 1];
 	struct wlan_objmgr_pdev *pdev;
 	struct radar_found_info radar;

core/hdd/src/wlan_hdd_tx_rx.c

@@ -1676,7 +1676,7 @@ void wlan_hdd_set_tx_flow_info(void)
 			}
 			break;
 		case QDF_P2P_GO_MODE:
-			hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+			hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 			hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter);
 			if (hostapd_state->bss_state == BSS_START &&
 			    hostapd_state->qdf_status ==
@@ -1688,7 +1688,7 @@ void wlan_hdd_set_tx_flow_info(void)
 			}
 			break;
 		case QDF_SAP_MODE:
-			hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+			hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink);
 			hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter);
 			if (hostapd_state->bss_state == BSS_START &&
 			    hostapd_state->qdf_status ==