Skip to content

Commit 4e921a4

Browse files
Ping-Ke Shihmehmetb0
authored andcommitted
Revert "wifi: cfg80211: check wiphy mutex is held for wdev mutex"
BugLink: https://bugs.launchpad.net/bugs/2086242 This reverts commit 89795eeba6d13b5ba432425dd43c34c66f2cebde which is commmit 1474bc8 upstream. The reverted commit is based on implementation of wiphy locking that isn't planned to redo on a stable kernel, so revert it to avoid warning: WARNING: CPU: 0 PID: 9 at net/wireless/core.h:231 disconnect_work+0xb8/0x144 [cfg80211] CPU: 0 PID: 9 Comm: kworker/0:1 Not tainted 6.6.51-00141-ga1649b6f8ed6 #7 Hardware name: Freescale i.MX6 SoloX (Device Tree) Workqueue: events disconnect_work [cfg80211] unwind_backtrace from show_stack+0x10/0x14 show_stack from dump_stack_lvl+0x58/0x70 dump_stack_lvl from __warn+0x70/0x1c0 __warn from warn_slowpath_fmt+0x16c/0x294 warn_slowpath_fmt from disconnect_work+0xb8/0x144 [cfg80211] disconnect_work [cfg80211] from process_one_work+0x204/0x620 process_one_work from worker_thread+0x1b0/0x474 worker_thread from kthread+0x10c/0x12c kthread from ret_from_fork+0x14/0x24 Reported-by: petter@technux.se Closes: https://lore.kernel.org/linux-wireless/9e98937d781c990615ef27ee0c858ff9@technux.se/T/#t Cc: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Koichiro Den <koichiro.den@canonical.com> Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
1 parent bff7dc9 commit 4e921a4

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

net/wireless/core.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -217,24 +217,18 @@ void cfg80211_register_wdev(struct cfg80211_registered_device *rdev,
217217
static inline void wdev_lock(struct wireless_dev *wdev)
218218
__acquires(wdev)
219219
{
220-
lockdep_assert_held(&wdev->wiphy->mtx);
221220
mutex_lock(&wdev->mtx);
222221
__acquire(wdev->mtx);
223222
}
224223

225224
static inline void wdev_unlock(struct wireless_dev *wdev)
226225
__releases(wdev)
227226
{
228-
lockdep_assert_held(&wdev->wiphy->mtx);
229227
__release(wdev->mtx);
230228
mutex_unlock(&wdev->mtx);
231229
}
232230

233-
static inline void ASSERT_WDEV_LOCK(struct wireless_dev *wdev)
234-
{
235-
lockdep_assert_held(&wdev->wiphy->mtx);
236-
lockdep_assert_held(&wdev->mtx);
237-
}
231+
#define ASSERT_WDEV_LOCK(wdev) lockdep_assert_held(&(wdev)->mtx)
238232

239233
static inline bool cfg80211_has_monitors_only(struct cfg80211_registered_device *rdev)
240234
{

0 commit comments

Comments
 (0)