Commit 516ea2a2 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Kalle Valo
Browse files

mt76: use mac_wcid_set_drop in mt76x0 



Move mt76x02_mac_wcid_set_drop to common code and use it in mt76x0.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 32bb405f

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

+2 −1
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ mt76x0_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	msta->wcid.idx = idx;

	msta->wcid.hw_key_idx = -1;

	mt76x02_mac_wcid_setup(&dev->mt76, idx, mvif->idx, sta->addr);

	mt76x02_mac_wcid_set_drop(&dev->mt76, idx, false);

	mt76_clear(dev, MT_WCID_DROP(idx), MT_WCID_DROP_MASK(idx));

	rcu_assign_pointer(dev->wcid[idx], &msta->wcid);

	mt76x0_mac_set_ampdu_factor(dev);
@@ -195,7 +196,7 @@ mt76x0_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 


	mutex_lock(&dev->mt76.mutex);

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

	mt76_set(dev, MT_WCID_DROP(idx), MT_WCID_DROP_MASK(idx));

	mt76x02_mac_wcid_set_drop(&dev->mt76, idx, true);

	dev->wcid_mask[idx / BITS_PER_LONG] &= ~BIT(idx % BITS_PER_LONG);

	mt76x02_mac_wcid_setup(&dev->mt76, idx, 0, NULL);

	mt76x0_mac_set_ampdu_factor(dev);

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

+11 −0
Original line number Diff line number Diff line
@@ -119,3 +119,14 @@ void mt76x02_mac_wcid_setup(struct mt76_dev *dev, u8 idx, u8 vif_idx, u8 *mac) 
	__mt76_wr_copy(dev, MT_WCID_ADDR(idx), &addr, sizeof(addr));

}

EXPORT_SYMBOL_GPL(mt76x02_mac_wcid_setup);



void mt76x02_mac_wcid_set_drop(struct mt76_dev *dev, u8 idx, bool drop)

{

	u32 val = __mt76_rr(dev, MT_WCID_DROP(idx));

	u32 bit = MT_WCID_DROP_MASK(idx);



	/* prevent unnecessary writes */

	if ((val & bit) != (bit * drop))

		__mt76_wr(dev, MT_WCID_DROP(idx), (val & ~bit) | (bit * drop));

}

EXPORT_SYMBOL_GPL(mt76x02_mac_wcid_set_drop);

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

+1 −0
Original line number Diff line number Diff line
@@ -47,4 +47,5 @@ int mt76x02_mac_shared_key_setup(struct mt76_dev *dev, u8 vif_idx, u8 key_idx, 
int mt76x02_mac_wcid_set_key(struct mt76_dev *dev, u8 idx,

			    struct ieee80211_key_conf *key);

void mt76x02_mac_wcid_setup(struct mt76_dev *dev, u8 idx, u8 vif_idx, u8 *mac);

void mt76x02_mac_wcid_set_drop(struct mt76_dev *dev, u8 idx, bool drop);

#endif

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

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ int mt76x2_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	msta->wcid.idx = idx;

	msta->wcid.hw_key_idx = -1;

	mt76x02_mac_wcid_setup(&dev->mt76, idx, mvif->idx, sta->addr);

	mt76x2_mac_wcid_set_drop(dev, idx, false);

	mt76x02_mac_wcid_set_drop(&dev->mt76, idx, false);

	for (i = 0; i < ARRAY_SIZE(sta->txq); i++)

		mt76x2_txq_init(dev, sta->txq[i]);
@@ -146,7 +146,7 @@ int mt76x2_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	rcu_assign_pointer(dev->wcid[idx], NULL);

	for (i = 0; i < ARRAY_SIZE(sta->txq); i++)

		mt76_txq_remove(&dev->mt76, sta->txq[i]);

	mt76x2_mac_wcid_set_drop(dev, idx, true);

	mt76x02_mac_wcid_set_drop(&dev->mt76, idx, true);

	mt76_wcid_free(dev->wcid_mask, idx);

	mt76x02_mac_wcid_setup(&dev->mt76, idx, 0, NULL);

	mutex_unlock(&dev->mt76.mutex);

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

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ void mt76x2_mac_write_txwi(struct mt76x2_dev *dev, struct mt76x2_txwi *txwi, 
			   struct ieee80211_sta *sta, int len);

void mt76x2_mac_wcid_set_rate(struct mt76x2_dev *dev, struct mt76_wcid *wcid,

			      const struct ieee80211_tx_rate *rate);

void mt76x2_mac_wcid_set_drop(struct mt76x2_dev *dev, u8 idx, bool drop);



int mt76x2_mac_set_beacon(struct mt76x2_dev *dev, u8 vif_idx,

			  struct sk_buff *skb);

CRA Git | Maintained and supported by SUSTech CRA and CCSE