diff options
| author | Johannes Berg | 2012-03-05 20:24:36 +0100 |
|---|---|---|
| committer | John W. Linville | 2012-03-06 21:16:12 +0100 |
| commit | 15b86bff995525a38126eb44a951765a57ea2f4c (patch) | |
| tree | 98c942808123684fc420ae17ab88dee4ae6ba7cf /drivers/net/wireless/iwlwifi/iwl-mac80211.c | |
| parent | iwlwifi: clean up (wowlan) suspend flow (diff) | |
| download | kernel-qcow2-linux-15b86bff995525a38126eb44a951765a57ea2f4c.tar.gz kernel-qcow2-linux-15b86bff995525a38126eb44a951765a57ea2f4c.tar.xz kernel-qcow2-linux-15b86bff995525a38126eb44a951765a57ea2f4c.zip | |
iwlwifi: move wowlan bool into priv
With the new WoWLAN flow into the transport
there no longer is a need for this to be
shared, so move it into priv.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-mac80211.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-mac80211.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c index 8c7ca7318c00..8160f615f71a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c +++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c @@ -418,7 +418,7 @@ static int iwlagn_mac_suspend(struct ieee80211_hw *hw, goto out; error: - priv->shrd->wowlan = false; + priv->wowlan = false; iwlagn_prepare_restart(priv); ieee80211_restart_hw(priv->hw); out: @@ -474,7 +474,7 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw) /* we'll clear ctx->vif during iwlagn_prepare_restart() */ vif = ctx->vif; - priv->shrd->wowlan = false; + priv->wowlan = false; device_set_wakeup_enable(trans(priv)->dev, false); |