1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 0d4e8fa3e1f8..0eb44cf2f44a 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -114,12 +114,12 @@ static bool rt2800usb_txstatus_pending(struct rt2x00_dev *rt2x00dev)
         return false;
 }
 
-static void rt2800usb_tx_sta_fifo_read_completed(struct rt2x00_dev *rt2x00dev,
+static bool rt2800usb_tx_sta_fifo_read_completed(struct rt2x00_dev *rt2x00dev,
                                                  int urb_status, u32 tx_status)
 {
         if (urb_status) {
                 WARNING(rt2x00dev, "rt2x00usb_register_read_async failed: %d\n", urb_status);
-                return;
+                return false;
         }
 
         /* try to read all TX_STA_FIFO entries before scheduling txdone_work */
@@ -129,13 +129,14 @@ static void rt2800usb_tx_sta_fifo_read_completed(struct rt2x00_dev *rt2x00dev,
                                 "drop tx status report.\n");
                         queue_work(rt2x00dev->workqueue, &rt2x00dev->txdone_work);
                 } else
-                        rt2x00usb_register_read_async(rt2x00dev, TX_STA_FIFO,
-                                                      rt2800usb_tx_sta_fifo_read_completed);
+                        return true;
         } else if (!kfifo_is_empty(&rt2x00dev->txstatus_fifo)) {
                 queue_work(rt2x00dev->workqueue, &rt2x00dev->txdone_work);
         } else if (rt2800usb_txstatus_pending(rt2x00dev)) {
-                mod_timer(&rt2x00dev->txstatus_timer, jiffies + msecs_to_jiffies(20));
+                mod_timer(&rt2x00dev->txstatus_timer, jiffies + msecs_to_jiffies(2));
         }
+
+        return false;
 }
 
 static void rt2800usb_tx_dma_done(struct queue_entry *entry)
@@ -493,7 +494,7 @@ static void rt2800usb_work_txdone(struct work_struct *work)
          * also delayed -> use a timer to retrieve it.
          */
         if (rt2800usb_txstatus_pending(rt2x00dev))
-                mod_timer(&rt2x00dev->txstatus_timer, jiffies + msecs_to_jiffies(20));
+                mod_timer(&rt2x00dev->txstatus_timer, jiffies + msecs_to_jiffies(2));
 }
 
 /*
@@ -633,6 +634,7 @@ static int rt2800usb_probe_hw(struct rt2x00_dev *rt2x00dev)
         __set_bit(CAPABILITY_LINK_TUNING, &rt2x00dev->cap_flags);
         __set_bit(REQUIRE_HT_TX_DESC, &rt2x00dev->cap_flags);
         __set_bit(REQUIRE_TXSTATUS_FIFO, &rt2x00dev->cap_flags);
+        __set_bit(REQUIRE_PS_AUTOWAKE, &rt2x00dev->cap_flags);
 
         setup_timer(&rt2x00dev->txstatus_timer,
                     rt2800usb_tx_sta_fifo_timeout,