Commit 1833a2ce authored by Aditya Kumar Singh's avatar Aditya Kumar Singh Committed by Kalle Valo
Browse files

wifi: ath12k: ath12k_bss_assoc(): MLO support 



Currently, the ath12k_bss_assoc() function handles only deflink station
connections. To support multi-link station connections, make the necessary
changes to retrieve the required information from the link-level members.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3

Signed-off-by: default avatarAditya Kumar Singh <quic_adisi@quicinc.com>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://patch.msgid.link/20241126171139.2350704-8-kvalo@kernel.org
parent 90570ba4

drivers/net/wireless/ath/ath12k/mac.c

+20 −8
Original line number Diff line number Diff line
@@ -3133,7 +3133,9 @@ static void ath12k_bss_assoc(struct ath12k *ar, 
	struct ath12k_vif *ahvif = arvif->ahvif;

	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(ahvif);

	struct ath12k_wmi_vdev_up_params params = {};

	struct ath12k_wmi_peer_assoc_arg peer_arg;

	struct ath12k_wmi_peer_assoc_arg peer_arg = {};

	struct ieee80211_link_sta *link_sta;

	u8 link_id = bss_conf->link_id;

	struct ath12k_link_sta *arsta;

	struct ieee80211_sta *ap_sta;

	struct ath12k_sta *ahsta;
@@ -3143,27 +3145,38 @@ static void ath12k_bss_assoc(struct ath12k *ar, 


	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)->wiphy);



	ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac vdev %i assoc bssid %pM aid %d\n",

		   arvif->vdev_id, arvif->bssid, ahvif->aid);

	ath12k_dbg(ar->ab, ATH12K_DBG_MAC,

		   "mac vdev %i link id %u assoc bssid %pM aid %d\n",

		   arvif->vdev_id, link_id, arvif->bssid, ahvif->aid);



	rcu_read_lock();



	ap_sta = ieee80211_find_sta(vif, bss_conf->bssid);

	/* During ML connection, cfg.ap_addr has the MLD address. For

	 * non-ML connection, it has the BSSID.

	 */

	ap_sta = ieee80211_find_sta(vif, vif->cfg.ap_addr);

	if (!ap_sta) {

		ath12k_warn(ar->ab, "failed to find station entry for bss %pM vdev %i\n",

			    bss_conf->bssid, arvif->vdev_id);

			    vif->cfg.ap_addr, arvif->vdev_id);

		rcu_read_unlock();

		return;

	}



	ahsta = ath12k_sta_to_ahsta(ap_sta);

	arsta = &ahsta->deflink;



	arsta = wiphy_dereference(ath12k_ar_to_hw(ar)->wiphy,

				  ahsta->link[link_id]);

	if (WARN_ON(!arsta)) {

		rcu_read_unlock();

		return;

	}



	link_sta = ath12k_mac_get_link_sta(arsta);

	if (WARN_ON(!link_sta)) {

		rcu_read_unlock();

		return;

	}



	ath12k_peer_assoc_prepare(ar, arvif, arsta, &peer_arg, false);



	rcu_read_unlock();
@@ -3182,8 +3195,7 @@ static void ath12k_bss_assoc(struct ath12k *ar, 
	}



	ret = ath12k_setup_peer_smps(ar, arvif, bss_conf->bssid,

				     &ap_sta->deflink.ht_cap,

				     &ap_sta->deflink.he_6ghz_capa);

				     &link_sta->ht_cap, &link_sta->he_6ghz_capa);

	if (ret) {

		ath12k_warn(ar->ab, "failed to setup peer SMPS for vdev %d: %d\n",

			    arvif->vdev_id, ret);