| From d6ee27eb13beab94056e0de52d81220058ca2297 Mon Sep 17 00:00:00 2001 |
| From: Emmanuel Grumbach <emmanuel.grumbach@intel.com> |
| Date: Wed, 6 Jun 2012 09:13:36 +0200 |
| Subject: iwlwifi: don't mess up the SCD when removing a key |
| |
| From: Emmanuel Grumbach <emmanuel.grumbach@intel.com> |
| |
| commit d6ee27eb13beab94056e0de52d81220058ca2297 upstream. |
| |
| When we remove a key, we put a key index which was supposed |
| to tell the fw that we are actually removing the key. But |
| instead the fw took that index as a valid index and messed |
| up the SRAM of the device. |
| |
| This memory corruption on the device mangled the data of |
| the SCD. The impact on the user is that SCD queue 2 got |
| stuck after having removed keys. |
| The message is the log that was printed is: |
| |
| Queue 2 stuck for 10000ms |
| |
| This doesn't seem to fix the higher queues that get stuck |
| from time to time. |
| |
| Reviewed-by: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com> |
| Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> |
| Signed-off-by: Johannes Berg <johannes.berg@intel.com> |
| Signed-off-by: John W. Linville <linville@tuxdriver.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c |
| +++ b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c |
| @@ -477,7 +477,7 @@ int iwl_remove_dynamic_key(struct iwl_pr |
| sizeof(struct iwl_keyinfo)); |
| priv->stations[sta_id].sta.key.key_flags = |
| STA_KEY_FLG_NO_ENC | STA_KEY_FLG_INVALID; |
| - priv->stations[sta_id].sta.key.key_offset = WEP_INVALID_OFFSET; |
| + priv->stations[sta_id].sta.key.key_offset = keyconf->hw_key_idx; |
| priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK; |
| priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK; |
| |