diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2013-03-20 10:40:05 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-03-20 14:17:13 +0100 |
| commit | 6039f3e196721a4bb08d85af5367e50201052145 (patch) | |
| tree | 097998faa1e46756c1f8af6bad95731f09c6c55c /drivers/net/wireless/iwlwifi/mvm/d3.c | |
| parent | iwlwifi: mvm: tune the move to static SMPS due to BT load (diff) | |
| download | linux-dev-6039f3e196721a4bb08d85af5367e50201052145.tar.xz linux-dev-6039f3e196721a4bb08d85af5367e50201052145.zip | |
iwlwifi: mvm: fix WoWLAN RF-kill bug
The RF-kill wakeup trigger flag is set in the wrong command,
which means it won't work. Also fix the comment in the TCP
wakeup trigger code -- the firmware was changed to look at
all the different trigger flags.
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/d3.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/d3.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/d3.c b/drivers/net/wireless/iwlwifi/mvm/d3.c index d4578cefe445..bf087abe39f3 100644 --- a/drivers/net/wireless/iwlwifi/mvm/d3.c +++ b/drivers/net/wireless/iwlwifi/mvm/d3.c @@ -866,17 +866,13 @@ int iwl_mvm_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) cpu_to_le32(IWL_WOWLAN_WAKEUP_PATTERN_MATCH); if (wowlan->rfkill_release) - d3_cfg_cmd.wakeup_flags |= + wowlan_config_cmd.wakeup_filter |= cpu_to_le32(IWL_WOWLAN_WAKEUP_RF_KILL_DEASSERT); if (wowlan->tcp) { /* - * The firmware currently doesn't really look at these, only - * the IWL_WOWLAN_WAKEUP_LINK_CHANGE bit. We have to set that - * reason bit since losing the connection to the AP implies - * losing the TCP connection. - * Set the flags anyway as long as they exist, in case this - * will be changed in the firmware. + * Set the "link change" (really "link lost") flag as well + * since that implies losing the TCP connection. */ wowlan_config_cmd.wakeup_filter |= cpu_to_le32(IWL_WOWLAN_WAKEUP_REMOTE_LINK_LOSS | |