diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2008-05-15 01:54:09 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-05-21 21:48:01 -0400 |
| commit | ccc038abe4cb00cf56aeae5b1df47fcc4ed4136c (patch) | |
| tree | 0c35fec8a1c9e7179f9b756d30c3f8af02d9bfa5 /drivers/net/wireless/iwlwifi/iwl-sta.h | |
| parent | a98410139a2ef6553ae5d73bf12bb9a68d0b38b9 (diff) | |
iwlwifi: clean up and bug fix for security
This patch cleans up code in security.
1) uses the new pointer to ieee80211_key_conf passed with the tx_control.
2) resolves bug reported by Mirco Tischler (sends ADD_STA in ASYNC mode)
3) resolves bug reported by Volker Braun regarding dynamic WEP
4) drops a WEP packet which has been garbaged by firmware. This can
happen upon rekeying.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-sta.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-sta.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.h b/drivers/net/wireless/iwlwifi/iwl-sta.h index ee256430708..b643546961f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.h +++ b/drivers/net/wireless/iwlwifi/iwl-sta.h | |||
| @@ -29,6 +29,9 @@ | |||
| 29 | #ifndef __iwl_sta_h__ | 29 | #ifndef __iwl_sta_h__ |
| 30 | #define __iwl_sta_h__ | 30 | #define __iwl_sta_h__ |
| 31 | 31 | ||
| 32 | #define HW_KEY_DYNAMIC 0 | ||
| 33 | #define HW_KEY_DEFAULT 1 | ||
| 34 | |||
| 32 | int iwl_get_free_ucode_key_index(struct iwl_priv *priv); | 35 | int iwl_get_free_ucode_key_index(struct iwl_priv *priv); |
| 33 | int iwl_send_static_wepkey_cmd(struct iwl_priv *priv, u8 send_if_empty); | 36 | int iwl_send_static_wepkey_cmd(struct iwl_priv *priv, u8 send_if_empty); |
| 34 | int iwl_remove_default_wep_key(struct iwl_priv *priv, | 37 | int iwl_remove_default_wep_key(struct iwl_priv *priv, |