Commit b73e1d92 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

wifi: mt76: mt7915: move poll_list in mt76_wcid 



poll_list field is used by most of the drivers, so move it in mt76_wcid
structure.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 419acc51

drivers/net/wireless/mediatek/mt76/mt76.h

+2 −0
Original line number Diff line number Diff line
@@ -336,6 +336,8 @@ struct mt76_wcid { 
	struct idr pktid;



	struct mt76_sta_stats stats;



	struct list_head poll_list;

};



struct mt76_txq {

drivers/net/wireless/mediatek/mt76/mt7915/mac.c

+10 −10
Original line number Diff line number Diff line
@@ -124,8 +124,8 @@ static void mt7915_mac_sta_poll(struct mt7915_dev *dev) 
			break;

		}

		msta = list_first_entry(&sta_poll_list,

					struct mt7915_sta, poll_list);

		list_del_init(&msta->poll_list);

					struct mt7915_sta, wcid.poll_list);

		list_del_init(&msta->wcid.poll_list);

		spin_unlock_bh(&dev->mt76.sta_poll_lock);



		idx = msta->wcid.idx;
@@ -327,8 +327,8 @@ mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb, 
	if (status->wcid) {

		msta = container_of(status->wcid, struct mt7915_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);

	}
@@ -894,8 +894,8 @@ mt7915_txwi_free(struct mt7915_dev *dev, struct mt76_txwi_cache *t, 
			sta = container_of((void *)msta, struct ieee80211_sta,

					  drv_priv);

			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);

		}
@@ -990,8 +990,8 @@ mt7915_mac_tx_free(struct mt7915_dev *dev, void *data, int len) 


			msta = container_of(wcid, struct mt7915_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;
@@ -1103,8 +1103,8 @@ static void mt7915_mac_add_txs(struct mt7915_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:

drivers/net/wireless/mediatek/mt76/mt7915/main.c

+6 −6
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static int mt7915_add_interface(struct ieee80211_hw *hw, 
	idx = MT7915_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 = ext_phy;

	mvif->sta.wcid.hw_key_idx = -1;
@@ -309,8 +309,8 @@ static void mt7915_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);
@@ -714,7 +714,7 @@ int mt7915_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;
@@ -750,8 +750,8 @@ void mt7915_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif, 
		mt7915_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);

drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h

+0 −1
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ struct mt7915_sta { 


	struct mt7915_vif *vif;



	struct list_head poll_list;

	struct list_head rc_list;

	u32 airtime_ac[8];