diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-11-18 12:06:47 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-12-02 05:51:50 -0500 |
commit | 2ce6a0f554868ef6b07966254a612f710a909136 (patch) | |
tree | 9696ff974be01d85b84536899e215f6953fb48e3 /net | |
parent | ad38bfc916da6aee9160bfa5335aed8d6c190e39 (diff) |
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.c | 4 |
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) | |||
1041 | */ | 1041 | */ |
1042 | static void ieee80211_teardown_sdata(struct ieee80211_sub_if_data *sdata) | 1042 | static void ieee80211_teardown_sdata(struct ieee80211_sub_if_data *sdata) |
1043 | { | 1043 | { |
1044 | int flushed; | ||
1045 | int i; | 1044 | int i; |
1046 | 1045 | ||
1047 | /* free extra data */ | 1046 | /* free extra data */ |
@@ -1055,9 +1054,6 @@ static void ieee80211_teardown_sdata(struct ieee80211_sub_if_data *sdata) | |||
1055 | 1054 | ||
1056 | if (ieee80211_vif_is_mesh(&sdata->vif)) | 1055 | if (ieee80211_vif_is_mesh(&sdata->vif)) |
1057 | mesh_rmc_free(sdata); | 1056 | mesh_rmc_free(sdata); |
1058 | |||
1059 | flushed = sta_info_flush(sdata); | ||
1060 | WARN_ON(flushed); | ||
1061 | } | 1057 | } |
1062 | 1058 | ||
1063 | static void ieee80211_uninit(struct net_device *dev) | 1059 | static void ieee80211_uninit(struct net_device *dev) |