diff options
| author | Emmanuel Grumbach | 2008-05-15 07:54:09 +0200 |
|---|---|---|
| committer | John W. Linville | 2008-05-22 03:48:01 +0200 |
| commit | ccc038abe4cb00cf56aeae5b1df47fcc4ed4136c (patch) | |
| tree | 0c35fec8a1c9e7179f9b756d30c3f8af02d9bfa5 /drivers/net/wireless/iwlwifi/iwl4965-base.c | |
| parent | iwlwifi: don't switch to SGI if not supported by AP (diff) | |
| download | kernel-qcow2-linux-ccc038abe4cb00cf56aeae5b1df47fcc4ed4136c.tar.gz kernel-qcow2-linux-ccc038abe4cb00cf56aeae5b1df47fcc4ed4136c.tar.xz kernel-qcow2-linux-ccc038abe4cb00cf56aeae5b1df47fcc4ed4136c.zip | |
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/iwl4965-base.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index a532a9e576dc..40616dbd26f0 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c @@ -4951,7 +4951,8 @@ static int iwl4965_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, if (cmd == SET_KEY) is_default_wep_key = !priv->key_mapping_key; else - is_default_wep_key = priv->default_wep_key; + is_default_wep_key = + (key->hw_key_idx == HW_KEY_DEFAULT); } switch (cmd) { |