aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211_i.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2014-03-19 04:55:55 -0400
committerJohannes Berg <johannes.berg@intel.com>2014-03-19 16:29:53 -0400
commit1a1cb744de160ee70086a77afff605bbc275d291 (patch)
tree6703edcce54889b86df6c7f5b72deca0d3affd0e /net/mac80211/ieee80211_i.h
parentc9c3a0604614344f7c73523176b6d0a85cba6eab (diff)
mac80211: fix suspend vs. authentication race
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. Cc: stable@vger.kernel.org Fixes: 12e7f517029d ("mac80211: cleanup generic suspend/resume procedures") Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r--net/mac80211/ieee80211_i.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 8603dfb52b3a..562cedde0ada 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1391,6 +1391,7 @@ void ieee80211_sta_reset_conn_monitor(struct ieee80211_sub_if_data *sdata);
1391void ieee80211_mgd_stop(struct ieee80211_sub_if_data *sdata); 1391void ieee80211_mgd_stop(struct ieee80211_sub_if_data *sdata);
1392void ieee80211_mgd_conn_tx_status(struct ieee80211_sub_if_data *sdata, 1392void ieee80211_mgd_conn_tx_status(struct ieee80211_sub_if_data *sdata,
1393 __le16 fc, bool acked); 1393 __le16 fc, bool acked);
1394void ieee80211_mgd_quiesce(struct ieee80211_sub_if_data *sdata);
1394void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata); 1395void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata);
1395 1396
1396/* IBSS code */ 1397/* IBSS code */