mac80211: rt2x00: backport accepted and pending patches from upstream
[openwrt/openwrt.git] / package / kernel / mac80211 / patches / rt2x00 / 026-rt2x00-remove-last_nostatus_check.patch
1 From 6013a91f15c9dabd668d5736652b9bcfb0ef0378 Mon Sep 17 00:00:00 2001
2 From: Stanislaw Gruszka <sgruszka@redhat.com>
3 Date: Sat, 9 Feb 2019 12:08:36 +0100
4 Subject: [PATCH 26/28] rt2x00: remove last_nostatus_check
5
6 We do not any longer check txstatus timeout from tasklet, so do not need
7 this optimization.
8
9 Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
10 ---
11 drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 9 ---------
12 drivers/net/wireless/ralink/rt2x00/rt2x00.h | 2 --
13 drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 1 -
14 3 files changed, 12 deletions(-)
15
16 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
17 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
18 @@ -1164,15 +1164,6 @@ bool rt2800_txstatus_timeout(struct rt2x
19 struct data_queue *queue;
20 struct queue_entry *entry;
21
22 - if (!test_bit(DEVICE_STATE_FLUSHING, &rt2x00dev->flags)) {
23 - unsigned long tout = msecs_to_jiffies(1000);
24 -
25 - if (time_before(jiffies, rt2x00dev->last_nostatus_check + tout))
26 - return false;
27 - }
28 -
29 - rt2x00dev->last_nostatus_check = jiffies;
30 -
31 tx_queue_for_each(rt2x00dev, queue) {
32 entry = rt2x00queue_get_entry(queue, Q_INDEX_DONE);
33 if (rt2800_entry_txstatus_timeout(rt2x00dev, entry))
34 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
35 +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
36 @@ -981,8 +981,6 @@ struct rt2x00_dev {
37 */
38 DECLARE_KFIFO_PTR(txstatus_fifo, u32);
39
40 - unsigned long last_nostatus_check;
41 -
42 /*
43 * Timer to ensure tx status reports are read (rt2800usb).
44 */
45 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
46 +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
47 @@ -1039,7 +1039,6 @@ void rt2x00queue_start_queues(struct rt2
48 */
49 tx_queue_for_each(rt2x00dev, queue)
50 rt2x00queue_start_queue(queue);
51 - rt2x00dev->last_nostatus_check = jiffies;
52
53 rt2x00queue_start_queue(rt2x00dev->rx);
54 }