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,