From patchwork Wed Apr 30 13:14:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eliad Peller X-Patchwork-Id: 4093861 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 E7BC4BFF02 for ; Wed, 30 Apr 2014 13:14:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 20D84201F4 for ; Wed, 30 Apr 2014 13:14:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 43EC820176 for ; Wed, 30 Apr 2014 13:14:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933741AbaD3NOh (ORCPT ); Wed, 30 Apr 2014 09:14:37 -0400 Received: from mail-we0-f175.google.com ([74.125.82.175]:38840 "EHLO mail-we0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933454AbaD3NOg (ORCPT ); Wed, 30 Apr 2014 09:14:36 -0400 Received: by mail-we0-f175.google.com with SMTP id q58so1666754wes.34 for ; Wed, 30 Apr 2014 06:14:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mqwkTnn765O7v+nR2SVF5Yiv1DztZFFZt99y79ifddU=; b=eMrcmjR8lLTyYI8QMn1BzPmNFT7G3Vgkx33bxzLadq9YlrxPsm+DfaK2QUcL8otDNz bchrxCuAVO0vanJVgU1a37TXtOZ+Ktv3YgGmQMBfw0Ryy4d5UsAkkZSU7ilCdA2/GVOm NIHApFMUoXGVCYYPgUb16y1dBD+6auhSQ9RI5/gcATFRAB0akSQqRRqkD18pqCfKYyDu fv9RmzSVHq2LbgmIOudK5qJ5arqJ4u3bChIpXQ+bh3WTy4cy8okVmA86jRkPXuR/+vnE ZS7rA+wRKsPvV8+X8TTXpHc4j2qBKHP2VASoYt7pc3aekhhceKom3afF6yPAdFlNoe6R KiZw== X-Gm-Message-State: ALoCoQmRMRo2sr3TqqF3jjoRNdznc57/886XTZv6YRfx3Qdl8FqonDfDbONWtHXZBOfB+6cUQgUR X-Received: by 10.194.63.196 with SMTP id i4mr3896570wjs.50.1398863674674; Wed, 30 Apr 2014 06:14:34 -0700 (PDT) Received: from muse.amr.corp.intel.com (46-116-82-98.bb.netvision.net.il. [46.116.82.98]) by mx.google.com with ESMTPSA id q9sm26552426wjo.3.2014.04.30.06.14.33 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 30 Apr 2014 06:14:33 -0700 (PDT) From: Eliad Peller To: Johannes Berg Cc: Subject: [PATCH 2/2] mac80211: fix nested rtnl locking on ieee80211_reconfig Date: Wed, 30 Apr 2014 16:14:24 +0300 Message-Id: <1398863664-20193-2-git-send-email-eliad@wizery.com> X-Mailer: git-send-email 1.8.5.2.229.g4448466.dirty In-Reply-To: <1398863664-20193-1-git-send-email-eliad@wizery.com> References: <1398863664-20193-1-git-send-email-eliad@wizery.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.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 ieee80211_reconfig already holds rtnl, so calling cfg80211_sched_scan_stopped results in deadlock. Use the rtnl-version of this function instead. Fixes: d43c6b6 ("mac80211: reschedule sched scan after HW restart") Cc: stable@vger.kernel.org (3.14+) Signed-off-by: Eliad Peller --- net/mac80211/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/util.c b/net/mac80211/util.c index ad05875..c08bd4a 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1777,7 +1777,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) mutex_unlock(&local->mtx); if (sched_scan_stopped) - cfg80211_sched_scan_stopped(local->hw.wiphy); + cfg80211_sched_scan_stopped_rtnl(local->hw.wiphy); /* * If this is for hw restart things are still running.