wifi: mt76: mt7996: rely on shared poll_list field

Rely on poll_list field in mt76_wcid  structure and get rid of
private copy.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
index 46b1dbcb4b458985325915459c51d540d59430e7..2adc2599d64d2d2c62738de8d360b09eb1eaacb8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
@@ -130,8 +130,8 @@ static void mt7996_mac_sta_poll(struct mt7996_dev *dev)
                        break;
                }
                msta = list_first_entry(&sta_poll_list,
-                                       struct mt7996_sta, poll_list);
-               list_del_init(&msta->poll_list);
+                                       struct mt7996_sta, wcid.poll_list);
+               list_del_init(&msta->wcid.poll_list);
                spin_unlock_bh(&dev->mt76.sta_poll_lock);
 
                idx = msta->wcid.idx;
@@ -682,8 +682,8 @@ mt7996_mac_fill_rx(struct mt7996_dev *dev, struct sk_buff *skb)
 
                msta = container_of(status->wcid, struct mt7996_sta, wcid);
                spin_lock_bh(&dev->mt76.sta_poll_lock);
-               if (list_empty(&msta->poll_list))
-                       list_add_tail(&msta->poll_list,
+               if (list_empty(&msta->wcid.poll_list))
+                       list_add_tail(&msta->wcid.poll_list,
                                      &dev->mt76.sta_poll_list);
                spin_unlock_bh(&dev->mt76.sta_poll_lock);
        }
@@ -1293,8 +1293,8 @@ mt7996_mac_tx_free(struct mt7996_dev *dev, void *data, int len)
 
                        msta = container_of(wcid, struct mt7996_sta, wcid);
                        spin_lock_bh(&mdev->sta_poll_lock);
-                       if (list_empty(&msta->poll_list))
-                               list_add_tail(&msta->poll_list,
+                       if (list_empty(&msta->wcid.poll_list))
+                               list_add_tail(&msta->wcid.poll_list,
                                              &mdev->sta_poll_list);
                        spin_unlock_bh(&mdev->sta_poll_lock);
                        continue;
@@ -1502,8 +1502,8 @@ static void mt7996_mac_add_txs(struct mt7996_dev *dev, void *data)
                goto out;
 
        spin_lock_bh(&dev->mt76.sta_poll_lock);
-       if (list_empty(&msta->poll_list))
-               list_add_tail(&msta->poll_list, &dev->mt76.sta_poll_list);
+       if (list_empty(&msta->wcid.poll_list))
+               list_add_tail(&msta->wcid.poll_list, &dev->mt76.sta_poll_list);
        spin_unlock_bh(&dev->mt76.sta_poll_lock);
 
 out:

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/main.c b/drivers/net/wireless/mediatek/mt76/mt7996/main.c
index 975aac210a7dd17c0430ce6dce200000b2e61209..69b47136b8d7e1cecc2ad90d511d8618e1e5a26e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/main.c
@@ -202,7 +202,7 @@ static int mt7996_add_interface(struct ieee80211_hw *hw,
        idx = MT7996_WTBL_RESERVED - mvif->mt76.idx;
 
        INIT_LIST_HEAD(&mvif->sta.rc_list);
-       INIT_LIST_HEAD(&mvif->sta.poll_list);
+       INIT_LIST_HEAD(&mvif->sta.wcid.poll_list);
        mvif->sta.wcid.idx = idx;
        mvif->sta.wcid.phy_idx = band_idx;
        mvif->sta.wcid.hw_key_idx = -1;
@@ -264,8 +264,8 @@ static void mt7996_remove_interface(struct ieee80211_hw *hw,
        mutex_unlock(&dev->mt76.mutex);
 
        spin_lock_bh(&dev->mt76.sta_poll_lock);
-       if (!list_empty(&msta->poll_list))
-               list_del_init(&msta->poll_list);
+       if (!list_empty(&msta->wcid.poll_list))
+               list_del_init(&msta->wcid.poll_list);
        spin_unlock_bh(&dev->mt76.sta_poll_lock);
 
        mt76_packet_id_flush(&dev->mt76, &msta->wcid);
@@ -654,7 +654,7 @@ int mt7996_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
                return -ENOSPC;
 
        INIT_LIST_HEAD(&msta->rc_list);
-       INIT_LIST_HEAD(&msta->poll_list);
+       INIT_LIST_HEAD(&msta->wcid.poll_list);
        msta->vif = mvif;
        msta->wcid.sta = 1;
        msta->wcid.idx = idx;
@@ -690,8 +690,8 @@ void mt7996_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,
                mt7996_mac_twt_teardown_flow(dev, msta, i);
 
        spin_lock_bh(&mdev->sta_poll_lock);
-       if (!list_empty(&msta->poll_list))
-               list_del_init(&msta->poll_list);
+       if (!list_empty(&msta->wcid.poll_list))
+               list_del_init(&msta->wcid.poll_list);
        if (!list_empty(&msta->rc_list))
                list_del_init(&msta->rc_list);
        spin_unlock_bh(&mdev->sta_poll_lock);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
index b45a9eecd71e776312b955d3c13c11842f2e9ea3..e67d57a844267f6bf3eea3f3fb9f2c4e2f9d6be3 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
@@ -103,7 +103,6 @@ struct mt7996_sta {
 
        struct mt7996_vif *vif;
 
-       struct list_head poll_list;
        struct list_head rc_list;
        u32 airtime_ac[8];