Commit cab12953 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Felix Fietkau
Browse files

mt76: pratially unify add_interface 



Create common mt76x02_vif_init function and use int on drivers
add_interface callback.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 624400e4

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

+1 −6
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ static int mt76x0_add_interface(struct ieee80211_hw *hw, 
				 struct ieee80211_vif *vif)

{

	struct mt76x0_dev *dev = hw->priv;

	struct mt76x02_vif *mvif = (struct mt76x02_vif *) vif->drv_priv;

	unsigned int idx;



	idx = ffs(~dev->vif_mask);
@@ -66,11 +65,7 @@ static int mt76x0_add_interface(struct ieee80211_hw *hw, 
	idx--;

	dev->vif_mask |= BIT(idx);



	mvif->idx = idx;

	mvif->group_wcid.idx = GROUP_WCID(idx);

	mvif->group_wcid.hw_key_idx = -1;

	mt76x02_txq_init(&dev->mt76, vif->txq);



	mt76x02_vif_init(&dev->mt76, vif, idx);

	return 0;

}

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

+0 −9
Original line number Diff line number Diff line
@@ -89,15 +89,6 @@ struct mt76x0_tx_queue { 
	unsigned int fifo_seq;

};



/* WCID allocation:

 *     0: mcast wcid

 *     1: bssid wcid

 *  1...: STAs

 * ...7e: group wcids

 *    7f: reserved

 */

#define GROUP_WCID(idx)	(254 - idx)



struct mt76x0_eeprom_params;



#define MT_EE_TEMPERATURE_SLOPE		39

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

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ struct mt76x02_tx_status { 
	u16 rate;

} __packed __aligned(2);



#define MT_VIF_WCID(_n)		(254 - ((_n) & 7))

#define MT_MAX_VIFS		8



struct mt76x02_vif {

	u8 idx;

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

+12 −0
Original line number Diff line number Diff line
@@ -115,4 +115,16 @@ int mt76x02_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
}

EXPORT_SYMBOL_GPL(mt76x02_sta_remove);



void mt76x02_vif_init(struct mt76_dev *dev, struct ieee80211_vif *vif,

		     unsigned int idx)

{

	struct mt76x02_vif *mvif = (struct mt76x02_vif *) vif->drv_priv;



	mvif->idx = idx;

	mvif->group_wcid.idx = MT_VIF_WCID(idx);

	mvif->group_wcid.hw_key_idx = -1;

	mt76x02_txq_init(dev, vif->txq);

}

EXPORT_SYMBOL_GPL(mt76x02_vif_init);



MODULE_LICENSE("Dual BSD/GPL");

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

+3 −0
Original line number Diff line number Diff line
@@ -25,4 +25,7 @@ int mt76x02_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
		   struct ieee80211_sta *sta);

int mt76x02_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		      struct ieee80211_sta *sta);



void mt76x02_vif_init(struct mt76_dev *dev, struct ieee80211_vif *vif,

		     unsigned int idx);

#endif