aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2012-06-27 07:18:22 -0400
committerJohannes Berg <johannes.berg@intel.com>2012-06-28 05:36:14 -0400
commitf823981e288f83113bf1129ff2c94e2fd74a28dd (patch)
treed441332c9230fc0276c9aeecc723e5077c9b1a15 /net
parentfc8a7321d3d68af759a369a9ad3e2426688742d3 (diff)
mac80211: flush queues before deauth/disassoc
On deauth/disassoc we tear down all BA sessions. These DELBA packets are sent on the appropriate TID, while deauth/disassoc is always sent on VO. This sometimes ends with the DELBA being sent after the deauth was already sent. Fix it by flushing all the pending frames before sending deauth/disassoc. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/mlme.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index e11cd0e033ef..c54388b3ebff 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1364,6 +1364,10 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
1364 } 1364 }
1365 mutex_unlock(&local->sta_mtx); 1365 mutex_unlock(&local->sta_mtx);
1366 1366
1367 /* flush out any pending frame (e.g. DELBA) before deauth/disassoc */
1368 if (tx)
1369 drv_flush(local, false);
1370
1367 /* deauthenticate/disassociate now */ 1371 /* deauthenticate/disassociate now */
1368 if (tx || frame_buf) 1372 if (tx || frame_buf)
1369 ieee80211_send_deauth_disassoc(sdata, bssid, stype, reason, 1373 ieee80211_send_deauth_disassoc(sdata, bssid, stype, reason,