From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 9 Jul 2012 20:34:39 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
X-Git-Tag: firefly_0821_release~3680^2~2381^2~57^2~208
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0af5491c2f6069bb6cff4260619749a90a208c98;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
---

0af5491c2f6069bb6cff4260619749a90a208c98
diff --cc net/mac80211/mlme.c
index aa69a331f374,d563f7c55531..f49f14f8ba82
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -1362,10 -1368,14 +1364,14 @@@ static void ieee80211_set_disassoc(stru
  	}
  	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,
 -					       tx, frame_buf);
 +		ieee80211_send_deauth_disassoc(sdata, ifmgd->bssid, stype,
 +					       reason, tx, frame_buf);
  
  	/* flush out frame */
  	if (tx)