mt76: avoid re-queueing A-MPDU rx reorder work if no frames are pending
authorFelix Fietkau <nbd@nbd.name>
Sat, 27 Jan 2018 15:02:05 +0000 (16:02 +0100)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 1 Feb 2018 08:43:59 +0000 (10:43 +0200)
Fixes: aee5b8cf2477 ("mt76: implement A-MPDU rx reordering in the driver code")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/mediatek/mt76/agg-rx.c

index e9784b50e2af3633d2038c92e79b40a054ebc738..fcb208d1f2762d9076a1e3ca3cf297dfb2e54fdb 100644 (file)
@@ -98,6 +98,7 @@ mt76_rx_aggr_reorder_work(struct work_struct *work)
                                               reorder_work.work);
        struct mt76_dev *dev = tid->dev;
        struct sk_buff_head frames;
+       int nframes;
 
        __skb_queue_head_init(&frames);
 
@@ -105,9 +106,12 @@ mt76_rx_aggr_reorder_work(struct work_struct *work)
 
        spin_lock(&tid->lock);
        mt76_rx_aggr_check_release(tid, &frames);
+       nframes = tid->nframes;
        spin_unlock(&tid->lock);
 
-       ieee80211_queue_delayed_work(tid->dev->hw, &tid->reorder_work, REORDER_TIMEOUT);
+       if (nframes)
+               ieee80211_queue_delayed_work(tid->dev->hw, &tid->reorder_work,
+                                            REORDER_TIMEOUT);
        mt76_rx_complete(dev, &frames, -1);
 
        local_bh_enable();