Skip to content

Commit 7b3b9ac

Browse files
ilanpeer2jmberg-intel
authored andcommitted
wifi: mac80211: Use active_links instead of valid_links in Tx
Fix few places on the Tx path where the valid_links were used instead of active links. Signed-off-by: Ilan Peer <ilan.peer@intel.com> Signed-off-by: Gregory Greenman <gregory.greenman@intel.com> Link: https://lore.kernel.org/r/20230608163202.e24832691fc8.I9ac10dc246d7798a8d26b1a94933df5668df63fc@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1 parent 34d4e3e commit 7b3b9ac

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

net/mac80211/tx.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4445,7 +4445,7 @@ static void ieee80211_mlo_multicast_tx(struct net_device *dev,
44454445
struct sk_buff *skb)
44464446
{
44474447
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
4448-
unsigned long links = sdata->vif.valid_links;
4448+
unsigned long links = sdata->vif.active_links;
44494449
unsigned int link;
44504450
u32 ctrl_flags = IEEE80211_TX_CTRL_MCAST_MLO_FIRST_TX;
44514451

@@ -6040,7 +6040,7 @@ void __ieee80211_tx_skb_tid_band(struct ieee80211_sub_if_data *sdata,
60406040
rcu_read_unlock();
60416041

60426042
if (WARN_ON_ONCE(link == ARRAY_SIZE(sdata->vif.link_conf)))
6043-
link = ffs(sdata->vif.valid_links) - 1;
6043+
link = ffs(sdata->vif.active_links) - 1;
60446044
}
60456045

60466046
IEEE80211_SKB_CB(skb)->control.flags |=
@@ -6076,7 +6076,7 @@ void ieee80211_tx_skb_tid(struct ieee80211_sub_if_data *sdata,
60766076
band = chanctx_conf->def.chan->band;
60776077
} else {
60786078
WARN_ON(link_id >= 0 &&
6079-
!(sdata->vif.valid_links & BIT(link_id)));
6079+
!(sdata->vif.active_links & BIT(link_id)));
60806080
/* MLD transmissions must not rely on the band */
60816081
band = 0;
60826082
}

0 commit comments

Comments
 (0)