diff options
author | Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com> | 2011-11-11 10:03:00 -0500 |
---|---|---|
committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2011-11-13 05:44:28 -0500 |
commit | 7cefa44f140bc88def4f68f38c76d37d5fd61630 (patch) | |
tree | dad26b2cfe88c29f23252e827ab8ef362d697d58 /drivers/net/wireless/ath/ath6kl/cfg80211.c | |
parent | fde57764ef8751b9aca11b6f6221ac5555bda699 (diff) |
ath6kl: Fix bug in setting default key index for tx in AP mode
vif->def_txkey_index is set to key_index in ath6kl_cfg80211_add_key().
If the interface is configured with multiple static wep keys,
vif->def_txkey_index would be holding the index of the last key configured,
not the default tx key index. Remove this unnecessary default key index setting
in ath6kl_cfg80211_add_key() to configure the right key index in WEP thereby
make it work when multiple wep keys are configured.
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/cfg80211.c')
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/cfg80211.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c index 41260c8b8876..0ef844220278 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c | |||
@@ -997,8 +997,6 @@ static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev, | |||
997 | __func__, key_index, key->key_len, key_type, | 997 | __func__, key_index, key->key_len, key_type, |
998 | key_usage, key->seq_len); | 998 | key_usage, key->seq_len); |
999 | 999 | ||
1000 | vif->def_txkey_index = key_index; | ||
1001 | |||
1002 | if (vif->nw_type == AP_NETWORK && !pairwise && | 1000 | if (vif->nw_type == AP_NETWORK && !pairwise && |
1003 | (key_type == TKIP_CRYPT || key_type == AES_CRYPT) && params) { | 1001 | (key_type == TKIP_CRYPT || key_type == AES_CRYPT) && params) { |
1004 | ar->ap_mode_bkey.valid = true; | 1002 | ar->ap_mode_bkey.valid = true; |
@@ -1033,8 +1031,7 @@ static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev, | |||
1033 | return 0; | 1031 | return 0; |
1034 | } | 1032 | } |
1035 | 1033 | ||
1036 | return ath6kl_wmi_addkey_cmd(ar->wmi, vif->fw_vif_idx, | 1034 | return ath6kl_wmi_addkey_cmd(ar->wmi, vif->fw_vif_idx, key_index, |
1037 | vif->def_txkey_index, | ||
1038 | key_type, key_usage, key->key_len, | 1035 | key_type, key_usage, key->key_len, |
1039 | key->seq, key->seq_len, key->key, | 1036 | key->seq, key->seq_len, key->key, |
1040 | KEY_OP_INIT_VAL, | 1037 | KEY_OP_INIT_VAL, |