Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Jul 2012 20:34:39 +0000 (16:34 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Jul 2012 20:34:39 +0000 (16:34 -0400)
1  2 
net/mac80211/mlme.c

index aa69a331f374bceb37258c76bd681f247508f863,d563f7c5553161161140a5782450ffa207d340c0..f49f14f8ba82cddd447872cf84d1cadf2055d25c
@@@ -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)