Kernel bump from 4.1.3-rt to 4.1.7-rt.

[kvmfornfv.git] / kernel / drivers / net / wireless / rtlwifi / rtl8821ae / hw.c

diff --git a/kernel/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c b/kernel/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
index 8704eee..57966e3 100644 (file)
--- a/kernel/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
+++ b/kernel/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
@@ -2253,31 +2253,11 @@ void rtl8821ae_set_qos(struct ieee80211_hw *hw, int aci)
        }
 }
 
-static void rtl8821ae_clear_interrupt(struct ieee80211_hw *hw)
-{
-       struct rtl_priv *rtlpriv = rtl_priv(hw);
-       u32 tmp;
-       tmp = rtl_read_dword(rtlpriv, REG_HISR);
-       /*printk("clear interrupt first:\n");
-       printk("0x%x = 0x%08x\n",REG_HISR, tmp);*/
-       rtl_write_dword(rtlpriv, REG_HISR, tmp);
-
-       tmp = rtl_read_dword(rtlpriv, REG_HISRE);
-       /*printk("0x%x = 0x%08x\n",REG_HISRE, tmp);*/
-       rtl_write_dword(rtlpriv, REG_HISRE, tmp);
-
-       tmp = rtl_read_dword(rtlpriv, REG_HSISR);
-       /*printk("0x%x = 0x%08x\n",REG_HSISR, tmp);*/
-       rtl_write_dword(rtlpriv, REG_HSISR, tmp);
-}
-
 void rtl8821ae_enable_interrupt(struct ieee80211_hw *hw)
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 
-       rtl8821ae_clear_interrupt(hw);/*clear it here first*/
-
        rtl_write_dword(rtlpriv, REG_HIMR, rtlpci->irq_mask[0] & 0xFFFFFFFF);
        rtl_write_dword(rtlpriv, REG_HIMRE, rtlpci->irq_mask[1] & 0xFFFFFFFF);
        rtlpci->irq_enabled = true;