__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 <[email protected]>
---
drivers/net/wireless/iwlwifi/iwl-agn.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 89450e3..12ffa04 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3247,7 +3247,11 @@ static void iwl4965_mac_update_tkip_key(struct ieee80211_hw *hw,
return;
}
- iwl_scan_cancel_timeout(priv, 100);
+ if (iwl_scan_cancel(priv)) {
+ /* cancel scan failed, just live w/ bad key and rely
+ briefly on SW decrpyption */
+ return;
+ }
key_flags |= (STA_KEY_FLG_TKIP | STA_KEY_FLG_MAP_KEY_MSK);
key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS);
--
1.5.4.3
On Thu, 2008-10-30 at 11:12 -0700, John W. Linville wrote:
> __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 <[email protected]>
Thank you very much
>
> - iwl_scan_cancel_timeout(priv, 100);
> + if (iwl_scan_cancel(priv)) {
> + /* cancel scan failed, just live w/ bad key and rely
> + briefly on SW decrpyption */
Could you please add some debugging (IWL_DEBUG_MAC80211 ) here to log
the problem? Also watch for the small typo.
Reinette
__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 <[email protected]>
---
drivers/net/wireless/iwlwifi/iwl-agn.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 89450e3..5cca7bf 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3247,7 +3247,12 @@ static void iwl4965_mac_update_tkip_key(struct ieee80211_hw *hw,
return;
}
- iwl_scan_cancel_timeout(priv, 100);
+ if (iwl_scan_cancel(priv)) {
+ /* cancel scan failed, just live w/ bad key and rely
+ briefly on SW decrpyption */
+ IWL_DEBUG_MAC80211("leave - failed to cancel scan\n");
+ return;
+ }
key_flags |= (STA_KEY_FLG_TKIP | STA_KEY_FLG_MAP_KEY_MSK);
key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS);
--
1.5.4.3
On Thu, 2008-10-30 at 11:12 -0700, John W. Linville wrote:
> __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 <[email protected]>
> ---
> drivers/net/wireless/iwlwifi/iwl-agn.c | 6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
I forgot to mention that this patch will cause some trivial (name change) conflicts when merged together with one we submitted recently (http://marc.info/?l=linux-wireless&m=122531440910147&w=2 )
Reinette
On Fri, 2008-10-31 at 10:58 -0700, John W. Linville wrote:
> __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 <[email protected]>
> ---
> drivers/net/wireless/iwlwifi/iwl-agn.c | 7 ++++++-
> 1 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
> index 89450e3..5cca7bf 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-agn.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
> @@ -3247,7 +3247,12 @@ static void iwl4965_mac_update_tkip_key(struct ieee80211_hw *hw,
> return;
> }
>
> - iwl_scan_cancel_timeout(priv, 100);
> + if (iwl_scan_cancel(priv)) {
> + /* cancel scan failed, just live w/ bad key and rely
> + briefly on SW decrpyption */
> + IWL_DEBUG_MAC80211("leave - failed to cancel scan\n");
> + return;
> + }
Thanks for adding the debugging. The small typo is still there (in the
comments ... "decrpyption"). Could you please change it when you merge
this patch?
Acked-by: Reinette Chatre <[email protected]>
Reinette