Return-path: Received: from mail-ea0-f172.google.com ([209.85.215.172]:57373 "EHLO mail-ea0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754044AbaCCNHQ convert rfc822-to-8bit (ORCPT ); Mon, 3 Mar 2014 08:07:16 -0500 Received: by mail-ea0-f172.google.com with SMTP id l9so4416764eaj.17 for ; Mon, 03 Mar 2014 05:07:15 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <1393851336.10039.1.camel@jlt4.sipsolutions.net> References: <1393599480-27908-1-git-send-email-michal.kazior@tieto.com> <1393851336.10039.1.camel@jlt4.sipsolutions.net> Date: Mon, 3 Mar 2014 14:07:14 +0100 Message-ID: (sfid-20140303_140721_532042_0D9FF4C8) Subject: Re: [PATCH] cfg80211: fix cfg80211_leave() locking From: Michal Kazior To: Johannes Berg Cc: linux-wireless Content-Type: text/plain; charset=UTF-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: On 3 March 2014 13:55, Johannes Berg wrote: > On Fri, 2014-02-28 at 15:58 +0100, Michal Kazior wrote: >> The beacon_interval was set unprotected by >> wdev.mtx. This could possibly lead to inconsistent >> cfg80211 states. > > Why not just this patch? The beacon_interval is already set to 0 in > stop_ap(), and is irrelevant for the other modes. > > diff --git a/net/wireless/core.c b/net/wireless/core.c > index 010892b81a06..a3bf18d11609 100644 > --- a/net/wireless/core.c > +++ b/net/wireless/core.c > @@ -788,8 +788,6 @@ void cfg80211_leave(struct cfg80211_registered_device *rdev, > default: > break; > } > - > - wdev->beacon_interval = 0; > } > > static int cfg80211_netdev_notifier_call(struct notifier_block *nb, > > > johannes Good point. I was focused on locking changes (for my other patch) and noticed the beacon_interval being unprotected and didn't look more into it. Should I respin or are you going to apply your patch yourself? Either way is fine with me. Michał