diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-01-01 15:39:56 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-01-01 15:39:56 -0500 |
| commit | ad86c55bac643a745f480d26689d153ec0f38b04 (patch) | |
| tree | 8ae3e20d2f3619021393166fe1f50a8ca00c1c33 /net/mac80211/mlme.c | |
| parent | 21eb218989523b7bee28900aaec9f9296b70fa27 (diff) | |
| parent | 39731b78b4afebb7501c05b68e2443a1b250b41c (diff) | |
| download | linux-rt-ad86c55bac643a745f480d26689d153ec0f38b04.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 900ead344f5b..9c2c7ee2cc30 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1698,7 +1698,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, memset(ifmgd->bssid, 0, ETH_ALEN); /* remove AP and TDLS peers */ - sta_info_flush_defer(sdata); + sta_info_flush(sdata); /* finally reset all BSS / config parameters */ changed |= ieee80211_reset_erp_info(sdata); |