029-rt2x00-remove-last_nostatus_check.patch 1.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657
  1. From 6013a91f15c9dabd668d5736652b9bcfb0ef0378 Mon Sep 17 00:00:00 2001
  2. From: Stanislaw Gruszka <[email protected]>
  3. Date: Sat, 9 Feb 2019 12:08:36 +0100
  4. X-Patchwork-Submitter: Stanislaw Gruszka <[email protected]>
  5. X-Patchwork-Id: 10804447
  6. X-Patchwork-Delegate: [email protected]
  7. Subject: [PATCH 26/28] rt2x00: remove last_nostatus_check
  8. We do not any longer check txstatus timeout from tasklet, so do not need
  9. this optimization.
  10. Signed-off-by: Stanislaw Gruszka <[email protected]>
  11. ---
  12. drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 9 ---------
  13. drivers/net/wireless/ralink/rt2x00/rt2x00.h | 2 --
  14. drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 1 -
  15. 3 files changed, 12 deletions(-)
  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. - if (!test_bit(DEVICE_STATE_FLUSHING, &rt2x00dev->flags)) {
  22. - unsigned long tout = msecs_to_jiffies(1000);
  23. -
  24. - if (time_before(jiffies, rt2x00dev->last_nostatus_check + tout))
  25. - return false;
  26. - }
  27. -
  28. - rt2x00dev->last_nostatus_check = jiffies;
  29. -
  30. tx_queue_for_each(rt2x00dev, queue) {
  31. entry = rt2x00queue_get_entry(queue, Q_INDEX_DONE);
  32. if (rt2800_entry_txstatus_timeout(rt2x00dev, entry))
  33. --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
  34. +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
  35. @@ -981,8 +981,6 @@ struct rt2x00_dev {
  36. */
  37. DECLARE_KFIFO_PTR(txstatus_fifo, u32);
  38. - unsigned long last_nostatus_check;
  39. -
  40. /*
  41. * Timer to ensure tx status reports are read (rt2800usb).
  42. */
  43. --- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
  44. +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
  45. @@ -1039,7 +1039,6 @@ void rt2x00queue_start_queues(struct rt2
  46. */
  47. tx_queue_for_each(rt2x00dev, queue)
  48. rt2x00queue_start_queue(queue);
  49. - rt2x00dev->last_nostatus_check = jiffies;
  50. rt2x00queue_start_queue(rt2x00dev->rx);
  51. }