4 files changed, 10 insertions, 11 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index e74bfb7bbb27..8d60dcf6f2eb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -297,12 +297,6 @@ static inline bool iwl_advanced_bt_coexist(struct iwl_priv *priv)
                cfg(priv)->bt_params->advanced_bt_coexist;
 }
 
-static inline void iwl_enable_rfkill_int(struct iwl_priv *priv)
-{
-        IWL_DEBUG_ISR(priv, "Enabling rfkill interrupt\n");
-        iwl_write32(trans(priv), CSR_INT_MASK, CSR_INT_BIT_RF_KILL);
-}
-
 extern bool bt_siso_mode;
 
 #endif /* __iwl_core_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
index 78bc1e857b00..7177fd76e28a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c
+++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
@@ -346,9 +346,10 @@ static void iwlagn_mac_stop(struct ieee80211_hw *hw)
         flush_workqueue(priv->shrd->workqueue);
 
         /* User space software may expect getting rfkill changes
-         * even if interface is down */
-        iwl_write32(trans(priv), CSR_INT, 0xFFFFFFFF);
-        iwl_enable_rfkill_int(priv);
+         * even if interface is down, trans->down will leave the RF
+         * kill interrupt enabled
+         */
+        iwl_trans_stop_hw(trans(priv));
 
         IWL_DEBUG_MAC80211(priv, "leave\n");
 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
index 731f287c0f35..78abff004534 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
@@ -1149,8 +1149,10 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
         if (test_bit(STATUS_INT_ENABLED, &trans->shrd->status))
                 iwl_enable_interrupts(trans);
         /* Re-enable RF_KILL if it occurred */
-        else if (handled & CSR_INT_BIT_RF_KILL)
-                iwl_enable_rfkill_int(priv(trans));
+        else if (handled & CSR_INT_BIT_RF_KILL) {
+                IWL_DEBUG_ISR(trans, "Enabling rfkill interrupt\n");
+                iwl_write32(trans, CSR_INT_MASK, CSR_INT_BIT_RF_KILL);
+        }
 }
 
 /******************************************************************************
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index ed2a9216d807..ec26950ebb55 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -1532,6 +1532,8 @@ static void iwl_trans_pcie_stop_hw(struct iwl_trans *trans)
 {
         iwl_apm_stop(trans);
 
+        iwl_write32(trans, CSR_INT, 0xFFFFFFFF);
+
         /* Even if we stop the HW, we still want the RF kill interrupt */
         IWL_DEBUG_ISR(trans, "Enabling rfkill interrupt\n");
         iwl_write32(trans, CSR_INT_MASK, CSR_INT_BIT_RF_KILL);