Received: by 2002:a05:6a10:a841:0:0:0:0 with SMTP id d1csp3900623pxy; Mon, 26 Apr 2021 12:30:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxaY2jvaniGpA+bF7cSbVLhP4BMHuMJ7E+vm4bP/iI0ESrHZiu0e9AAnljljSFaPYDvgsy6 X-Received: by 2002:a62:ae13:0:b029:25f:41c1:e832 with SMTP id q19-20020a62ae130000b029025f41c1e832mr19860535pff.63.1619465438296; Mon, 26 Apr 2021 12:30:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619465438; cv=none; d=google.com; s=arc-20160816; b=HgP3cqgp2X+80BasvZkvv5PuIt4QkS/3JtQgQCptzFj1EdKiQvqx7TerUtA3HCPvvx EjJqYr8F9Ccp5ElpgR99WSQme2rHL0poycDgCXWBoxzs5JaHwnMozQ0TIPa7TKJfCSxv U1XBUqwixejttbPj9bWe63VW0daI1vaxpTDhy874qwXlxhHs+13xwY3NIjwvdzIPA4M6 4DbYTtl991EM4q3PHmkIvVWlgze5KsbBEZDJuIO2Mi6v9lBz9AJ/knEChlO0xGS+6Y1n Rd4KYGR4EkvtFQJlERV2SEOmu0ZW5f+FOpcAdKwyuBcB2QwDb/l5cueqF+Ay3hxKJvy+ tJ9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=d8xyoubKyTxzAVqhFDzvgqV0nQI51i7//feBrbOf67k=; b=v4QpULGt7yA8S8r8HrQyGiYmC5BU1p6HsHlwKf1osoCEZM/yMy3aucVdnPQtv/jzHX /HSuXIkum7UR6WpY7gEOXp2SkkRrlTyG+yQyNt+cQmVKHFoGPi6RZsOI3PPj2GP88N32 2xfudtON6jkAewfEJrx1UJ3Ahkr6IcO4SdFtuULuvg3qZwOEX+4+xDrrn0Ts+P7WenOF RixaqDV0XAvK4KzMyVZC1jvZQjzsZUkP0bY9BPM0fpiB8mwcLT55Dm0jJDxRzAW8LiHt yFT96e+UC28sw+qSZiREWOR7Jv/xPWD/5tpxbuLhQon/zU9dL75whyXEz+/Y48kiizOd 6noQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w1si662166pjq.100.2021.04.26.12.30.25; Mon, 26 Apr 2021 12:30:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240365AbhDZTaV (ORCPT + 99 others); Mon, 26 Apr 2021 15:30:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240340AbhDZTaR (ORCPT ); Mon, 26 Apr 2021 15:30:17 -0400 Received: from sipsolutions.net (s3.sipsolutions.net [IPv6:2a01:4f8:191:4433::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 303A5C061574 for ; Mon, 26 Apr 2021 12:29:34 -0700 (PDT) Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94) (envelope-from ) id 1lb6vE-000MXn-GP; Mon, 26 Apr 2021 21:29:32 +0200 From: Johannes Berg To: linux-wireless@vger.kernel.org Cc: Harald Arnesen , Johannes Berg Subject: [PATCH] wil6210: remove erroneous wiphy locking Date: Mon, 26 Apr 2021 21:29:30 +0200 Message-Id: <20210426212929.83f1de07c2cd.I630a2a00eff185ba0452324b3d3f645e01128a95@changeid> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Johannes Berg We already hold the wiphy lock in all cases when we get here, so this would deadlock, remove the erroneous locking. Fixes: a05829a7222e ("cfg80211: avoid holding the RTNL when calling the driver") Signed-off-by: Johannes Berg --- drivers/net/wireless/ath/wil6210/cfg80211.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c index 6746fd206d2a..1ff2679963f0 100644 --- a/drivers/net/wireless/ath/wil6210/cfg80211.c +++ b/drivers/net/wireless/ath/wil6210/cfg80211.c @@ -2842,9 +2842,7 @@ void wil_p2p_wdev_free(struct wil6210_priv *wil) wil->radio_wdev = wil->main_ndev->ieee80211_ptr; mutex_unlock(&wil->vif_mutex); if (p2p_wdev) { - wiphy_lock(wil->wiphy); cfg80211_unregister_wdev(p2p_wdev); - wiphy_unlock(wil->wiphy); kfree(p2p_wdev); } } -- 2.30.2