aboutsummaryrefslogtreecommitdiff
path: root/net/mac80211/iface.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-12-13 23:07:46 +0100
committerJohannes Berg <johannes.berg@intel.com>2013-01-03 13:01:16 +0100
commitb998e8bb3e1c6eeae5eab9d6a434563270286c3b (patch)
tree123f50adba77eec78f3c69eac4f872ff4cce0087 /net/mac80211/iface.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/iface.c')
-rw-r--r--net/mac80211/iface.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 8be854e86cd..ecf7d15eaa5 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -776,7 +776,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
* all other modes we've already removed all stations when
* disconnecting etc.
*/
- sta_info_flush(local, sdata);
+ sta_info_flush(sdata);
/*
* Don't count this interface for promisc/allmulti while it
@@ -961,7 +961,6 @@ static void ieee80211_set_multicast_list(struct net_device *dev)
*/
static void ieee80211_teardown_sdata(struct ieee80211_sub_if_data *sdata)
{
- struct ieee80211_local *local = sdata->local;
int flushed;
int i;
@@ -977,7 +976,7 @@ static void ieee80211_teardown_sdata(struct ieee80211_sub_if_data *sdata)
if (ieee80211_vif_is_mesh(&sdata->vif))
mesh_rmc_free(sdata);
- flushed = sta_info_flush(local, sdata);
+ flushed = sta_info_flush(sdata);
WARN_ON(flushed);
}