This is a note to let you know that I've just added the patch titled
iwlwifi: disable WoWLAN if !CONFIG_PM_SLEEP
to the 3.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
iwlwifi-disable-wowlan-if-config_pm_sleep.patch
and it can be found in the queue-3.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From fcb6ff5e2cb83e1de10631f6621f45ca3401bf61 Mon Sep 17 00:00:00 2001
From: Johannes Berg <[email protected]>
Date: Mon, 4 Jun 2012 13:43:11 +0200
Subject: iwlwifi: disable WoWLAN if !CONFIG_PM_SLEEP
From: Johannes Berg <[email protected]>
commit fcb6ff5e2cb83e1de10631f6621f45ca3401bf61 upstream.
If CONFIG_PM_SLEEP is disabled, then iwlwifi doesn't
support suspend/resume handlers and thus mac80211
(correctly) refuses advertising WoWLAN. Disable
WoWLAN in the driver in this case.
Reported-by: Sebastian Kemper <[email protected]>
Signed-off-by: Johannes Berg <[email protected]>
Signed-off-by: John W. Linville <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/net/wireless/iwlwifi/iwl-mac80211.c | 2 ++
1 file changed, 2 insertions(+)
--- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c
+++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
@@ -196,6 +196,7 @@ int iwlagn_mac_setup_register(struct iwl
WIPHY_FLAG_DISABLE_BEACON_HINTS |
WIPHY_FLAG_IBSS_RSN;
+#ifdef CONFIG_PM_SLEEP
if (priv->fw->img[IWL_UCODE_WOWLAN].sec[0].len &&
trans(priv)->ops->wowlan_suspend &&
device_can_wakeup(trans(priv)->dev)) {
@@ -214,6 +215,7 @@ int iwlagn_mac_setup_register(struct iwl
hw->wiphy->wowlan.pattern_max_len =
IWLAGN_WOWLAN_MAX_PATTERN_LEN;
}
+#endif
if (iwlagn_mod_params.power_save)
hw->wiphy->flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT;
Patches currently in stable-queue which might be from [email protected]
are
queue-3.4/iwlwifi-unregister-leds-if-mac80211-registration-fails.patch
queue-3.4/iwlwifi-don-t-mess-up-the-scd-when-removing-a-key.patch
queue-3.4/mac80211-fix-error-in-station-state-transitions-during-reconfig.patch
queue-3.4/iwlwifi-disable-wowlan-if-config_pm_sleep.patch
queue-3.4/mac80211-clean-up-remain-on-channel-on-interface-stop.patch
queue-3.4/iwlwifi-disable-the-buggy-chain-extension-feature-in-hw.patch
queue-3.4/iwlwifi-use-correct-supported-firmware-for-6035-and-6000g2.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
