summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2008-11-25 13:05:44 +0200
committerJohn W. Linville <linville@tuxdriver.com>2008-12-05 09:32:11 -0500
commit8e268e47b8ca5bddd189320884c3cc7d9ae489f4 (patch)
tree76a5b177e5782ea662a7b9b4b03fbd1a6e87f364 /net/mac80211
parente327b847e67051ece8d121f9aebeb4d736c36a02 (diff)
downloadblackbird-op-linux-8e268e47b8ca5bddd189320884c3cc7d9ae489f4.tar.gz
blackbird-op-linux-8e268e47b8ca5bddd189320884c3cc7d9ae489f4.zip
mac80211: disassociate prior to unlinking AP/station
This patch reorders calls during disassociation in ieee80211_set_disassoc function. Since sta_info_unlink calls sta_notify(REMOVE) it will remove the station representing AP from the driver before it has disassociated from it using bss_info_changed callback. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/mlme.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 7600ac9b87fe..806d3ded98bd 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -855,16 +855,26 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
if (self_disconnected || reason == WLAN_REASON_DISASSOC_STA_HAS_LEFT)
ifsta->state = IEEE80211_STA_MLME_DISABLED;
- sta_info_unlink(&sta);
-
rcu_read_unlock();
- sta_info_destroy(sta);
-
local->hw.conf.ht.enabled = false;
ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_HT);
ieee80211_bss_info_change_notify(sdata, changed);
+
+ rcu_read_lock();
+
+ sta = sta_info_get(local, ifsta->bssid);
+ if (!sta) {
+ rcu_read_unlock();
+ return;
+ }
+
+ sta_info_unlink(&sta);
+
+ rcu_read_unlock();
+
+ sta_info_destroy(sta);
}
static int ieee80211_sta_wep_configured(struct ieee80211_sub_if_data *sdata)
OpenPOWER on IntegriCloud