summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-mac80211.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach2012-01-09 15:35:08 +0100
committerWey-Yi Guy2012-02-02 23:37:52 +0100
commit1df06bdc6fb26d13af18c5dbb3144f13cf55de3c (patch)
treed39f2f82a939c9fd426f5e4feb1697058d0d3ef5 /drivers/net/wireless/iwlwifi/iwl-mac80211.c
parentiwlwifi: move hw_rev to transport layer (diff)
downloadkernel-qcow2-linux-1df06bdc6fb26d13af18c5dbb3144f13cf55de3c.tar.gz
kernel-qcow2-linux-1df06bdc6fb26d13af18c5dbb3144f13cf55de3c.tar.xz
kernel-qcow2-linux-1df06bdc6fb26d13af18c5dbb3144f13cf55de3c.zip
iwlwifi: stop_hw replace enable_rfkill_int
This trans_ops->stop_hw leaves the RFKILL interrupt enabled, we can call that one instead of enable_rfkill_int. By that, we reduce the numbers of acceesses to the NIC from the upper layers. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-mac80211.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-mac80211.c7
1 files changed, 4 insertions, 3 deletions
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");
}