diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-01-08 05:25:44 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-01-16 08:19:54 -0500 |
commit | ddaf5a5b300b8f9d3591b509fd8bedab1c9887be (patch) | |
tree | c78ebe39d33bf334e120d08c3206a5b048f8fcea /drivers/net/wireless/iwlwifi/dvm/mac80211.c | |
parent | 22dc3c9561825a7c2cd18d01b01358c2141a8e16 (diff) |
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 1ed4bc694d29..fef17c15562b 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, | |||
206 | 206 | ||
207 | #ifdef CONFIG_PM_SLEEP | 207 | #ifdef CONFIG_PM_SLEEP |
208 | if (priv->fw->img[IWL_UCODE_WOWLAN].sec[0].len && | 208 | if (priv->fw->img[IWL_UCODE_WOWLAN].sec[0].len && |
209 | priv->trans->ops->wowlan_suspend && | 209 | priv->trans->ops->d3_suspend && |
210 | priv->trans->ops->d3_resume && | ||
210 | device_can_wakeup(priv->trans->dev)) { | 211 | device_can_wakeup(priv->trans->dev)) { |
211 | hw->wiphy->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT | | 212 | hw->wiphy->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT | |
212 | WIPHY_WOWLAN_DISCONNECT | | 213 | WIPHY_WOWLAN_DISCONNECT | |
@@ -426,7 +427,7 @@ static int iwlagn_mac_suspend(struct ieee80211_hw *hw, | |||
426 | if (ret) | 427 | if (ret) |
427 | goto error; | 428 | goto error; |
428 | 429 | ||
429 | iwl_trans_wowlan_suspend(priv->trans); | 430 | iwl_trans_d3_suspend(priv->trans); |
430 | 431 | ||
431 | goto out; | 432 | goto out; |
432 | 433 | ||