github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-27 08:33:17 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

wifi: mt76: mt7996: Move num_sta accounting in mt7996_mac_sta_{add,remove}_links

Browse Source 
Move phy num_sta accounting in mt7996_mac_sta_add() and
mt7996_mac_sta_remove() routines in order to take into account all
possibles MLO links.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/20250704-mt7996-mlo-fixes-v1-9-356456c73f43@kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Lorenzo Bianconi 2025-07-04 15:08:13 +02:00 committed by Felix Fietkau
parent 62da647a2b
commit 344dd6a4c9
1 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
drivers/net/wireless/mediatek/mt76/mt7996/main.c
View File

@ -960,8 +960,8 @@ mt7996_mac_sta_deinit_link(struct mt7996_dev *dev,
} }
static void static void
mt7996_mac_sta_remove_links(struct mt7996_dev *dev, struct ieee80211_sta *sta, mt7996_mac_sta_remove_links(struct mt7996_dev *dev, struct ieee80211_vif *vif,
unsigned long links) struct ieee80211_sta *sta, unsigned long links)
{ {
struct mt7996_sta *msta = (struct mt7996_sta *)sta->drv_priv; struct mt7996_sta *msta = (struct mt7996_sta *)sta->drv_priv;
struct mt76_dev *mdev = &dev->mt76; struct mt76_dev *mdev = &dev->mt76;
@ -969,6 +969,8 @@ mt7996_mac_sta_remove_links(struct mt7996_dev *dev, struct ieee80211_sta *sta,
for_each_set_bit(link_id, &links, IEEE80211_MLD_MAX_NUM_LINKS) { for_each_set_bit(link_id, &links, IEEE80211_MLD_MAX_NUM_LINKS) {
struct mt7996_sta_link *msta_link = NULL; struct mt7996_sta_link *msta_link = NULL;
struct mt7996_vif_link *link;
struct mt76_phy *mphy;
msta_link = rcu_replace_pointer(msta->link[link_id], msta_link, msta_link = rcu_replace_pointer(msta->link[link_id], msta_link,
lockdep_is_held(&mdev->mutex)); lockdep_is_held(&mdev->mutex));
@ -976,6 +978,15 @@ mt7996_mac_sta_remove_links(struct mt7996_dev *dev, struct ieee80211_sta *sta,
continue; continue;
mt7996_mac_sta_deinit_link(dev, msta_link); mt7996_mac_sta_deinit_link(dev, msta_link);
link = mt7996_vif_link(dev, vif, link_id);
if (!link)
continue;
mphy = mt76_vif_link_phy(&link->mt76);
if (!mphy)
continue;
mphy->num_sta--;
if (msta->deflink_id == link_id) { if (msta->deflink_id == link_id) {
msta->deflink_id = IEEE80211_LINK_UNSPECIFIED; msta->deflink_id = IEEE80211_LINK_UNSPECIFIED;
continue; continue;
@ -997,6 +1008,7 @@ mt7996_mac_sta_add_links(struct mt7996_dev *dev, struct ieee80211_vif *vif,
struct ieee80211_bss_conf *link_conf; struct ieee80211_bss_conf *link_conf;
struct ieee80211_link_sta *link_sta; struct ieee80211_link_sta *link_sta;
struct mt7996_vif_link *link; struct mt7996_vif_link *link;
struct mt76_phy *mphy;
if (rcu_access_pointer(msta->link[link_id])) if (rcu_access_pointer(msta->link[link_id]))
continue; continue;
@ -1023,12 +1035,19 @@ mt7996_mac_sta_add_links(struct mt7996_dev *dev, struct ieee80211_vif *vif,
link_id); link_id);
if (err) if (err)
goto error_unlink; goto error_unlink;
mphy = mt76_vif_link_phy(&link->mt76);
if (!mphy) {
err = -EINVAL;
goto error_unlink;
}
mphy->num_sta++;
} }
return 0; return 0;
error_unlink: error_unlink:
mt7996_mac_sta_remove_links(dev, sta, new_links); mt7996_mac_sta_remove_links(dev, vif, sta, new_links);
return err; return err;
} }
@ -1045,7 +1064,7 @@ mt7996_mac_sta_change_links(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
mutex_lock(&dev->mt76.mutex); mutex_lock(&dev->mt76.mutex);
mt7996_mac_sta_remove_links(dev, sta, rem); mt7996_mac_sta_remove_links(dev, vif, sta, rem);
ret = mt7996_mac_sta_add_links(dev, vif, sta, add); ret = mt7996_mac_sta_add_links(dev, vif, sta, add);
mutex_unlock(&dev->mt76.mutex); mutex_unlock(&dev->mt76.mutex);
@ -1054,25 +1073,21 @@ mt7996_mac_sta_change_links(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
} }
static int static int
mt7996_mac_sta_add(struct mt76_phy *mphy, struct ieee80211_vif *vif, mt7996_mac_sta_add(struct mt7996_dev *dev, struct ieee80211_vif *vif,
struct ieee80211_sta *sta) struct ieee80211_sta *sta)
{ {
struct mt76_dev *mdev = mphy->dev;
struct mt7996_dev *dev = container_of(mdev, struct mt7996_dev, mt76);
struct mt7996_sta *msta = (struct mt7996_sta *)sta->drv_priv; struct mt7996_sta *msta = (struct mt7996_sta *)sta->drv_priv;
struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv; struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv;
unsigned long links = sta->valid_links ? sta->valid_links : BIT(0); unsigned long links = sta->valid_links ? sta->valid_links : BIT(0);
int err; int err;
mutex_lock(&mdev->mutex); mutex_lock(&dev->mt76.mutex);
msta->deflink_id = IEEE80211_LINK_UNSPECIFIED; msta->deflink_id = IEEE80211_LINK_UNSPECIFIED;
msta->vif = mvif; msta->vif = mvif;
err = mt7996_mac_sta_add_links(dev, vif, sta, links); err = mt7996_mac_sta_add_links(dev, vif, sta, links);
if (!err)
mphy->num_sta++;
mutex_unlock(&mdev->mutex); mutex_unlock(&dev->mt76.mutex);
return err; return err;
} }
@ -1150,19 +1165,14 @@ mt7996_mac_sta_event(struct mt7996_dev *dev, struct ieee80211_vif *vif,
} }
static void static void
mt7996_mac_sta_remove(struct mt76_phy *mphy, struct ieee80211_vif *vif, mt7996_mac_sta_remove(struct mt7996_dev *dev, struct ieee80211_vif *vif,
struct ieee80211_sta *sta) struct ieee80211_sta *sta)
{ {
struct mt76_dev *mdev = mphy->dev;
struct mt7996_dev *dev = container_of(mdev, struct mt7996_dev, mt76);
unsigned long links = sta->valid_links ? sta->valid_links : BIT(0); unsigned long links = sta->valid_links ? sta->valid_links : BIT(0);
mutex_lock(&mdev->mutex); mutex_lock(&dev->mt76.mutex);
mt7996_mac_sta_remove_links(dev, vif, sta, links);
mt7996_mac_sta_remove_links(dev, sta, links); mutex_unlock(&dev->mt76.mutex);
mphy->num_sta--;
mutex_unlock(&mdev->mutex);
} }
static int static int
@ -1170,20 +1180,16 @@ mt7996_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
struct ieee80211_sta *sta, enum ieee80211_sta_state old_state, struct ieee80211_sta *sta, enum ieee80211_sta_state old_state,
enum ieee80211_sta_state new_state) enum ieee80211_sta_state new_state)
{ {
struct mt76_phy *mphy = mt76_vif_phy(hw, vif);
struct mt7996_dev *dev = mt7996_hw_dev(hw); struct mt7996_dev *dev = mt7996_hw_dev(hw);
enum mt76_sta_event ev; enum mt76_sta_event ev;
if (!mphy)
return -EINVAL;
if (old_state == IEEE80211_STA_NOTEXIST && if (old_state == IEEE80211_STA_NOTEXIST &&
new_state == IEEE80211_STA_NONE) new_state == IEEE80211_STA_NONE)
return mt7996_mac_sta_add(mphy, vif, sta); return mt7996_mac_sta_add(dev, vif, sta);
if (old_state == IEEE80211_STA_NONE && if (old_state == IEEE80211_STA_NONE &&
new_state == IEEE80211_STA_NOTEXIST) new_state == IEEE80211_STA_NOTEXIST)
mt7996_mac_sta_remove(mphy, vif, sta); mt7996_mac_sta_remove(dev, vif, sta);
if (old_state == IEEE80211_STA_AUTH && if (old_state == IEEE80211_STA_AUTH &&
new_state == IEEE80211_STA_ASSOC) new_state == IEEE80211_STA_ASSOC)