1 files changed, 24 insertions, 17 deletions

diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 89100e7c553b..fc44005b0d53 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -622,7 +622,7 @@ tx_status_ok:
         if (((rtlpriv->link_info.num_rx_inperiod +
                 rtlpriv->link_info.num_tx_inperiod) > 8) ||
                 (rtlpriv->link_info.num_rx_inperiod > 2)) {
-                rtl_lps_leave(hw);
+                tasklet_schedule(&rtlpriv->works.ips_leave_tasklet);
         }
 }
 
@@ -644,22 +644,23 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
                 .noise = -98,
                 .rate = 0,
         };
+        int index = rtlpci->rx_ring[rx_queue_idx].idx;
 
         /*RX NORMAL PKT */
         while (count--) {
                 /*rx descriptor */
                 struct rtl_rx_desc *pdesc = &rtlpci->rx_ring[rx_queue_idx].desc[
-                                rtlpci->rx_ring[rx_queue_idx].idx];
+                                index];
                 /*rx pkt */
                 struct sk_buff *skb = rtlpci->rx_ring[rx_queue_idx].rx_buf[
-                                rtlpci->rx_ring[rx_queue_idx].idx];
+                                index];
 
                 own = (u8) rtlpriv->cfg->ops->get_desc((u8 *) pdesc,
                                                        false, HW_DESC_OWN);
 
                 if (own) {
                         /*wait data to be filled by hardware */
-                        return;
+                        break;
                 } else {
                         struct ieee80211_hdr *hdr;
                         __le16 fc;
@@ -700,7 +701,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
                                          rtlpci->rxbuffersize,
                                          PCI_DMA_FROMDEVICE);
 
-                        if (!stats.crc || !stats.hwerror) {
+                        if (!stats.crc && !stats.hwerror) {
                                 memcpy(IEEE80211_SKB_RXCB(skb), &rx_status,
                                        sizeof(rx_status));
 
@@ -765,15 +766,12 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
                         if (((rtlpriv->link_info.num_rx_inperiod +
                                 rtlpriv->link_info.num_tx_inperiod) > 8) ||
                                 (rtlpriv->link_info.num_rx_inperiod > 2)) {
-                                rtl_lps_leave(hw);
+                                tasklet_schedule(&rtlpriv->works.ips_leave_tasklet);
                         }
 
                         skb = new_skb;
 
-                        rtlpci->rx_ring[rx_queue_idx].rx_buf[rtlpci->
-                                                             rx_ring
-                                                             [rx_queue_idx].
-                                                             idx] = skb;
+                        rtlpci->rx_ring[rx_queue_idx].rx_buf[index] = skb;
                         *((dma_addr_t *) skb->cb) =
                             pci_map_single(rtlpci->pdev, skb_tail_pointer(skb),
                                            rtlpci->rxbuffersize,
@@ -786,23 +784,22 @@ done:
                 rtlpriv->cfg->ops->set_desc((u8 *) pdesc, false,
                                             HW_DESC_RXBUFF_ADDR,
                                             (u8 *)&bufferaddress);
-                rtlpriv->cfg->ops->set_desc((u8 *)pdesc, false, HW_DESC_RXOWN,
-                                            (u8 *)&tmp_one);
                 rtlpriv->cfg->ops->set_desc((u8 *)pdesc, false,
                                             HW_DESC_RXPKT_LEN,
                                             (u8 *)&rtlpci->rxbuffersize);
 
-                if (rtlpci->rx_ring[rx_queue_idx].idx ==
-                    rtlpci->rxringcount - 1)
+                if (index == rtlpci->rxringcount - 1)
                         rtlpriv->cfg->ops->set_desc((u8 *)pdesc, false,
                                                     HW_DESC_RXERO,
                                                     (u8 *)&tmp_one);
 
-                rtlpci->rx_ring[rx_queue_idx].idx =
-                    (rtlpci->rx_ring[rx_queue_idx].idx + 1) %
-                    rtlpci->rxringcount;
+                rtlpriv->cfg->ops->set_desc((u8 *)pdesc, false, HW_DESC_RXOWN,
+                                            (u8 *)&tmp_one);
+
+                index = (index + 1) % rtlpci->rxringcount;
         }
 
+        rtlpci->rx_ring[rx_queue_idx].idx = index;
 }
 
 static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
@@ -940,6 +937,11 @@ static void _rtl_pci_irq_tasklet(struct ieee80211_hw *hw)
         _rtl_pci_tx_chk_waitq(hw);
 }
 
+static void _rtl_pci_ips_leave_tasklet(struct ieee80211_hw *hw)
+{
+        rtl_lps_leave(hw);
+}
+
 static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -1038,6 +1040,9 @@ static void _rtl_pci_init_struct(struct ieee80211_hw *hw,
         tasklet_init(&rtlpriv->works.irq_prepare_bcn_tasklet,
                      (void (*)(unsigned long))_rtl_pci_prepare_bcn_tasklet,
                      (unsigned long)hw);
+        tasklet_init(&rtlpriv->works.ips_leave_tasklet,
+                     (void (*)(unsigned long))_rtl_pci_ips_leave_tasklet,
+                     (unsigned long)hw);
 }
 
 static int _rtl_pci_init_tx_ring(struct ieee80211_hw *hw,
@@ -1507,6 +1512,7 @@ static void rtl_pci_deinit(struct ieee80211_hw *hw)
 
         synchronize_irq(rtlpci->pdev->irq);
         tasklet_kill(&rtlpriv->works.irq_tasklet);
+        tasklet_kill(&rtlpriv->works.ips_leave_tasklet);
 
         flush_workqueue(rtlpriv->works.rtl_wq);
         destroy_workqueue(rtlpriv->works.rtl_wq);
@@ -1581,6 +1587,7 @@ static void rtl_pci_stop(struct ieee80211_hw *hw)
         set_hal_stop(rtlhal);
 
         rtlpriv->cfg->ops->disable_interrupt(hw);
+        tasklet_kill(&rtlpriv->works.ips_leave_tasklet);
 
         spin_lock_irqsave(&rtlpriv->locks.rf_ps_lock, flags);
         while (ppsc->rfchange_inprogress) {