diff options
| author | David S. Miller <davem@davemloft.net> | 2015-02-04 23:57:45 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-04 23:57:45 +0100 |
| commit | 940288b6a560710d4c63bc84d9570779dd7dec2b (patch) | |
| tree | 349a41e8d8d75239428efcfd299d4b680cc839a1 /net/mac80211/mlme.c | |
| parent | csiostor:Use firmware version from cxgb4/t4fw_version.h (diff) | |
| parent | net: rfkill: Add Broadcom BCM2E40 bluetooth ACPI ID (diff) | |
| download | linux-940288b6a560710d4c63bc84d9570779dd7dec2b.tar.xz linux-940288b6a560710d4c63bc84d9570779dd7dec2b.zip | |
Merge tag 'mac80211-next-for-davem-2015-02-03' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Last round of updates for net-next:
* revert a patch that caused a regression with mesh userspace (Bob)
* fix a number of suspend/resume related races
(from Emmanuel, Luca and myself - we'll look at backporting later)
* add software implementations for new ciphers (Jouni)
* add a new ACPI ID for Broadcom's rfkill (Mika)
* allow using netns FD for wireless (Vadim)
* some other cleanups (various)
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index c1460e635c7f..10ac6324c1d0 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -2011,6 +2011,9 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, /* disable per-vif ps */ ieee80211_recalc_ps_vif(sdata); + /* make sure ongoing transmission finishes */ + synchronize_net(); + /* * drop any frame before deauth/disassoc, this can be data or * management frame. Since we are disconnecting, we should not |