diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2012-12-24 08:01:24 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-01-03 09:29:46 -0500 |
commit | 7a65d17053c758109477f420e813ba2d826b0eae (patch) | |
tree | 9c53772ba9085c3afc72d75b3091f51fb37cf1ed /drivers/net/wireless/iwlwifi/dvm/mac80211.c | |
parent | f317243a8ba1b05338bc03c6606a51021f249a67 (diff) |
iwlwifi: virtualize iwl_{grab,release}_nic_access
Since different transports have different ways to wake the
up the NIC, we need to virtualize it.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/mac80211.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/mac80211.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c index 3163e0f38c25..8965a9824f50 100644 --- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c | |||
@@ -459,11 +459,11 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw) | |||
459 | base = priv->device_pointers.error_event_table; | 459 | base = priv->device_pointers.error_event_table; |
460 | if (iwlagn_hw_valid_rtc_data_addr(base)) { | 460 | if (iwlagn_hw_valid_rtc_data_addr(base)) { |
461 | spin_lock_irqsave(&priv->trans->reg_lock, flags); | 461 | spin_lock_irqsave(&priv->trans->reg_lock, flags); |
462 | ret = iwl_grab_nic_access_silent(priv->trans); | 462 | ret = iwl_trans_grab_nic_access(priv->trans, true); |
463 | if (likely(ret == 0)) { | 463 | if (likely(ret == 0)) { |
464 | iwl_write32(priv->trans, HBUS_TARG_MEM_RADDR, base); | 464 | iwl_write32(priv->trans, HBUS_TARG_MEM_RADDR, base); |
465 | status = iwl_read32(priv->trans, HBUS_TARG_MEM_RDAT); | 465 | status = iwl_read32(priv->trans, HBUS_TARG_MEM_RDAT); |
466 | iwl_release_nic_access(priv->trans); | 466 | iwl_trans_release_nic_access(priv->trans); |
467 | } | 467 | } |
468 | spin_unlock_irqrestore(&priv->trans->reg_lock, flags); | 468 | spin_unlock_irqrestore(&priv->trans->reg_lock, flags); |
469 | 469 | ||