From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 30 Oct 2008 18:12:21 +0000 (-0400)
Subject: iwlagn: avoid sleep in softirq context
X-Git-Tag: v2.6.28-rc4~22^2^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=964d2777438bf7687324243d38ade538d9bbfe3c;p=pandora-kernel.git

iwlagn: avoid sleep in softirq context

__ieee80211_tasklet_handler -> __ieee80211_rx ->
	__ieee80211_rx_handle_packet -> ieee80211_invoke_rx_handlers ->
	ieee80211_rx_h_decrypt -> ieee80211_crypto_tkip_decrypt ->
	ieee80211_tkip_decrypt_data -> iwl4965_mac_update_tkip_key ->
	iwl_scan_cancel_timeout -> msleep

Ooops!

Avoid the sleep by changing iwl_scan_cancel_timeout with
iwl_scan_cancel and simply returning on failure if the scan persists.
This will cause hardware decryption to fail and we'll handle a few more
frames with software decryption.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

Reading git-diff-tree failed