| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182 |
- From b5d6e37ea15949a126907050d8cfa4408153a0cd Mon Sep 17 00:00:00 2001
- From: Stanislaw Gruszka <[email protected]>
- Date: Fri, 18 May 2018 12:25:10 +0200
- Subject: [PATCH 3/5] rt2x00: do not check for txstatus timeout every time on
- tasklet
- Do not check for tx status timeout everytime we perform txstatus tasklet.
- Perform check once per half a second.
- Signed-off-by: Stanislaw Gruszka <[email protected]>
- ---
- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 7 +++++++
- drivers/net/wireless/ralink/rt2x00/rt2800mmio.c | 3 ++-
- drivers/net/wireless/ralink/rt2x00/rt2x00.h | 2 ++
- drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 1 +
- 4 files changed, 12 insertions(+), 1 deletion(-)
- diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
- index 9f2835729016..0c56c7dca55f 100644
- --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
- @@ -1158,11 +1158,18 @@ bool rt2800_txstatus_timeout(struct rt2x00_dev *rt2x00dev)
- struct data_queue *queue;
- struct queue_entry *entry;
-
- + if (time_before(jiffies,
- + rt2x00dev->last_nostatus_check + msecs_to_jiffies(500)))
- + return false;
- +
- + rt2x00dev->last_nostatus_check = jiffies;
- +
- tx_queue_for_each(rt2x00dev, queue) {
- entry = rt2x00queue_get_entry(queue, Q_INDEX_DONE);
- if (rt2800_entry_txstatus_timeout(entry))
- return true;
- }
- +
- return false;
- }
- EXPORT_SYMBOL_GPL(rt2800_txstatus_timeout);
- diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c b/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c
- index aa8449a5e8fe..d0426314c2df 100644
- --- a/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c
- @@ -197,7 +197,8 @@ void rt2800mmio_txstatus_tasklet(unsigned long data)
-
- rt2800_txdone(rt2x00dev);
-
- - rt2800_txdone_nostatus(rt2x00dev);
- + if (rt2800_txstatus_timeout(rt2x00dev))
- + rt2800_txdone_nostatus(rt2x00dev);
-
- if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
- rt2800mmio_enable_interrupt(rt2x00dev,
- diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00.h b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- index a279a4363bc1..af062cda4a23 100644
- --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- @@ -980,6 +980,8 @@ struct rt2x00_dev {
- */
- DECLARE_KFIFO_PTR(txstatus_fifo, u32);
-
- + unsigned long last_nostatus_check;
- +
- /*
- * Timer to ensure tx status reports are read (rt2800usb).
- */
- diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
- index 6e8beb7ea350..92ddc19e7bf7 100644
- --- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
- @@ -1039,6 +1039,7 @@ void rt2x00queue_start_queues(struct rt2x00_dev *rt2x00dev)
- */
- tx_queue_for_each(rt2x00dev, queue)
- rt2x00queue_start_queue(queue);
- + rt2x00dev->last_nostatus_check = jiffies;
-
- rt2x00queue_start_queue(rt2x00dev->rx);
- }
- --
- 2.18.0
|
