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