diff mbox series

wil6210: remove erroneous wiphy locking

Message ID 20210426212929.83f1de07c2cd.I630a2a00eff185ba0452324b3d3f645e01128a95@changeid
State New
Headers show
Series wil6210: remove erroneous wiphy locking | expand

Commit Message

Johannes Berg April 26, 2021, 7:29 p.m. UTC 
From: Johannes Berg <johannes.berg@intel.com>

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 <johannes.berg@intel.com>
---
 drivers/net/wireless/ath/wil6210/cfg80211.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Kalle Valo June 15, 2021, 2:06 p.m. UTC | #1 
Johannes Berg <johannes@sipsolutions.net> wrote:

> 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 <johannes.berg@intel.com>

> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>


Patch applied to ath-next branch of ath.git, thanks.

8f78caa2264e wil6210: remove erroneous wiphy locking

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20210426212929.83f1de07c2cd.I630a2a00eff185ba0452324b3d3f645e01128a95@changeid/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
diff mbox series

Patch

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);
 	}
 }