aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-07-02 11:20:43 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-07-10 15:01:53 -0400
commit19957bb399e2722719c0e20c9ae91cf8b6aaff04 (patch)
tree9c4d53fe5938ceee41333a1afd5be0ed5c1ce313 /net/mac80211/mlme.c
parent517357c685ccc4b5783cc7dbdae8824ada19a97f (diff)
cfg80211: keep track of BSSes
In order to avoid problems with BSS structs going away while they're in use, I've long wanted to make cfg80211 keep track of them. Without the SME, that wasn't doable but now that we have the SME we can do this too. It can keep track of up to four separate authentications and one association, regardless of whether it's controlled by the cfg80211 SME or the userspace SME. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 5748cda659c2..aa1829ae431d 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -876,8 +876,6 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
876 bss_info_changed |= ieee80211_handle_bss_capability(sdata, 876 bss_info_changed |= ieee80211_handle_bss_capability(sdata,
877 bss->cbss.capability, bss->has_erp_value, bss->erp_value); 877 bss->cbss.capability, bss->has_erp_value, bss->erp_value);
878 878
879 cfg80211_hold_bss(&bss->cbss);
880
881 ieee80211_rx_bss_put(local, bss); 879 ieee80211_rx_bss_put(local, bss);
882 } 880 }
883 881
@@ -1031,10 +1029,8 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
1031 conf->channel->center_freq, 1029 conf->channel->center_freq,
1032 ifmgd->ssid, ifmgd->ssid_len); 1030 ifmgd->ssid, ifmgd->ssid_len);
1033 1031
1034 if (bss) { 1032 if (bss)
1035 cfg80211_unhold_bss(&bss->cbss);
1036 ieee80211_rx_bss_put(local, bss); 1033 ieee80211_rx_bss_put(local, bss);
1037 }
1038 1034
1039 if (self_disconnected) { 1035 if (self_disconnected) {
1040 if (deauth) 1036 if (deauth)