]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
iwlwifi: fix scan abort
authorStanislaw Gruszka <sgruszka@redhat.com>
Thu, 29 Jul 2010 09:37:41 +0000 (11:37 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 10 Aug 2010 18:09:20 +0000 (11:09 -0700)
commit5806c0444a387eb4cfecaec74660427f15dfd570
treefd31c93c828e72f253c6c37a068f2ac30cd8bcec
parent50c144185e4bc848ecdc58cc80113bc48beefdc4
iwlwifi: fix scan abort

commit d28232b461b8d54b09e59325dbac8b0913ce2049 upstream.

Fix possible double priv->mutex lock introduced by commit
a69b03e941abae00380fc6bc1877fb797a1b31e6
"iwlwifi: cancel scan watchdog in iwl_bg_abort_scan" .
We can not call cancel_delayed_work_sync(&priv->scan_check) with
priv->mutex locked because workqueue function iwl_bg_scan_check()
take that lock internally.

We do not need to synchronize when canceling priv->scan_check work.
We can avoid races (sending double abort command or send no
command at all) using STATUS_SCAN_ABORT bit. Moreover
current iwl_bg_scan_check() code seems to be broken, as
we should not send abort commands when currently aborting.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/net/wireless/iwlwifi/iwl-scan.c