Skip to content

Commit 37426fb

Browse files
LorenzoBianconinbd168
LorenzoBianconi
authored and
nbd168
committed
mt76: move mac_work in mt76_dev
Move mac_work delayed work in mt76_dev data structure since it is used by all drivers and it will be reused adding mac work to mt7615 Signed-off-by: Lorenzo Bianconi <[email protected]> Signed-off-by: Felix Fietkau <[email protected]>
1 parent 41634aa commit 37426fb

File tree

14 files changed

+20
-21
lines changed

14 files changed

+20
-21
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@ struct mt76_dev {
448448
int tx_dma_idx[4];
449449

450450
struct tasklet_struct tx_tasklet;
451+
struct delayed_work mac_work;
451452

452453
wait_queue_head_t tx_wait;
453454
struct sk_buff_head status_list;

‎drivers/net/wireless/mediatek/mt76/mt7603/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ int mt7603_register_device(struct mt7603_dev *dev)
513513

514514
spin_lock_init(&dev->ps_lock);
515515

516-
INIT_DELAYED_WORK(&dev->mac_work, mt7603_mac_work);
516+
INIT_DELAYED_WORK(&dev->mt76.mac_work, mt7603_mac_work);
517517
tasklet_init(&dev->pre_tbtt_tasklet, mt7603_pre_tbtt_tasklet,
518518
(unsigned long)dev);
519519

‎drivers/net/wireless/mediatek/mt76/mt7603/mac.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1667,7 +1667,7 @@ mt7603_false_cca_check(struct mt7603_dev *dev)
16671667
void mt7603_mac_work(struct work_struct *work)
16681668
{
16691669
struct mt7603_dev *dev = container_of(work, struct mt7603_dev,
1670-
mac_work.work);
1670+
mt76.mac_work.work);
16711671
bool reset = false;
16721672

16731673
mt76_tx_status_check(&dev->mt76, NULL, false);
@@ -1720,6 +1720,6 @@ void mt7603_mac_work(struct work_struct *work)
17201720
if (reset)
17211721
mt7603_mac_watchdog_reset(dev);
17221722

1723-
ieee80211_queue_delayed_work(mt76_hw(dev), &dev->mac_work,
1723+
ieee80211_queue_delayed_work(mt76_hw(dev), &dev->mt76.mac_work,
17241724
msecs_to_jiffies(MT7603_WATCHDOG_TIME));
17251725
}

‎drivers/net/wireless/mediatek/mt76/mt7603/main.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ mt7603_start(struct ieee80211_hw *hw)
1616
mt7603_mac_start(dev);
1717
dev->survey_time = ktime_get_boottime();
1818
set_bit(MT76_STATE_RUNNING, &dev->mt76.state);
19-
mt7603_mac_work(&dev->mac_work.work);
19+
mt7603_mac_work(&dev->mt76.mac_work.work);
2020

2121
return 0;
2222
}
@@ -27,7 +27,7 @@ mt7603_stop(struct ieee80211_hw *hw)
2727
struct mt7603_dev *dev = hw->priv;
2828

2929
clear_bit(MT76_STATE_RUNNING, &dev->mt76.state);
30-
cancel_delayed_work_sync(&dev->mac_work);
30+
cancel_delayed_work_sync(&dev->mt76.mac_work);
3131
mt7603_mac_stop(dev);
3232
}
3333

@@ -132,7 +132,7 @@ mt7603_set_channel(struct mt7603_dev *dev, struct cfg80211_chan_def *def)
132132
u8 bw = MT_BW_20;
133133
bool failed = false;
134134

135-
cancel_delayed_work_sync(&dev->mac_work);
135+
cancel_delayed_work_sync(&dev->mt76.mac_work);
136136

137137
mutex_lock(&dev->mt76.mutex);
138138
set_bit(MT76_RESET, &dev->mt76.state);
@@ -171,7 +171,7 @@ mt7603_set_channel(struct mt7603_dev *dev, struct cfg80211_chan_def *def)
171171

172172
mt76_txq_schedule_all(&dev->mt76);
173173

174-
ieee80211_queue_delayed_work(mt76_hw(dev), &dev->mac_work,
174+
ieee80211_queue_delayed_work(mt76_hw(dev), &dev->mt76.mac_work,
175175
MT7603_WATCHDOG_TIME);
176176

177177
/* reset channel stats */
@@ -189,7 +189,7 @@ mt7603_set_channel(struct mt7603_dev *dev, struct cfg80211_chan_def *def)
189189
mutex_unlock(&dev->mt76.mutex);
190190

191191
if (failed)
192-
mt7603_mac_work(&dev->mac_work.work);
192+
mt7603_mac_work(&dev->mt76.mac_work.work);
193193

194194
return ret;
195195
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ struct mt7603_dev {
144144

145145
unsigned int reset_cause[__RESET_CAUSE_MAX];
146146

147-
struct delayed_work mac_work;
148147
struct tasklet_struct pre_tbtt_tasklet;
149148
};
150149

‎drivers/net/wireless/mediatek/mt76/mt76x0/pci.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ static int mt76x0e_start(struct ieee80211_hw *hw)
2929

3030
mt76x02_mac_start(dev);
3131
mt76x0_phy_calibrate(dev, true);
32-
ieee80211_queue_delayed_work(dev->mt76.hw, &dev->mac_work,
32+
ieee80211_queue_delayed_work(dev->mt76.hw, &dev->mt76.mac_work,
3333
MT_MAC_WORK_INTERVAL);
3434
ieee80211_queue_delayed_work(dev->mt76.hw, &dev->cal_work,
3535
MT_CALIBRATE_INTERVAL);
@@ -43,7 +43,7 @@ static int mt76x0e_start(struct ieee80211_hw *hw)
4343
static void mt76x0e_stop_hw(struct mt76x02_dev *dev)
4444
{
4545
cancel_delayed_work_sync(&dev->cal_work);
46-
cancel_delayed_work_sync(&dev->mac_work);
46+
cancel_delayed_work_sync(&dev->mt76.mac_work);
4747

4848
if (!mt76_poll(dev, MT_WPDMA_GLO_CFG, MT_WPDMA_GLO_CFG_TX_DMA_BUSY,
4949
0, 1000))

‎drivers/net/wireless/mediatek/mt76/mt76x0/usb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ static void mt76x0u_mac_stop(struct mt76x02_dev *dev)
8585
{
8686
clear_bit(MT76_STATE_RUNNING, &dev->mt76.state);
8787
cancel_delayed_work_sync(&dev->cal_work);
88-
cancel_delayed_work_sync(&dev->mac_work);
88+
cancel_delayed_work_sync(&dev->mt76.mac_work);
8989
mt76u_stop_stat_wk(&dev->mt76);
9090
mt76x02u_exit_beacon_config(dev);
9191

@@ -113,7 +113,7 @@ static int mt76x0u_start(struct ieee80211_hw *hw)
113113
goto out;
114114

115115
mt76x0_phy_calibrate(dev, true);
116-
ieee80211_queue_delayed_work(dev->mt76.hw, &dev->mac_work,
116+
ieee80211_queue_delayed_work(dev->mt76.hw, &dev->mt76.mac_work,
117117
MT_MAC_WORK_INTERVAL);
118118
ieee80211_queue_delayed_work(dev->mt76.hw, &dev->cal_work,
119119
MT_CALIBRATE_INTERVAL);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ struct mt76x02_dev {
9292
struct tasklet_struct tx_tasklet;
9393
struct tasklet_struct pre_tbtt_tasklet;
9494
struct delayed_work cal_work;
95-
struct delayed_work mac_work;
9695
struct delayed_work wdt_work;
9796

9897
struct hrtimer pre_tbtt_timer;

‎drivers/net/wireless/mediatek/mt76/mt76x02_mac.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1029,7 +1029,7 @@ static void mt76x02_edcca_check(struct mt76x02_dev *dev)
10291029
void mt76x02_mac_work(struct work_struct *work)
10301030
{
10311031
struct mt76x02_dev *dev = container_of(work, struct mt76x02_dev,
1032-
mac_work.work);
1032+
mt76.mac_work.work);
10331033
int i, idx;
10341034

10351035
mutex_lock(&dev->mt76.mutex);
@@ -1052,7 +1052,7 @@ void mt76x02_mac_work(struct work_struct *work)
10521052

10531053
mt76_tx_status_check(&dev->mt76, NULL, false);
10541054

1055-
ieee80211_queue_delayed_work(mt76_hw(dev), &dev->mac_work,
1055+
ieee80211_queue_delayed_work(mt76_hw(dev), &dev->mt76.mac_work,
10561056
MT_MAC_WORK_INTERVAL);
10571057
}
10581058

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ void mt76x02_init_device(struct mt76x02_dev *dev)
132132
struct ieee80211_hw *hw = mt76_hw(dev);
133133
struct wiphy *wiphy = hw->wiphy;
134134

135-
INIT_DELAYED_WORK(&dev->mac_work, mt76x02_mac_work);
135+
INIT_DELAYED_WORK(&dev->mt76.mac_work, mt76x02_mac_work);
136136

137137
hw->queues = 4;
138138
hw->max_rates = 1;

‎drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ static int mt76x2_init_hardware(struct mt76x02_dev *dev)
291291
void mt76x2_stop_hardware(struct mt76x02_dev *dev)
292292
{
293293
cancel_delayed_work_sync(&dev->cal_work);
294-
cancel_delayed_work_sync(&dev->mac_work);
294+
cancel_delayed_work_sync(&dev->mt76.mac_work);
295295
cancel_delayed_work_sync(&dev->wdt_work);
296296
mt76x02_mcu_set_radio_state(dev, false);
297297
mt76x2_mac_stop(dev, false);

‎drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ mt76x2_start(struct ieee80211_hw *hw)
3232
if (ret)
3333
goto out;
3434

35-
ieee80211_queue_delayed_work(mt76_hw(dev), &dev->mac_work,
35+
ieee80211_queue_delayed_work(mt76_hw(dev), &dev->mt76.mac_work,
3636
MT_MAC_WORK_INTERVAL);
3737
ieee80211_queue_delayed_work(mt76_hw(dev), &dev->wdt_work,
3838
MT_WATCHDOG_TIME);

‎drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ void mt76x2u_stop_hw(struct mt76x02_dev *dev)
246246
{
247247
mt76u_stop_stat_wk(&dev->mt76);
248248
cancel_delayed_work_sync(&dev->cal_work);
249-
cancel_delayed_work_sync(&dev->mac_work);
249+
cancel_delayed_work_sync(&dev->mt76.mac_work);
250250
mt76x2u_mac_stop(dev);
251251
}
252252

‎drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ static int mt76x2u_start(struct ieee80211_hw *hw)
2727
if (ret)
2828
goto out;
2929

30-
ieee80211_queue_delayed_work(mt76_hw(dev), &dev->mac_work,
30+
ieee80211_queue_delayed_work(mt76_hw(dev), &dev->mt76.mac_work,
3131
MT_MAC_WORK_INTERVAL);
3232
set_bit(MT76_STATE_RUNNING, &dev->mt76.state);
3333

0 commit comments

Comments
 (0)