rt2x00: remove last_nostatus_check

We do not any longer check txstatus timeout from tasklet, so do not need
this optimization.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
index e338b5d..cb290b5 100644 (file)
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
@@ -1164,15 +1164,6 @@ bool rt2800_txstatus_timeout(struct rt2x00_dev *rt2x00dev)
        struct data_queue *queue;
        struct queue_entry *entry;
 
-       if (!test_bit(DEVICE_STATE_FLUSHING, &rt2x00dev->flags)) {
-               unsigned long tout = msecs_to_jiffies(1000);
-
-               if (time_before(jiffies, rt2x00dev->last_nostatus_check + tout))
-                       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(rt2x00dev, entry))

diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00.h b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
index 48c0957..9c6ef0c 100644 (file)
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
@@ -980,8 +980,6 @@ 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 ad15521..03b2064 100644 (file)
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
@@ -1042,7 +1042,6 @@ 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);
 }