diff options
| author |   Andrei Otcheretianski <andrei.otcheretianski@intel.com> | 2015-10-25 10:59:38 +0200 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2015-11-03 10:41:00 +0100 |
| commit | a64cba3c5330704a034bd3179270b8d04daf6987 (patch) | |
| tree | 2c9f387dc668a9bb94523bf3b6911f1068fa7290 /net/mac80211 | |
| parent | mac80211: allow null chandef in tracing (diff) | |
| download | linux-dev-a64cba3c5330704a034bd3179270b8d04daf6987.tar.xz linux-dev-a64cba3c5330704a034bd3179270b8d04daf6987.zip | |
mac80211: Fix local deauth while associating
Local request to deauthenticate wasn't handled while associating, thus
the association could continue even when the user space required to
disconnect.
Cc: stable@vger.kernel.org
Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/mlme.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index ded4b976bb48..73f1a2a0df5a 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -4936,6 +4936,25 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata, return 0; } + if (ifmgd->assoc_data && + ether_addr_equal(ifmgd->assoc_data->bss->bssid, req->bssid)) { + sdata_info(sdata, + "aborting association with %pM by local choice (Reason: %u=%s)\n", + req->bssid, req->reason_code, + ieee80211_get_reason_code_string(req->reason_code)); + + drv_mgd_prepare_tx(sdata->local, sdata); + ieee80211_send_deauth_disassoc(sdata, req->bssid, + IEEE80211_STYPE_DEAUTH, + req->reason_code, tx, + frame_buf); + ieee80211_destroy_assoc_data(sdata, false); + ieee80211_report_disconnect(sdata, frame_buf, + sizeof(frame_buf), true, + req->reason_code); + return 0; + } + if (ifmgd->associated && ether_addr_equal(ifmgd->associated->bssid, req->bssid)) { sdata_info(sdata, |