mirror of
https://github.com/outbackdingo/mt76.git
synced 2026-10-24 13:26:48 +00:00
wifi: mt76: mt7996: Rely on for_each_sta_active_link() in mt7996_mcu_sta_mld_setup_tlv()
Reuse for_each_sta_active_link utility macro in mt7996_mcu_sta_mld_setup_tlv routine. Signed-off-by: Lorenzo Bianconi <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
committed by
Felix Fietkau
parent
7b3cd3274a
commit
cf89b62180
+7
-7
@@ -2299,15 +2299,15 @@ mt7996_mcu_add_group(struct mt7996_dev *dev, struct ieee80211_vif *vif,
|
||||
|
||||
static void
|
||||
mt7996_mcu_sta_mld_setup_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
|
||||
struct ieee80211_vif *vif,
|
||||
struct ieee80211_sta *sta)
|
||||
{
|
||||
struct mt7996_sta *msta = (struct mt7996_sta *)sta->drv_priv;
|
||||
unsigned long links = sta->valid_links;
|
||||
unsigned int nlinks = hweight16(links);
|
||||
unsigned int nlinks = hweight16(sta->valid_links);
|
||||
struct mld_setup_link *mld_setup_link;
|
||||
struct ieee80211_link_sta *link_sta;
|
||||
struct sta_rec_mld_setup *mld_setup;
|
||||
struct mt7996_sta_link *msta_link;
|
||||
struct ieee80211_vif *vif;
|
||||
unsigned int link_id;
|
||||
struct tlv *tlv;
|
||||
|
||||
@@ -2325,7 +2325,7 @@ mt7996_mcu_sta_mld_setup_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
|
||||
mld_setup->primary_id = cpu_to_le16(msta_link->wcid.idx);
|
||||
|
||||
if (nlinks > 1) {
|
||||
link_id = __ffs(links & ~BIT(msta->deflink_id));
|
||||
link_id = __ffs(sta->valid_links & ~BIT(msta->deflink_id));
|
||||
msta_link = mt76_dereference(msta->link[link_id], &dev->mt76);
|
||||
if (!msta_link)
|
||||
return;
|
||||
@@ -2333,9 +2333,8 @@ mt7996_mcu_sta_mld_setup_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
|
||||
mld_setup->seconed_id = cpu_to_le16(msta_link->wcid.idx);
|
||||
mld_setup->link_num = nlinks;
|
||||
|
||||
vif = container_of((void *)msta->vif, struct ieee80211_vif, drv_priv);
|
||||
mld_setup_link = (struct mld_setup_link *)mld_setup->link_info;
|
||||
for_each_set_bit(link_id, &links, IEEE80211_MLD_MAX_NUM_LINKS) {
|
||||
for_each_sta_active_link(vif, sta, link_sta, link_id) {
|
||||
struct mt7996_vif_link *link;
|
||||
|
||||
msta_link = mt76_dereference(msta->link[link_id], &dev->mt76);
|
||||
@@ -2427,7 +2426,8 @@ int mt7996_mcu_add_sta(struct mt7996_dev *dev,
|
||||
mt7996_mcu_sta_muru_tlv(dev, skb, link_conf, link_sta);
|
||||
|
||||
if (sta->mlo) {
|
||||
mt7996_mcu_sta_mld_setup_tlv(dev, skb, sta);
|
||||
mt7996_mcu_sta_mld_setup_tlv(dev, skb, link_conf->vif,
|
||||
sta);
|
||||
mt7996_mcu_sta_eht_mld_tlv(dev, skb, sta);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user