wifi: mt76: mt7921: 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/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
index 773db10..c00342e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
@@ -84,8 +84,8 @@ static void mt7921_mac_sta_poll(struct mt7921_dev *dev)
                        break;
                }
                msta = list_first_entry(&sta_poll_list,
-                                       struct mt7921_sta, poll_list);
-               list_del_init(&msta->poll_list);
+                                       struct mt7921_sta, wcid.poll_list);
+               list_del_init(&msta->wcid.poll_list);
                spin_unlock_bh(&dev->mt76.sta_poll_lock);
 
                idx = msta->wcid.idx;
@@ -281,8 +281,8 @@ mt7921_mac_fill_rx(struct mt7921_dev *dev, struct sk_buff *skb)
        if (status->wcid) {
                msta = container_of(status->wcid, struct mt7921_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);
        }
@@ -568,8 +568,8 @@ void mt7921_mac_add_txs(struct mt7921_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:
@@ -649,8 +649,8 @@ static void mt7921_mac_tx_free(struct mt7921_dev *dev, void *data, int len)
 
                        msta = container_of(wcid, struct mt7921_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;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
index a5e6666..49053d0 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
@@ -313,7 +313,7 @@ static int mt7921_add_interface(struct ieee80211_hw *hw,
 
        idx = MT7921_WTBL_RESERVED - mvif->mt76.idx;
 
-       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 = mvif->mt76.band_idx;
        mvif->sta.wcid.hw_key_idx = -1;
@@ -358,8 +358,8 @@ static void mt7921_remove_interface(struct ieee80211_hw *hw,
        mt7921_mutex_release(dev);
 
        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);
@@ -764,7 +764,7 @@ int mt7921_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
        if (idx < 0)
                return -ENOSPC;
 
-       INIT_LIST_HEAD(&msta->poll_list);
+       INIT_LIST_HEAD(&msta->wcid.poll_list);
        msta->vif = mvif;
        msta->wcid.sta = 1;
        msta->wcid.idx = idx;
@@ -843,8 +843,8 @@ void mt7921_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,
        }
 
        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_connac_power_save_sched(&dev->mphy, &dev->pm);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
index 2080396..fe4de77 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
@@ -150,7 +150,6 @@ struct mt7921_sta {
 
        struct mt7921_vif *vif;
 
-       struct list_head poll_list;
        u32 airtime_ac[8];
 
        int ack_signal;