From 9f3a3060b7752bcb62fb4f049862407560305102 Mon Sep 17 00:00:00 2001
From: Eliad Peller <eliad@wizery.com>
Date: Wed, 27 Jun 2012 14:18:22 +0300
Subject: [PATCH] --- yaml --- r: 315183 b: refs/heads/master c:
 f823981e288f83113bf1129ff2c94e2fd74a28dd h: refs/heads/master i:   315181:
 24b554424b5093857a29b9e94d5569c990de1dad   315179:
 1dafeef781150f6bda3cec07b0029b0792c6f392   315175:
 755be2e116fc7e81ae016b1ea18b5586c748da05   315167:
 f5c0e2a3c64d25471714ec7012b5a2779ac00f10 v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/mlme.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 47993bab6a76..0cdf2be406c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc8a7321d3d68af759a369a9ad3e2426688742d3
+refs/heads/master: f823981e288f83113bf1129ff2c94e2fd74a28dd
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index e11cd0e033ef..c54388b3ebff 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -1364,6 +1364,10 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
 	}
 	mutex_unlock(&local->sta_mtx);
 
+	/* flush out any pending frame (e.g. DELBA) before deauth/disassoc */
+	if (tx)
+		drv_flush(local, false);
+
 	/* deauthenticate/disassociate now */
 	if (tx || frame_buf)
 		ieee80211_send_deauth_disassoc(sdata, bssid, stype, reason,