From patchwork Mon Nov 18 17:02:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Grumbach X-Patchwork-Id: 3197151 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3D681C045C for ; Mon, 18 Nov 2013 17:03:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EF2CA2012E for ; Mon, 18 Nov 2013 17:03:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CD73820577 for ; Mon, 18 Nov 2013 17:03:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751512Ab3KRRC7 (ORCPT ); Mon, 18 Nov 2013 12:02:59 -0500 Received: from mail-bk0-f42.google.com ([209.85.214.42]:56580 "EHLO mail-bk0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751373Ab3KRRC4 (ORCPT ); Mon, 18 Nov 2013 12:02:56 -0500 Received: by mail-bk0-f42.google.com with SMTP id w11so575793bkz.1 for ; Mon, 18 Nov 2013 09:02:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ecYYUIhypjbJuBws/Wicz0sWjIYV1ZnjfoHeodgea70=; b=lxdmUaDx+vJIhHDUi18OZymORilYFTwb+4w3Uyrv8keo9oFDljA1KTUzaR0Z9ozC47 lZZPJdFFY39Kg5HorK7BlqmTzv3uKeLBjzzeMSwUB1yoHgyG6SahM9ammpV/tljw/0WQ zYdkzSZ09dgvF/HRFD8qdZIki6j3gkaf6DB+TTum1qW1+R2zcpGRixVwvyBnThkN7BAA hGM+aqFFswiCGNbgymL3kjanf8RzLSnnG8oV269qhhJBDt8iPM9B9tZI29FeILuEhv5p GpxD6ps5ZQp2sWbygcoGbgorVzepTyUrUpfvq5ikOmSaPv5chV7m2AKil2MqSwKONmT3 RdlA== X-Received: by 10.204.103.199 with SMTP id l7mr13126366bko.11.1384794175000; Mon, 18 Nov 2013 09:02:55 -0800 (PST) Received: from localhost.localdomain (93-173-143-36.bb.netvision.net.il. [93.173.143.36]) by mx.google.com with ESMTPSA id qg7sm17325702bkb.6.2013.11.18.09.02.53 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 18 Nov 2013 09:02:54 -0800 (PST) From: Emmanuel Grumbach To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Johannes Berg Subject: [PATCH 3/6] mac80211: remove sta_info_flush() from interface teardown Date: Mon, 18 Nov 2013 19:02:43 +0200 Message-Id: <1384794166-10906-3-git-send-email-egrumbach@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1384794166-10906-1-git-send-email-egrumbach@gmail.com> References: <1384794166-10906-1-git-send-email-egrumbach@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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)