aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/cfg.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/cfg.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/cfg.c')
-rw-r--r--net/mac80211/cfg.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 47e0aca614b7..be019533b233 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1010,8 +1010,8 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
1010 kfree_rcu(old_probe_resp, rcu_head); 1010 kfree_rcu(old_probe_resp, rcu_head);
1011 1011
1012 list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list) 1012 list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
1013 sta_info_flush(local, vlan); 1013 sta_info_flush(vlan);
1014 sta_info_flush(local, sdata); 1014 sta_info_flush(sdata);
1015 ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED); 1015 ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);
1016 1016
1017 drv_stop_ap(sdata->local, sdata); 1017 drv_stop_ap(sdata->local, sdata);
@@ -1301,7 +1301,6 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,
1301static int ieee80211_del_station(struct wiphy *wiphy, struct net_device *dev, 1301static int ieee80211_del_station(struct wiphy *wiphy, struct net_device *dev,
1302 u8 *mac) 1302 u8 *mac)
1303{ 1303{
1304 struct ieee80211_local *local = wiphy_priv(wiphy);
1305 struct ieee80211_sub_if_data *sdata; 1304 struct ieee80211_sub_if_data *sdata;
1306 1305
1307 sdata = IEEE80211_DEV_TO_SUB_IF(dev); 1306 sdata = IEEE80211_DEV_TO_SUB_IF(dev);
@@ -1309,7 +1308,7 @@ static int ieee80211_del_station(struct wiphy *wiphy, struct net_device *dev,
1309 if (mac) 1308 if (mac)
1310 return sta_info_destroy_addr_bss(sdata, mac); 1309 return sta_info_destroy_addr_bss(sdata, mac);
1311 1310
1312 sta_info_flush(local, sdata); 1311 sta_info_flush(sdata);
1313 return 0; 1312 return 0;
1314} 1313}
1315 1314