Commit 8c214370 authored by Kalle Valo's avatar Kalle Valo
Browse files

wifi: ath12k: ath12k_mac_op_sta_rc_update(): use mac80211 provided link id 



There's a todo comment to use mac80211 provided link id. As mac80211 now
provides it use it in ath12k and remove the comment.

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 avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://patch.msgid.link/20241126171139.2350704-11-kvalo@kernel.org
parent ad969bc9

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

+9 −13
Original line number Diff line number Diff line
@@ -5696,7 +5696,7 @@ static int ath12k_mac_op_sta_set_txpwr(struct ieee80211_hw *hw, 
	return ret;

}



static void ath12k_mac_op_sta_rc_update(struct ieee80211_hw *hw,

static void ath12k_mac_op_link_sta_rc_update(struct ieee80211_hw *hw,

					     struct ieee80211_vif *vif,

					     struct ieee80211_link_sta *link_sta,

					     u32 changed)
@@ -5710,27 +5710,23 @@ static void ath12k_mac_op_sta_rc_update(struct ieee80211_hw *hw, 
	struct ath12k_link_vif *arvif;

	struct ath12k_peer *peer;

	u32 bw, smps;

	/* TODO: use proper link id once link sta specific rc update support is

	 * available in mac80211.

	 */

	u8 link_id = ATH12K_DEFAULT_LINK_ID;



	rcu_read_lock();

	arvif = rcu_dereference(ahvif->link[link_id]);

	arvif = rcu_dereference(ahvif->link[link_sta->link_id]);

	if (!arvif) {

		ath12k_hw_warn(ah, "mac sta rc update failed to fetch link vif on link id %u for peer %pM\n",

			       link_id, sta->addr);

			       link_sta->link_id, sta->addr);

		rcu_read_unlock();

		return;

	}



	ar = arvif->ar;



	arsta = rcu_dereference(ahsta->link[link_id]);

	arsta = rcu_dereference(ahsta->link[link_sta->link_id]);

	if (!arsta) {

		rcu_read_unlock();

		ath12k_warn(ar->ab, "mac sta rc update failed to fetch link sta on link id %u for peer %pM\n",

			    link_id, sta->addr);

			    link_sta->link_id, sta->addr);

		return;

	}

	spin_lock_bh(&ar->ab->base_lock);
@@ -10165,7 +10161,7 @@ static const struct ieee80211_ops ath12k_ops = { 
	.set_rekey_data	                = ath12k_mac_op_set_rekey_data,

	.sta_state                      = ath12k_mac_op_sta_state,

	.sta_set_txpwr			= ath12k_mac_op_sta_set_txpwr,

	.link_sta_rc_update		= ath12k_mac_op_sta_rc_update,

	.link_sta_rc_update		= ath12k_mac_op_link_sta_rc_update,

	.conf_tx                        = ath12k_mac_op_conf_tx,

	.set_antenna			= ath12k_mac_op_set_antenna,

	.get_antenna			= ath12k_mac_op_get_antenna,