projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
75596ea
)
wil6210: remove erroneous wiphy locking
author
Johannes Berg
<johannes.berg@intel.com>
Mon, 26 Apr 2021 19:29:30 +0000
(21:29 +0200)
committer
Kalle Valo
<kvalo@codeaurora.org>
Tue, 15 Jun 2021 14:06:40 +0000
(17:06 +0300)
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>
Link:
https://lore.kernel.org/r/20210426212929.83f1de07c2cd.I630a2a00eff185ba0452324b3d3f645e01128a95@changeid
drivers/net/wireless/ath/wil6210/cfg80211.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/ath/wil6210/cfg80211.c
b/drivers/net/wireless/ath/wil6210/cfg80211.c
index 6746fd206d2a9a513393a1d36f3cca7978af17d7..1ff2679963f06dbd1ed47852284a1120fe9bba12 100644
(file)
--- 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);
}
}