iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mt76: mt76u: rename stat_wq in wq

Browse Source 
Rename usb stat_wq in wq in order to be reused not just for gathering hw
tx statistics

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Lorenzo Bianconi 2020-02-10 11:36:48 +01:00 committed by Felix Fietkau
parent 972c598133
commit 5d5a99464a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/mediatek/mt76/mt76.h
View File

@ -400,7 +400,7 @@ struct mt76_usb {
u16 data_len; u16 data_len;
struct tasklet_struct rx_tasklet; struct tasklet_struct rx_tasklet;
struct workqueue_struct *stat_wq; struct workqueue_struct *wq;
struct work_struct stat_work; struct work_struct stat_work;
u8 out_ep[__MT_EP_OUT_MAX]; u8 out_ep[__MT_EP_OUT_MAX];

14
drivers/net/wireless/mediatek/mt76/usb.c
View File

@ -852,7 +852,7 @@ static void mt76u_tx_tasklet(unsigned long data)
if (dev->drv->tx_status_data && if (dev->drv->tx_status_data &&
!test_and_set_bit(MT76_READING_STATS, &dev->phy.state)) !test_and_set_bit(MT76_READING_STATS, &dev->phy.state))
queue_work(dev->usb.stat_wq, &dev->usb.stat_work); queue_work(dev->usb.wq, &dev->usb.stat_work);
if (wake) if (wake)
ieee80211_wake_queue(dev->hw, i); ieee80211_wake_queue(dev->hw, i);
} }
@ -878,7 +878,7 @@ static void mt76u_tx_status_data(struct work_struct *work)
} }
if (count && test_bit(MT76_STATE_RUNNING, &dev->phy.state)) if (count && test_bit(MT76_STATE_RUNNING, &dev->phy.state))
queue_work(usb->stat_wq, &usb->stat_work); queue_work(usb->wq, &usb->stat_work);
else else
clear_bit(MT76_READING_STATS, &dev->phy.state); clear_bit(MT76_READING_STATS, &dev->phy.state);
} }
@ -1132,9 +1132,9 @@ static const struct mt76_queue_ops usb_queue_ops = {
void mt76u_deinit(struct mt76_dev *dev) void mt76u_deinit(struct mt76_dev *dev)
{ {
if (dev->usb.stat_wq) { if (dev->usb.wq) {
destroy_workqueue(dev->usb.stat_wq); destroy_workqueue(dev->usb.wq);
dev->usb.stat_wq = NULL; dev->usb.wq = NULL;
} }
} }
EXPORT_SYMBOL_GPL(mt76u_deinit); EXPORT_SYMBOL_GPL(mt76u_deinit);
@ -1160,8 +1160,8 @@ int mt76u_init(struct mt76_dev *dev,
tasklet_init(&dev->tx_tasklet, mt76u_tx_tasklet, (unsigned long)dev); tasklet_init(&dev->tx_tasklet, mt76u_tx_tasklet, (unsigned long)dev);
INIT_WORK(&usb->stat_work, mt76u_tx_status_data); INIT_WORK(&usb->stat_work, mt76u_tx_status_data);
usb->stat_wq = alloc_workqueue("mt76u", WQ_UNBOUND, 0); usb->wq = alloc_workqueue("mt76u", WQ_UNBOUND, 0);
if (!usb->stat_wq) if (!usb->wq)
return -ENOMEM; return -ENOMEM;
usb->data_len = usb_maxpacket(udev, usb_sndctrlpipe(udev, 0), 1); usb->data_len = usb_maxpacket(udev, usb_sndctrlpipe(udev, 0), 1);