diff options
author | David S. Miller <davem@davemloft.net> | 2009-05-08 15:46:17 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-08 15:46:17 -0400 |
commit | a8679be2073392cf22a910bc25da0c7d36459845 (patch) | |
tree | 0d25750ea4ba3a85fe683f285261083d77080976 /drivers/net/wireless/iwlwifi/iwl-sta.c | |
parent | 22f6dacdfcfdc792d068e9c41234808860498d04 (diff) | |
parent | 9dfd6ba353b993d648dcda72480c7ce92cd27c7e (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-sta.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-sta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c index 0072ea2c536..0eb939c40ac 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c | |||
@@ -490,7 +490,7 @@ void iwl_clear_stations_table(struct iwl_priv *priv) | |||
490 | /* keep track of static keys */ | 490 | /* keep track of static keys */ |
491 | for (i = 0; i < WEP_KEYS_MAX ; i++) { | 491 | for (i = 0; i < WEP_KEYS_MAX ; i++) { |
492 | if (priv->wep_keys[i].key_size) | 492 | if (priv->wep_keys[i].key_size) |
493 | test_and_set_bit(i, &priv->ucode_key_table); | 493 | set_bit(i, &priv->ucode_key_table); |
494 | } | 494 | } |
495 | 495 | ||
496 | spin_unlock_irqrestore(&priv->sta_lock, flags); | 496 | spin_unlock_irqrestore(&priv->sta_lock, flags); |