aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-11-18 19:06:47 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-12-02 11:51:50 +0100
commit2ce6a0f554868ef6b07966254a612f710a909136 (patch)
tree9696ff974be01d85b84536899e215f6953fb48e3 /net
parentmac80211: Tx frame latency statistics (diff)
downloadlinux-dev-2ce6a0f554868ef6b07966254a612f710a909136.tar.xz
linux-dev-2ce6a0f554868ef6b07966254a612f710a909136.zip
mac80211: remove sta_info_flush() from interface teardown
All interface types now properly clean up their stations using some form of sta_info_flush() themselves, so there's no need to try it again at teardown. Remove the call to get rid of the extra delay from the synchronize_net() and rcu_barrier() calls. Reported-by: Moshe Benji <moshe.benji@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/iface.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index a851bf4f05e5..d226751ba63a 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -1041,7 +1041,6 @@ static void ieee80211_set_multicast_list(struct net_device *dev)
*/
static void ieee80211_teardown_sdata(struct ieee80211_sub_if_data *sdata)
{
- int flushed;
int i;
/* free extra data */
@@ -1055,9 +1054,6 @@ 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(sdata);
- WARN_ON(flushed);
}
static void ieee80211_uninit(struct net_device *dev)