mt76: move chainmask back to driver specific structs

Nothing in the core uses it

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index c6f78292b0997c953983f827bbf8f0019f14d001..8aab40ebadf95dee4a8ec882e91503f6d1c30039 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -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;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c
index 17e277bf39e0ff7cf51ec1f2cc1d2e7599a4598c..c8ced0ee9704eecad660cbe007c2a34d3ff20b4b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c
@@ -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;
 }
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
index 1aba10e6b5cbe3f61b5432abaaf18c2357712eee..3c5922d17e4416131db24581e1f63701713546a6 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
@@ -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),
        };

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
index 828df9b4a53e191730abd0a2233228aef803149a..9c27b355a4455fe40e65391fb1bf79d774263a94 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
@@ -85,6 +85,7 @@ struct mt7615_dev {
                struct mt76_phy mphy;
        };
 
+       u16 chainmask;
        u32 vif_mask;
        u32 omac_mask;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02.h b/drivers/net/wireless/mediatek/mt76/mt76x02.h
index 7a44ab52fca68100c37328ad038ea506d4601d88..28572797a7a67a37e31ccc080cc1b1b5f7db57a1 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02.h
@@ -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);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
index 8a4396941ef203daed9271f628e6720522d3792c..8fe21e7e0996c9dc111968a7710128ab5d5faa6a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
@@ -344,7 +344,7 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,
        u16 txwi_flags = 0;
        u8 nss;
        s8 txpwr_adj, max_txpwr_adj;
-       u8 ccmp_pn[8], nstreams = dev->mt76.chainmask & 0xf;
+       u8 ccmp_pn[8], nstreams = dev->chainmask & 0xf;
 
        memset(txwi, 0, sizeof(*txwi));
 
@@ -679,7 +679,7 @@ mt76x02_mac_process_rate(struct mt76x02_dev *dev,
                status->rate_idx = idx;
                break;
        case MT_PHY_TYPE_VHT: {
-               u8 n_rxstream = dev->mt76.chainmask & 0xf;
+               u8 n_rxstream = dev->chainmask & 0xf;
 
                status->encoding = RX_ENC_VHT;
                status->rate_idx = FIELD_GET(MT_RATE_INDEX_VHT_IDX, idx);
@@ -769,7 +769,7 @@ int mt76x02_mac_process_rx(struct mt76x02_dev *dev, struct sk_buff *skb,
        u16 rate = le16_to_cpu(rxwi->rate);
        u16 tid_sn = le16_to_cpu(rxwi->tid_sn);
        bool unicast = rxwi->rxinfo & cpu_to_le32(MT_RXINFO_UNICAST);
-       int pad_len = 0, nstreams = dev->mt76.chainmask & 0xf;
+       int pad_len = 0, nstreams = dev->chainmask & 0xf;
        s8 signal;
        u8 pn_len;
        u8 wcid;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_phy.c b/drivers/net/wireless/mediatek/mt76/mt76x02_phy.c
index d7334267b530b9ea353fbf8be6c15730924a09cc..aaadc15ea83cc38a2880a4851cca8b7b6c60b3ea 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_phy.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_phy.c
@@ -16,7 +16,7 @@ void mt76x02_phy_set_rxpath(struct mt76x02_dev *dev)
        val = mt76_rr(dev, MT_BBP(AGC, 0));
        val &= ~BIT(4);
 
-       switch (dev->mt76.chainmask & 0xf) {
+       switch (dev->chainmask & 0xf) {
        case 2:
                val |= BIT(3);
                break;
@@ -35,7 +35,7 @@ void mt76x02_phy_set_txdac(struct mt76x02_dev *dev)
 {
        int txpath;
 
-       txpath = (dev->mt76.chainmask >> 8) & 0xf;
+       txpath = (dev->chainmask >> 8) & 0xf;
        switch (txpath) {
        case 2:
                mt76_set(dev, MT_BBP(TXBE, 5), 0x3);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
index d226112494d398b0efe7b7493fe1f597ad5e3a08..846cd75e3e2d6b0539b5406dfc48ee9f25ce2c81 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
@@ -192,10 +192,10 @@ void mt76x02_init_device(struct mt76x02_dev *dev)
                                IEEE80211_HT_CAP_LDPC_CODING;
                dev->mphy.sband_5g.sband.ht_cap.cap |=
                                IEEE80211_HT_CAP_LDPC_CODING;
-               dev->mt76.chainmask = 0x202;
+               dev->chainmask = 0x202;
                dev->mt76.antenna_mask = 3;
        } else {
-               dev->mt76.chainmask = 0x101;
+               dev->chainmask = 0x101;
                dev->mt76.antenna_mask = 1;
        }
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/mcu.c b/drivers/net/wireless/mediatek/mt76/mt76x2/mcu.c
index 76d8cd37d4de2d34b9b516e3b067c36527129e96..9635c04ce0327ff8b68e36db6184d589c9c5ba7a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/mcu.c
@@ -29,7 +29,7 @@ int mt76x2_mcu_set_channel(struct mt76x02_dev *dev, u8 channel, u8 bw,
                .idx = channel,
                .scan = scan,
                .bw = bw,
-               .chainmask = cpu_to_le16(dev->mt76.chainmask),
+               .chainmask = cpu_to_le16(dev->chainmask),
        };
 
        /* first set the channel without the extension channel info */

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c
index 1f2db374ed51d8dadbcf352cdc01c19675534d49..bc0ffae7adda28db4cedaa17b071590c6d4f4393 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c
@@ -124,7 +124,7 @@ static int mt76x2_set_antenna(struct ieee80211_hw *hw, u32 tx_ant,
 
        mutex_lock(&dev->mt76.mutex);
 
-       dev->mt76.chainmask = (tx_ant == 3) ? 0x202 : 0x101;
+       dev->chainmask = (tx_ant == 3) ? 0x202 : 0x101;
        dev->mt76.antenna_mask = tx_ant;
 
        mt76_set_stream_caps(&dev->mt76, true);