Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

[deliverable/linux.git] / drivers / net / wireless / iwlwifi / iwl-mac80211.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
index 3ee23134c02b9b96ee184a5999e9577bf6452511..a55012609cac736ac3c957e3ebd1b4a163073971 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c
+++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
@@ -420,8 +420,6 @@ int iwlagn_mac_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
        if (ret)
                goto error;
 
-       device_set_wakeup_enable(priv->trans->dev, true);
-
        iwl_trans_wowlan_suspend(priv->trans);
 
        goto out;
@@ -488,8 +486,6 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw)
 
        priv->wowlan = false;
 
-       device_set_wakeup_enable(priv->trans->dev, false);
-
        iwlagn_prepare_restart(priv);
 
        memset((void *)&ctx->active, 0, sizeof(ctx->active));
@@ -504,6 +500,12 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw)
        return 1;
 }
 
+static void iwlagn_mac_set_wakeup(struct ieee80211_hw *hw, bool enabled)
+{
+       struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
+
+       device_set_wakeup_enable(priv->trans->dev, enabled);
+}
 #endif
 
 void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
@@ -1584,6 +1586,7 @@ struct ieee80211_ops iwlagn_hw_ops = {
 #ifdef CONFIG_PM_SLEEP
        .suspend = iwlagn_mac_suspend,
        .resume = iwlagn_mac_resume,
+       .set_wakeup = iwlagn_mac_set_wakeup,
 #endif
        .add_interface = iwlagn_mac_add_interface,
        .remove_interface = iwlagn_mac_remove_interface,