diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-01-08 11:25:44 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-01-16 14:19:54 +0100 |
| commit | ddaf5a5b300b8f9d3591b509fd8bedab1c9887be (patch) | |
| tree | c78ebe39d33bf334e120d08c3206a5b048f8fcea /drivers/net/wireless/iwlwifi/dvm/mac80211.c | |
| parent | 22dc3c9561825a7c2cd18d01b01358c2141a8e16 (diff) | |
| download | linux-3.10-ddaf5a5b300b8f9d3591b509fd8bedab1c9887be.tar.gz linux-3.10-ddaf5a5b300b8f9d3591b509fd8bedab1c9887be.tar.bz2 linux-3.10-ddaf5a5b300b8f9d3591b509fd8bedab1c9887be.zip | |
iwlwifi: enable communication with WoWLAN firmware
On resuming, the opmode may have to be able to talk
to the WoWLAN/D3 firmware in order to query it about
its status and wakeup reasons. To do that, the opmode
has to call the new d3_resume() transport API which
will set up the device for command communcation.
Reviewed-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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c index 1ed4bc694d2..fef17c15562 100644 --- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c @@ -206,7 +206,8 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, #ifdef CONFIG_PM_SLEEP if (priv->fw->img[IWL_UCODE_WOWLAN].sec[0].len && - priv->trans->ops->wowlan_suspend && + priv->trans->ops->d3_suspend && + priv->trans->ops->d3_resume && device_can_wakeup(priv->trans->dev)) { hw->wiphy->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT | WIPHY_WOWLAN_DISCONNECT | @@ -426,7 +427,7 @@ static int iwlagn_mac_suspend(struct ieee80211_hw *hw, if (ret) goto error; - iwl_trans_wowlan_suspend(priv->trans); + iwl_trans_d3_suspend(priv->trans); goto out; |