|
@@ -3598,18 +3598,24 @@ void ieee80211_mgd_quiesce(struct ieee80211_sub_if_data *sdata)
|
|
|
|
|
|
sdata_lock(sdata);
|
|
sdata_lock(sdata);
|
|
|
|
|
|
- if (ifmgd->auth_data) {
|
|
|
|
|
|
+ if (ifmgd->auth_data || ifmgd->assoc_data) {
|
|
|
|
+ const u8 *bssid = ifmgd->auth_data ?
|
|
|
|
+ ifmgd->auth_data->bss->bssid :
|
|
|
|
+ ifmgd->assoc_data->bss->bssid;
|
|
|
|
+
|
|
/*
|
|
/*
|
|
- * If we are trying to authenticate while suspending, cfg80211
|
|
|
|
- * won't know and won't actually abort those attempts, thus we
|
|
|
|
- * need to do that ourselves.
|
|
|
|
|
|
+ * If we are trying to authenticate / associate while suspending,
|
|
|
|
+ * cfg80211 won't know and won't actually abort those attempts,
|
|
|
|
+ * thus we need to do that ourselves.
|
|
*/
|
|
*/
|
|
- ieee80211_send_deauth_disassoc(sdata,
|
|
|
|
- ifmgd->auth_data->bss->bssid,
|
|
|
|
|
|
+ ieee80211_send_deauth_disassoc(sdata, bssid,
|
|
IEEE80211_STYPE_DEAUTH,
|
|
IEEE80211_STYPE_DEAUTH,
|
|
WLAN_REASON_DEAUTH_LEAVING,
|
|
WLAN_REASON_DEAUTH_LEAVING,
|
|
false, frame_buf);
|
|
false, frame_buf);
|
|
- ieee80211_destroy_auth_data(sdata, false);
|
|
|
|
|
|
+ if (ifmgd->assoc_data)
|
|
|
|
+ ieee80211_destroy_assoc_data(sdata, false);
|
|
|
|
+ if (ifmgd->auth_data)
|
|
|
|
+ ieee80211_destroy_auth_data(sdata, false);
|
|
cfg80211_tx_mlme_mgmt(sdata->dev, frame_buf,
|
|
cfg80211_tx_mlme_mgmt(sdata->dev, frame_buf,
|
|
IEEE80211_DEAUTH_FRAME_LEN);
|
|
IEEE80211_DEAUTH_FRAME_LEN);
|
|
}
|
|
}
|