Commit db7aa188 authored by Felix Fietkau's avatar Felix Fietkau
Browse files

mt76: move chainmask back to driver specific structs 



Nothing in the core uses it

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 011849e0

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

+0 −1
Original line number Diff line number Diff line
@@ -524,7 +524,6 @@ struct mt76_dev { 
	u32 aggr_stats[32];



	u8 antenna_mask;

	u16 chainmask;



	struct tasklet_struct pre_tbtt_tasklet;

	int beacon_int;

drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static void mt7615_eeprom_parse_hw_cap(struct mt7615_dev *dev) 
	if (!tx_mask || tx_mask > max_nss)

		tx_mask = max_nss;



	dev->mt76.chainmask = tx_mask << 8 | rx_mask;

	dev->chainmask = tx_mask << 8 | rx_mask;

	dev->mt76.antenna_mask = BIT(tx_mask) - 1;

}

drivers/net/wireless/mediatek/mt76/mt7615/mcu.c

+1 −1
Original line number Diff line number Diff line
@@ -1299,7 +1299,7 @@ int mt7615_mcu_set_channel(struct mt7615_dev *dev) 
	} req = {

		.control_chan = chandef->chan->hw_value,

		.center_chan = ieee80211_frequency_to_channel(freq1),

		.tx_streams = (dev->mt76.chainmask >> 8) & 0xf,

		.tx_streams = (dev->chainmask >> 8) & 0xf,

		.rx_streams_mask = dev->mt76.antenna_mask,

		.center_chan2 = ieee80211_frequency_to_channel(freq2),

	};

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

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ struct mt7615_dev { 
		struct mt76_phy mphy;

	};



	u16 chainmask;

	u32 vif_mask;

	u32 omac_mask;

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

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ struct mt76x02_dev { 
	struct mutex phy_mutex;



	u16 vif_mask;

	u16 chainmask;



	u8 txdone_seq;

	DECLARE_KFIFO_PTR(txstatus_fifo, struct mt76x02_tx_status);