From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-bk0-f51.google.com ([209.85.214.51]:60402 "EHLO mail-bk0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751582Ab3KRRG6 (ORCPT ); Mon, 18 Nov 2013 12:06:58 -0500 Received: by mail-bk0-f51.google.com with SMTP id 6so725983bkj.38 for ; Mon, 18 Nov 2013 09:06:57 -0800 (PST) From: Emmanuel Grumbach To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Johannes Berg Subject: [PATCH RESEND 3/5] mac80211: remove sta_info_flush() from interface teardown Date: Mon, 18 Nov 2013 19:06:47 +0200 Message-Id: <1384794409-11211-3-git-send-email-egrumbach@gmail.com> (sfid-20131118_180707_274953_927F1CD4) In-Reply-To: <1384794409-11211-1-git-send-email-egrumbach@gmail.com> References: <1384794166-10906-1-git-send-email-egrumbach@gmail.com> <1384794409-11211-1-git-send-email-egrumbach@gmail.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Johannes Berg 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 --- net/mac80211/iface.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index ff101ea..a3d106d 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -1036,7 +1036,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 */ @@ -1050,9 +1049,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) -- 1.7.9.5