From: Stanislaw Gruszka Date: Mon, 13 Sep 2010 12:46:37 +0000 (+0200) Subject: iwlwifi: rework iwl_scan_cancel_timeout X-Git-Tag: v2.6.37-rc1~147^2~373^2^2~90 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e693a802f06f538b711333a32a83e2732dc4773d;p=pandora-kernel.git iwlwifi: rework iwl_scan_cancel_timeout Since on timeout version of iwl_scan_cancel procedure we can sleep, do not have to schedule abort_scan work to begin and perform scanning, can do this directly. Also now, as we do not queue abort_scan from restart work anymore, we can queue abort_scan to priv->workqueue. Don't drop mutex when waiting for scan complete. Use STATUS_HW_SCAN bit to check if scanning is currently pending, because STATUS_SCANNING will be cleared only with priv->mutex taken. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi W Guy Signed-off-by: John W. Linville --- Reading git-diff-tree failed