mt76: add mt76_sta_remove helper (723b90dc) · Commits · 戴 / test

drivers/net/wireless/mediatek/mt76/mac80211.c

+19 −0

Original line number	Diff line number	Diff line
		@@ -630,3 +630,22 @@ void mt76_rx_poll_complete(struct mt76_dev *dev, enum mt76_rxq_id q,
		mt76_rx_complete(dev, &frames, napi);
		}
		EXPORT_SYMBOL_GPL(mt76_rx_poll_complete);

		void mt76_sta_remove(struct mt76_dev dev, struct ieee80211_vif vif,
		struct ieee80211_sta *sta)
		{
		struct mt76_wcid wcid = (struct mt76_wcid )sta->drv_priv;
		int idx = wcid->idx;
		int i;

		rcu_assign_pointer(dev->wcid[idx], NULL);
		synchronize_rcu();

		mutex_lock(&dev->mutex);
		mt76_tx_status_check(dev, wcid, true);
		for (i = 0; i < ARRAY_SIZE(sta->txq); i++)
		mt76_txq_remove(dev, sta->txq[i]);
		mt76_wcid_free(dev->wcid_mask, idx);
		mutex_unlock(&dev->mutex);
		}
		EXPORT_SYMBOL_GPL(mt76_sta_remove);

+2 −0

Original line number	Diff line number	Diff line
		@@ -664,6 +664,8 @@ void mt76_tx_status_skb_done(struct mt76_dev dev, struct sk_buff skb,
		void mt76_tx_complete_skb(struct mt76_dev dev, struct sk_buff skb);
		void mt76_tx_status_check(struct mt76_dev dev, struct mt76_wcid wcid,
		bool flush);
		void mt76_sta_remove(struct mt76_dev dev, struct ieee80211_vif vif,
		struct ieee80211_sta *sta);

		struct ieee80211_sta mt76_rx_convert(struct sk_buff skb);

+3 −9

Original line number	Diff line number	Diff line
		@@ -212,19 +212,13 @@ int mt76x02_sta_remove(struct ieee80211_hw hw, struct ieee80211_vif vif,
		struct ieee80211_sta *sta)
		{
		struct mt76x02_dev *dev = hw->priv;
		struct mt76x02_sta msta = (struct mt76x02_sta )sta->drv_priv;
		int idx = msta->wcid.idx;
		int i;
		struct mt76_wcid wcid = (struct mt76_wcid )sta->drv_priv;
		int idx = wcid->idx;

		rcu_assign_pointer(dev->mt76.wcid[idx], NULL);
		synchronize_rcu();
		mt76_sta_remove(&dev->mt76, vif, sta);

		mutex_lock(&dev->mt76.mutex);
		mt76_tx_status_check(&dev->mt76, &msta->wcid, true);
		for (i = 0; i < ARRAY_SIZE(sta->txq); i++)
		mt76_txq_remove(&dev->mt76, sta->txq[i]);
		mt76x02_mac_wcid_set_drop(dev, idx, true);
		mt76_wcid_free(dev->mt76.wcid_mask, idx);
		mt76x02_mac_wcid_setup(dev, idx, 0, NULL);
		mutex_unlock(&dev->mt76.mutex);