Commit 7b3b9ac8 authored by Ilan Peer's avatar Ilan Peer Committed by Johannes Berg

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: default avatarIlan Peer <ilan.peer@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230608163202.e24832691fc8.I9ac10dc246d7798a8d26b1a94933df5668df63fc@changeidSigned-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 34d4e3eb
...@@ -4445,7 +4445,7 @@ static void ieee80211_mlo_multicast_tx(struct net_device *dev, ...@@ -4445,7 +4445,7 @@ static void ieee80211_mlo_multicast_tx(struct net_device *dev,
struct sk_buff *skb) struct sk_buff *skb)
{ {
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
unsigned long links = sdata->vif.valid_links; unsigned long links = sdata->vif.active_links;
unsigned int link; unsigned int link;
u32 ctrl_flags = IEEE80211_TX_CTRL_MCAST_MLO_FIRST_TX; u32 ctrl_flags = IEEE80211_TX_CTRL_MCAST_MLO_FIRST_TX;
...@@ -6040,7 +6040,7 @@ void __ieee80211_tx_skb_tid_band(struct ieee80211_sub_if_data *sdata, ...@@ -6040,7 +6040,7 @@ void __ieee80211_tx_skb_tid_band(struct ieee80211_sub_if_data *sdata,
rcu_read_unlock(); rcu_read_unlock();
if (WARN_ON_ONCE(link == ARRAY_SIZE(sdata->vif.link_conf))) if (WARN_ON_ONCE(link == ARRAY_SIZE(sdata->vif.link_conf)))
link = ffs(sdata->vif.valid_links) - 1; link = ffs(sdata->vif.active_links) - 1;
} }
IEEE80211_SKB_CB(skb)->control.flags |= IEEE80211_SKB_CB(skb)->control.flags |=
...@@ -6076,7 +6076,7 @@ void ieee80211_tx_skb_tid(struct ieee80211_sub_if_data *sdata, ...@@ -6076,7 +6076,7 @@ void ieee80211_tx_skb_tid(struct ieee80211_sub_if_data *sdata,
band = chanctx_conf->def.chan->band; band = chanctx_conf->def.chan->band;
} else { } else {
WARN_ON(link_id >= 0 && WARN_ON(link_id >= 0 &&
!(sdata->vif.valid_links & BIT(link_id))); !(sdata->vif.active_links & BIT(link_id)));
/* MLD transmissions must not rely on the band */ /* MLD transmissions must not rely on the band */
band = 0; band = 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment