]> git.baikalelectronics.ru Git - kernel.git/commit
iwlwifi: fix possible recursive locking deadlock
authorJohannes Berg <johannes.berg@intel.com>
Fri, 30 Jul 2010 11:30:46 +0000 (13:30 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 4 Aug 2010 19:27:36 +0000 (15:27 -0400)
commit7fb4d20b217b58606fd0d2b5fcdcd874dfd2a1aa
tree47f498455ce5b765ca7253dc3e78b60cd47de394
parent5d9884cefc789d03e4edb402e88dc2aa35f42c49
iwlwifi: fix possible recursive locking deadlock

commit 3e31a1341f06cac86ae4b02ccc30dd0d45914b66
Author: Johannes Berg <johannes.berg@intel.com>
Date:   Tue May 18 02:29:13 2010 -0700

    iwlwifi: queue user-initiated scan when doing internal scan

introduced a potential deadlock because it calls
ieee80211_scan_completed() with the priv->mutex
held, but mac80211 may call back into iwlwifi
which would lead to recursive locking. Move this
out from under the mutex.

Cc: stable@kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-core.c