]> bbs.cooldavid.org Git - net-next-2.6.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)
commit02f5ba5bac8b374bc2126920c7204c63019f28ce
tree47f498455ce5b765ca7253dc3e78b60cd47de394
parent3ff1c25927e3af61c6bf0e4ed959504058ae4565
iwlwifi: fix possible recursive locking deadlock

commit f84b29ec0a1ab767679d3f2428877b65f94bc3ff
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