aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-08-18 12:35:21 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-08-24 16:32:05 -0400
commit54c8067a4a0606f466faf0f30b16684b00060e70 (patch)
treef499545f4e9355e0ed1886336ce9544cbec599cc /drivers/net
parent21cb987914cb5334af78378141efed77505ea987 (diff)
iwlagn: do not check for AP mode for WEP keys
Even when we configure WEP keys in AP mode ones without a station pointer are default keys, so don't check for AP mode here. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 40b82d9f309e..5b967c014b41 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3450,7 +3450,7 @@ static int iwl_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
3450 */ 3450 */
3451 if ((key->cipher == WLAN_CIPHER_SUITE_WEP40 || 3451 if ((key->cipher == WLAN_CIPHER_SUITE_WEP40 ||
3452 key->cipher == WLAN_CIPHER_SUITE_WEP104) && 3452 key->cipher == WLAN_CIPHER_SUITE_WEP104) &&
3453 !sta && vif->type != NL80211_IFTYPE_AP) { 3453 !sta) {
3454 if (cmd == SET_KEY) 3454 if (cmd == SET_KEY)
3455 is_default_wep_key = !priv->key_mapping_key; 3455 is_default_wep_key = !priv->key_mapping_key;
3456 else 3456 else