mt76: move beacon_int in mt76_dev

Move beacon_int in mt76_dev data structure since it is used by
all drivers

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
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 e200c81a1bdedad305b49fcf6ee92ef6581ef73b..7a3172321c759c558c1431748006fdcfffe93ca4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -469,6 +469,8 @@ struct mt76_dev {
        u8 antenna_mask;
        u16 chainmask;
 
+       int beacon_int;
+
        struct mt76_sband sband_2g;
        struct mt76_sband sband_5g;
        struct debugfs_blob_wrapper eeprom;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/beacon.c b/drivers/net/wireless/mediatek/mt76/mt7603/beacon.c
index 1b6c3f32bc1b229164313942faef0edb46ab5602..64e15d5662834d67013567db3986a1ab50911142 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/beacon.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/beacon.c
@@ -156,7 +156,7 @@ void mt7603_beacon_set_timer(struct mt7603_dev *dev, int idx, int intval)
                return;
        }
 
-       dev->beacon_int = intval;
+       dev->mt76.beacon_int = intval;
        mt76_wr(dev, MT_TBTT,
                FIELD_PREP(MT_TBTT_PERIOD, intval) | MT_TBTT_CAL_ENABLE);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
index 5eb2b5c5a122990809f34d4bd7f4e2eadeb4a75e..02e18b976de540213ffa5ed4113fe38518a3350c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
@@ -1268,7 +1268,7 @@ static void mt7603_dma_sched_reset(struct mt7603_dev *dev)
 
 static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev)
 {
-       int beacon_int = dev->beacon_int;
+       int beacon_int = dev->mt76.beacon_int;
        u32 mask = dev->mt76.mmio.irqmask;
        int i;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/main.c b/drivers/net/wireless/mediatek/mt76/mt7603/main.c
index 18a33d92160173aba93a3b85908db914669767ee..9be9ae02103e1cca91f3e4b710e1570244a256e7 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/main.c
@@ -544,7 +544,7 @@ mt7603_sw_scan_complete(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
        struct mt7603_dev *dev = hw->priv;
 
        clear_bit(MT76_SCANNING, &dev->mt76.state);
-       mt7603_beacon_set_timer(dev, -1, dev->beacon_int);
+       mt7603_beacon_set_timer(dev, -1, dev->mt76.beacon_int);
 }
 
 static void

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h b/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h
index 081b043c55c257b3ae13d6de53d3c7c2561a4ef9..380bd8dced9d6d2c50a556ecfcf0cde72ea45256 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h
@@ -109,7 +109,6 @@ struct mt7603_dev {
 
        ktime_t survey_time;
        ktime_t ed_time;
-       int beacon_int;
 
        struct mt76_queue q_rx;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02.h b/drivers/net/wireless/mediatek/mt76/mt76x02.h
index 9f103c2506db9cb18e49fb7e81a5d6bde2465f1d..8462d3a7cc3f753a1624d97dce2559fb067b49de 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02.h
@@ -107,7 +107,6 @@ struct mt76x02_dev {
        u8 beacon_data_mask;
 
        u8 tbtt_count;
-       u16 beacon_int;
 
        u32 tx_hang_reset;
        u8 tx_hang_check;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c b/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c
index 0c232d02f1898bef63c9bd25726bde4e222ec61b..985a9b5d0e45a1e0729cb63598e9db1764d18408 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c
@@ -167,7 +167,7 @@ void mt76x02_mac_set_beacon_enable(struct mt76x02_dev *dev,
 void
 mt76x02_resync_beacon_timer(struct mt76x02_dev *dev)
 {
-       u32 timer_val = dev->beacon_int << 4;
+       u32 timer_val = dev->mt76.beacon_int << 4;
 
        dev->tbtt_count++;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c b/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c
index 818b96064decdbe91aca24d2b5ca4db3bd17814c..81cebd92a4e83fa99128e1a3affb9d9bcc5109df 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c
@@ -147,7 +147,7 @@ static void mt76x02u_restart_pre_tbtt_timer(struct mt76x02_dev *dev)
        dev_dbg(dev->mt76.dev, "TSF: %llu us TBTT %u us\n", tsf, tbtt);
 
        /* Convert beacon interval in TU (1024 usec) to nsec */
-       time = ((1000000000ull * dev->beacon_int) >> 10);
+       time = ((1000000000ull * dev->mt76.beacon_int) >> 10);
 
        /* Adjust time to trigger hrtimer 8ms before TBTT */
        if (tbtt < PRE_TBTT_USEC)
@@ -217,7 +217,7 @@ static void mt76x02u_beacon_enable(struct mt76x02_dev *dev, bool en)
 {
        int i;
 
-       if (WARN_ON_ONCE(!dev->beacon_int))
+       if (WARN_ON_ONCE(!dev->mt76.beacon_int))
                return;
 
        if (en) {

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
index ad8a53def7f79ff15c14e43a05ad58a26d378d77..227c360165b0d7949e26dc8edc7407d6c503671c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
@@ -650,7 +650,7 @@ void mt76x02_bss_info_changed(struct ieee80211_hw *hw,
                mt76_rmw_field(dev, MT_BEACON_TIME_CFG,
                               MT_BEACON_TIME_CFG_INTVAL,
                               info->beacon_int << 4);
-               dev->beacon_int = info->beacon_int;
+               dev->mt76.beacon_int = info->beacon_int;
        }
 
        if (changed & BSS_CHANGED_BEACON_ENABLED)