let mt76_queue_tx_cleanup take a queue id instead of a pointer

Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
Felix Fietkau
2016-02-25 21:13:30 +01:00
parent 516f3b2d13
commit 9779a98658
5 changed files with 9 additions and 8 deletions
+3 -2
View File
@@ -123,8 +123,9 @@ mt76_dma_tx_cleanup_idx(struct mt76_dev *dev, struct mt76_queue *q, int idx,
}
static void
mt76_dma_tx_cleanup(struct mt76_dev *dev, struct mt76_queue *q, bool flush)
mt76_dma_tx_cleanup(struct mt76_dev *dev, enum mt76_txq_id qid, bool flush)
{
struct mt76_queue *q = &dev->q_tx[qid];
struct mt76_queue_entry entry;
int last;
@@ -400,7 +401,7 @@ void mt76_dma_cleanup(struct mt76_dev *dev)
int i;
for (i = 0; i < ARRAY_SIZE(dev->q_tx); i++)
mt76_dma_tx_cleanup(dev, &dev->q_tx[i], true);
mt76_dma_tx_cleanup(dev, i, true);
for (i = 0; i < ARRAY_SIZE(dev->q_rx); i++) {
netif_napi_del(&dev->napi[i]);
+1 -1
View File
@@ -107,7 +107,7 @@ struct mt76_queue_ops {
void *(*dequeue)(struct mt76_dev *dev, struct mt76_queue *q, bool flush,
int *len, u32 *info, bool *more);
void (*tx_cleanup)(struct mt76_dev *dev, struct mt76_queue *q, bool flush);
void (*tx_cleanup)(struct mt76_dev *dev, enum mt76_txq_id qid, bool flush);
void (*kick)(struct mt76_dev *dev, struct mt76_queue *q);
};
+2 -2
View File
@@ -113,8 +113,8 @@ void mt7603_pre_tbtt_tasklet(unsigned long arg)
mt76_queue_kick(dev, q);
spin_unlock_bh(&q->lock);
mt76_queue_tx_cleanup(dev, &dev->mt76.q_tx[MT_TXQ_BEACON], false);
mt76_queue_tx_cleanup(dev, &dev->mt76.q_tx[MT_TXQ_CAB], false);
mt76_queue_tx_cleanup(dev, MT_TXQ_BEACON, false);
mt76_queue_tx_cleanup(dev, MT_TXQ_CAB, false);
}
void mt7603_beacon_set_timer(struct mt7603_dev *dev, int idx, int intval)
+1 -1
View File
@@ -114,7 +114,7 @@ mt7603_tx_tasklet(unsigned long data)
int i;
for (i = MT_TXQ_MCU; i >= 0; i--)
mt76_queue_tx_cleanup(dev, &dev->mt76.q_tx[i], false);
mt76_queue_tx_cleanup(dev, i, false);
mt7603_irq_enable(dev, MT_INT_TX_DONE_ALL);
}
+2 -2
View File
@@ -110,8 +110,8 @@ mt76x2_tx_tasklet(unsigned long data)
mt76x2_mac_process_tx_status_fifo(dev);
for (i = ARRAY_SIZE(dev->mt76.q_tx) - 1; i >= 0; i--)
mt76_queue_tx_cleanup(dev, &dev->mt76.q_tx[i], false);
for (i = MT_TXQ_MCU; i >= 0; i--)
mt76_queue_tx_cleanup(dev, i, false);
mt76x2_mac_poll_tx_status(dev, false);
mt76x2_irq_enable(dev, MT_INT_TX_DONE_ALL);