diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-07 02:52:44 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-07 02:52:44 -0800 |
| commit | 409f0a9014fe24d906ba21aaccff80eb7f7304da (patch) | |
| tree | 8d9a6946d6cf1c5aab72651a193ff860651e5e65 /drivers/net/wireless/iwlwifi/iwl-sta.c | |
| parent | 593721833d2a3987736467144ad062a709d3a72c (diff) | |
| parent | 0b492fce3d72d982a7981905f85484a1e1ba7fde (diff) | |
| download | blackbird-op-linux-409f0a9014fe24d906ba21aaccff80eb7f7304da.tar.gz blackbird-op-linux-409f0a9014fe24d906ba21aaccff80eb7f7304da.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-sta.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-sta.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c index 9bba98e5e056..20dc84152d4f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c @@ -483,6 +483,9 @@ void iwl_clear_stations_table(struct iwl_priv *priv) priv->num_stations = 0; memset(priv->stations, 0, sizeof(priv->stations)); + /* clean ucode key table bit map */ + priv->ucode_key_table = 0; + spin_unlock_irqrestore(&priv->sta_lock, flags); } EXPORT_SYMBOL(iwl_clear_stations_table); |
