diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-05-25 00:01:30 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-05-25 00:01:30 +0200 |
commit | dde7dc759b777f385fc5df2af691c82eb455c7f3 (patch) | |
tree | 5e8f1fcd10a6b264d60bc8a0503656c0611de222 /drivers/net/wireless/mwifiex/cmdevt.c | |
parent | {cfg,mac}80211: move mandatory rates calculation to cfg80211 (diff) | |
parent | mac80211: close AP_VLAN interfaces before unregistering all (diff) | |
download | linux-dde7dc759b777f385fc5df2af691c82eb455c7f3.tar.xz linux-dde7dc759b777f385fc5df2af691c82eb455c7f3.zip |
Merge remote-tracking branch 'mac80211/master' into mac80211-next
Diffstat (limited to 'drivers/net/wireless/mwifiex/cmdevt.c')
-rw-r--r-- | drivers/net/wireless/mwifiex/cmdevt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwifiex/cmdevt.c b/drivers/net/wireless/mwifiex/cmdevt.c index 74db0d24a579..26755d9acb55 100644 --- a/drivers/net/wireless/mwifiex/cmdevt.c +++ b/drivers/net/wireless/mwifiex/cmdevt.c @@ -1191,6 +1191,7 @@ mwifiex_process_hs_config(struct mwifiex_adapter *adapter) adapter->if_ops.wakeup(adapter); adapter->hs_activated = false; adapter->is_hs_configured = false; + adapter->is_suspended = false; mwifiex_hs_activated_event(mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY), false); |