From fdfbc8477db61eb949ddeafa59b19fdc3d77e28b Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 16 Dec 2015 20:46:19 +0100 Subject: [PATCH] move remaining tx swq_queued tracking to core Signed-off-by: Felix Fietkau --- dma.c | 3 +++ mt7603_dma.c | 3 --- mt76x2_dma.c | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dma.c b/dma.c index bcacb4c5..6a9c7532 100644 --- a/dma.c +++ b/dma.c @@ -107,6 +107,9 @@ mt76_dma_cleanup(struct mt76_dev *dev, struct mt76_queue *q, bool flush, while (q->queued && q->tail != last) { mt76_dma_tx_cleanup_idx(dev, q, q->tail, &entry); + if (entry.schedule) + q->swq_queued--; + done(dev, q, &entry); q->tail = (q->tail + 1) % q->ndesc; diff --git a/mt7603_dma.c b/mt7603_dma.c index 4b52320c..0d3e0f9c 100644 --- a/mt7603_dma.c +++ b/mt7603_dma.c @@ -43,9 +43,6 @@ mt7603_tx_cleanup_entry(struct mt76_dev *mdev, struct mt76_queue *q, (void) dev; dev_kfree_skb_any(e->skb); - - if (e->schedule) - q->swq_queued--; } static void diff --git a/mt76x2_dma.c b/mt76x2_dma.c index 32e933da..90578534 100644 --- a/mt76x2_dma.c +++ b/mt76x2_dma.c @@ -174,9 +174,6 @@ mt76x2_tx_cleanup_entry(struct mt76_dev *mdev, struct mt76_queue *q, } else { dev_kfree_skb_any(e->skb); } - - if (e->schedule) - q->swq_queued--; } static void