Commit 32bb405f authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Kalle Valo
Browse files

mt76: unify mac_wcid_setup 



Merge mt76x{0,2}_mac_wcid_setup into common code.

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

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

+0 −17
Original line number Diff line number Diff line
@@ -399,23 +399,6 @@ void mt76x0_mac_work(struct work_struct *work) 
	ieee80211_queue_delayed_work(dev->mt76.hw, &dev->mac_work, 10 * HZ);

}



void

mt76x0_mac_wcid_setup(struct mt76x0_dev *dev, u8 idx, u8 vif_idx, u8 *mac)

{

	u8 zmac[ETH_ALEN] = {};

	u32 attr;



	attr = FIELD_PREP(MT_WCID_ATTR_BSS_IDX, vif_idx & 7) |

	       FIELD_PREP(MT_WCID_ATTR_BSS_IDX_EXT, !!(vif_idx & 8));



	mt76_wr(dev, MT_WCID_ATTR(idx), attr);



	if (mac)

		memcpy(zmac, mac, sizeof(zmac));



	mt76x0_addr_wr(dev, MT_WCID_ADDR(idx), zmac);

}



void mt76x0_mac_set_ampdu_factor(struct mt76x0_dev *dev)

{

	struct ieee80211_sta *sta;

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

+3 −3
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ mt76x0_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 


	msta->wcid.idx = idx;

	msta->wcid.hw_key_idx = -1;

	mt76x0_mac_wcid_setup(dev, idx, mvif->idx, sta->addr);

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

	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);
@@ -197,7 +197,7 @@ mt76x0_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	rcu_assign_pointer(dev->wcid[idx], NULL);

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

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

	mt76x0_mac_wcid_setup(dev, idx, 0, NULL);

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

	mt76x0_mac_set_ampdu_factor(dev);

	mutex_unlock(&dev->mt76.mutex);

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

+0 −2
Original line number Diff line number Diff line
@@ -301,8 +301,6 @@ void mt76x0_mac_set_protection(struct mt76x0_dev *dev, bool legacy_prot, 
				int ht_mode);

void mt76x0_mac_set_short_preamble(struct mt76x0_dev *dev, bool short_preamb);

void mt76x0_mac_config_tsf(struct mt76x0_dev *dev, bool enable, int interval);

void

mt76x0_mac_wcid_setup(struct mt76x0_dev *dev, u8 idx, u8 vif_idx, u8 *mac);

void mt76x0_mac_set_ampdu_factor(struct mt76x0_dev *dev);



/* TX */

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

+23 −0
Original line number Diff line number Diff line
@@ -96,3 +96,26 @@ int mt76x02_mac_wcid_set_key(struct mt76_dev *dev, u8 idx, 
	return 0;

}

EXPORT_SYMBOL_GPL(mt76x02_mac_wcid_set_key);



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

{

	struct mt76_wcid_addr addr = {};

	u32 attr;



	attr = FIELD_PREP(MT_WCID_ATTR_BSS_IDX, vif_idx & 7) |

	       FIELD_PREP(MT_WCID_ATTR_BSS_IDX_EXT, !!(vif_idx & 8));



	__mt76_wr(dev, MT_WCID_ATTR(idx), attr);



	__mt76_wr(dev, MT_WCID_TX_RATE(idx), 0);

	__mt76_wr(dev, MT_WCID_TX_RATE(idx) + 4, 0);



	if (idx >= 128)

		return;



	if (mac)

		memcpy(addr.macaddr, mac, ETH_ALEN);



	__mt76_wr_copy(dev, MT_WCID_ADDR(idx), &addr, sizeof(addr));

}

EXPORT_SYMBOL_GPL(mt76x02_mac_wcid_setup);

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

+1 −0
Original line number Diff line number Diff line
@@ -46,4 +46,5 @@ int mt76x02_mac_shared_key_setup(struct mt76_dev *dev, u8 vif_idx, u8 key_idx, 
				struct ieee80211_key_conf *key);

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

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE