From: Johannes Berg Date: Mon, 18 Nov 2013 17:06:47 +0000 (+0200) Subject: mac80211: remove sta_info_flush() from interface teardown X-Git-Tag: upstream/snapshot3+hdmi~3572^2~3^2^2~231 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ce6a0f554868ef6b07966254a612f710a909136;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index a851bf4..d226751 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)