summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTudor Ambarus <tudor.ambarus@linaro.org>2023-11-29 15:05:49 +0000
committerAndré Draszik <draszik@google.com>2024-01-17 18:28:31 +0000
commit9152581f6564dcfdc9e821f14eb67a227170ea40 (patch)
treed4ce1095eedcd83f9a7c148d03d4393248c7c61f
parentd30459e7279eb667df6e810da9f13f412fd9bb14 (diff)
downloadbcm4389-android-gs-raviole-mainline.tar.gz
bcmdhd4389: fix v6.7 build err due to wdev mutex removalandroid-gs-raviole-mainline
Upstream commit 076fc8775dafe995e94c106bb732bf2d42dedcea removed the wdev mutex as the core code now protects everything with the wiphy mytex. Follow the core and use the wiphy mutex. Bug: 313896368 Fixes: 076fc8775daf ("wifi: cfg80211: remove wdev mutex") Change-Id: I6d36f3cd89b01c7864f53268df72bac0243c9623 Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org> (cherry picked from commit fcd20c8762ecdb7859e559b70c1fb33b70391219)
-rw-r--r--wl_cfg80211.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/wl_cfg80211.c b/wl_cfg80211.c
index c4612ad..29e76d4 100644
--- a/wl_cfg80211.c
+++ b/wl_cfg80211.c
@@ -24527,7 +24527,7 @@ wl_cfg80211_debug_data_dump(struct net_device *dev, u8 *buf, u32 buf_len)
void
wl_cfg80211_wdev_lock(struct wireless_dev *wdev)
{
- mutex_lock(&wdev->mtx);
+ wiphy_lock(wdev->wiphy);
__acquire(wdev->mtx);
}
@@ -24535,7 +24535,7 @@ void
wl_cfg80211_wdev_unlock(struct wireless_dev *wdev)
{
__release(wdev->mtx);
- mutex_unlock(&wdev->mtx);
+ wiphy_unlock(wdev->wiphy);
}
#ifdef WL_CLIENT_SAE