mt76: move state from struct mt76_dev to mt76_phy

[linux-2.6-microblaze.git] / drivers / net / wireless / mediatek / mt76 / mt76x2 / usb_phy.c

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c
index b1381f9..a04a98f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c
@@ -10,7 +10,7 @@
 static void
 mt76x2u_phy_channel_calibrate(struct mt76x02_dev *dev, bool mac_stopped)
 {
-       struct ieee80211_channel *chan = dev->mt76.chandef.chan;
+       struct ieee80211_channel *chan = dev->mphy.chandef.chan;
        bool is_5ghz = chan->band == NL80211_BAND_5GHZ;
 
        if (dev->cal.channel_cal_done)
@@ -82,7 +82,7 @@ int mt76x2u_phy_set_channel(struct mt76x02_dev *dev,
                      FIELD_PREP(MT_EXT_CCA_CFG_CCA3, 0) |
                      FIELD_PREP(MT_EXT_CCA_CFG_CCA_MASK, BIT(3)),
        };
-       bool scan = test_bit(MT76_SCANNING, &dev->mt76.state);
+       bool scan = test_bit(MT76_SCANNING, &dev->mphy.state);
        struct ieee80211_channel *chan = chandef->chan;
        u8 channel = chan->hw_value, bw, bw_index;
        int ch_group_index, freq, freq1, ret;
@@ -185,7 +185,7 @@ int mt76x2u_phy_set_channel(struct mt76x02_dev *dev,
                        struct ieee80211_channel *chan;
                        u32 flag = 0;
 
-                       chan = dev->mt76.chandef.chan;
+                       chan = dev->mphy.chandef.chan;
                        if (chan->band == NL80211_BAND_5GHZ)
                                flag |= BIT(0);
                        if (mt76x02_ext_pa_enabled(dev, chan->band))