diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-03-19 12:55:55 +0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-05-15 11:56:04 +0400 |
| commit | db6ffa5384e83dd4b8a3c0e8a0f7979d8730ca77 (patch) | |
| tree | ab8fe70f099b1d91ea0e06c0c32b5ae0a26b39a0 /net/mac80211/ieee80211_i.h | |
| parent | 4fa516c800c27a7b3a26817e033eff674a016f54 (diff) | |
| download | linux-db6ffa5384e83dd4b8a3c0e8a0f7979d8730ca77.tar.xz | |
mac80211: fix suspend vs. authentication race
commit 1a1cb744de160ee70086a77afff605bbc275d291 upstream.
Since Stanislaw's patch removing the quiescing code, mac80211 had
a race regarding suspend vs. authentication: as cfg80211 doesn't
track authentication attempts, it can't abort them. Therefore the
attempts may be kept running while suspending, which can lead to
all kinds of issues, in at least some cases causing an error in
iwlmvm firmware.
Fix this by aborting the authentication attempt when suspending.
Fixes: 12e7f517029d ("mac80211: cleanup generic suspend/resume procedures")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 611abfcfb5eb..ab0fbb458c11 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1320,6 +1320,7 @@ void ieee80211_sta_reset_conn_monitor(struct ieee80211_sub_if_data *sdata); void ieee80211_mgd_stop(struct ieee80211_sub_if_data *sdata); void ieee80211_mgd_conn_tx_status(struct ieee80211_sub_if_data *sdata, __le16 fc, bool acked); +void ieee80211_mgd_quiesce(struct ieee80211_sub_if_data *sdata); void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata); /* IBSS code */ |