]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
mac80211: remove sta_info_flush() from interface teardown
authorJohannes Berg <johannes.berg@intel.com>
Mon, 18 Nov 2013 17:06:47 +0000 (19:06 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 2 Dec 2013 10:51:50 +0000 (11:51 +0100)
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>
net/mac80211/iface.c

index a851bf4f05e56de25ff098a99104487e91bb6c18..d226751ba63af6c73bf0efcd658465d3aed19b72 100644 (file)
@@ -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)