summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2026-10-06 22:59:28 +0200
committerFelix Fietkau <nbd@nbd.name>2026-10-07 12:50:44 +0200
commitd07675fcbf2bedb6ae58368276b2e8652bda8e99 (patch)
tree965fbf2bc1b34d6f5501766552d79f210eae9c59 /drivers
parentad8e618e4474dda22936a52757838ff990e6cda1 (diff)
wifi: mt76: mt7996: record the connection state of a station
mt7996_sta_state() turns the station state transitions into STA_REC updates for the links of the station, but the driver keeps no record of the state that the station reached. A link that is added after association needs that state to be brought up to the same level as the other links. Record the connection state after each station event, and lower it to CONN_STATE_CONNECT when the station leaves IEEE80211_STA_AUTHORIZED, for example when hostapd de-authorizes it for a re-authentication. No functional change on its own. Link: https://patch.msgid.link/20261006205936.669125-19-nbd@nbd.name Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt7996/main.c30
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h1
2 files changed, 30 insertions, 1 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/main.c b/drivers/net/wireless/mediatek/mt76/mt7996/main.c
index a23d148eafa6..7792c3a878af 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/main.c
@@ -1472,6 +1472,7 @@ mt7996_mac_sta_add(struct mt7996_dev *dev, struct ieee80211_vif *vif,
msta->deflink_id = IEEE80211_LINK_UNSPECIFIED;
msta->seclink_id = IEEE80211_LINK_UNSPECIFIED;
+ msta->conn_state = CONN_STATE_DISCONNECT;
msta->vif = mvif;
err = mt7996_mac_sta_add_links(dev, vif, sta, links);
@@ -1569,11 +1570,27 @@ mt7996_mac_sta_event(struct mt7996_dev *dev, struct ieee80211_vif *vif,
int err;
mutex_lock(&dev->mt76.mutex);
+
err = mt7996_mac_sta_links_event(dev, vif, sta,
mt7996_mac_sta_links(dev, vif, sta),
ev);
- if (!err && ev == MT76_STA_EVENT_DISASSOC)
+ if (err)
+ goto out;
+
+ switch (ev) {
+ case MT76_STA_EVENT_ASSOC:
+ msta->conn_state = CONN_STATE_CONNECT;
+ break;
+ case MT76_STA_EVENT_AUTHORIZE:
+ msta->conn_state = CONN_STATE_PORT_SECURE;
+ break;
+ case MT76_STA_EVENT_DISASSOC:
+ msta->conn_state = CONN_STATE_DISCONNECT;
mt7996_mac_sta_clear_connected(dev, msta);
+ break;
+ }
+
+out:
mutex_unlock(&dev->mt76.mutex);
return err;
@@ -1650,6 +1667,17 @@ mt7996_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
new_state == IEEE80211_STA_NOTEXIST)
mt7996_mac_sta_remove(dev, vif, sta);
+ if (old_state == IEEE80211_STA_AUTHORIZED &&
+ new_state == IEEE80211_STA_ASSOC) {
+ struct mt7996_sta *msta = (struct mt7996_sta *)sta->drv_priv;
+
+ mutex_lock(&dev->mt76.mutex);
+ msta->conn_state = CONN_STATE_CONNECT;
+ mutex_unlock(&dev->mt76.mutex);
+
+ return 0;
+ }
+
if (old_state == IEEE80211_STA_AUTH &&
new_state == IEEE80211_STA_ASSOC) {
mt7996_set_active_links(vif);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
index ec453f5ff3a5..ead211391404 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
@@ -269,6 +269,7 @@ struct mt7996_sta {
struct mt7996_sta_link __rcu *link[IEEE80211_MLD_MAX_NUM_LINKS];
u8 deflink_id;
u8 seclink_id;
+ u8 conn_state;
unsigned long wcid_flags;