Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / iwlwifi / iwl-sta.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
index 0ea08d080928040ce6f57e6344afea4e7a9be145..1684490d93c00f474da32cedb27e6cc0b7649350 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
@@ -472,6 +472,7 @@ EXPORT_SYMBOL(iwl_remove_station);
 void iwl_clear_stations_table(struct iwl_priv *priv)
 {
        unsigned long flags;
+       int i;
 
        spin_lock_irqsave(&priv->sta_lock, flags);
 
@@ -486,6 +487,12 @@ void iwl_clear_stations_table(struct iwl_priv *priv)
        /* clean ucode key table bit map */
        priv->ucode_key_table = 0;
 
+       /* keep track of static keys */
+       for (i = 0; i < WEP_KEYS_MAX ; i++) {
+               if (priv->wep_keys[i].key_size)
+                       test_and_set_bit(i, &priv->ucode_key_table);
+       }
+
        spin_unlock_irqrestore(&priv->sta_lock, flags);
 }
 EXPORT_SYMBOL(iwl_clear_stations_table);