aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ibss.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-12-13 17:07:46 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-01-03 07:01:16 -0500
commitb998e8bb3e1c6eeae5eab9d6a434563270286c3b (patch)
tree123f50adba77eec78f3c69eac4f872ff4cce0087 /net/mac80211/ibss.c
parent0f6dfcee2e081f47a3e97cb8984fb4d62217e6f7 (diff)
mac80211: remove final sta_info_flush()
When all interfaces have been removed, there can't be any stations left over, so there's no need to flush again. Remove this, and all code associated with it, which also simplifies the function. Tested-by: Ben Greear <greearb@candelatech.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ibss.c')
-rw-r--r--net/mac80211/ibss.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 6b7644e818d8..854de974dc9a 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -67,7 +67,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
67 skb_reserve(skb, sdata->local->hw.extra_tx_headroom); 67 skb_reserve(skb, sdata->local->hw.extra_tx_headroom);
68 68
69 if (!ether_addr_equal(ifibss->bssid, bssid)) 69 if (!ether_addr_equal(ifibss->bssid, bssid))
70 sta_info_flush(sdata->local, sdata); 70 sta_info_flush(sdata);
71 71
72 /* if merging, indicate to driver that we leave the old IBSS */ 72 /* if merging, indicate to driver that we leave the old IBSS */
73 if (sdata->vif.bss_conf.ibss_joined) { 73 if (sdata->vif.bss_conf.ibss_joined) {
@@ -1182,7 +1182,7 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata)
1182 memset(ifibss->bssid, 0, ETH_ALEN); 1182 memset(ifibss->bssid, 0, ETH_ALEN);
1183 ifibss->ssid_len = 0; 1183 ifibss->ssid_len = 0;
1184 1184
1185 sta_info_flush(sdata->local, sdata); 1185 sta_info_flush(sdata);
1186 1186
1187 spin_lock_bh(&ifibss->incomplete_lock); 1187 spin_lock_bh(&ifibss->incomplete_lock);
1188 while (!list_empty(&ifibss->incomplete_stations)) { 1188 while (!list_empty(&ifibss->incomplete_stations)) {