diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-02-18 10:30:18 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-23 21:38:12 -0700 |
commit | 6856fbe8d4847fd6b5dd1fe86f8758b2fa912e31 (patch) | |
tree | fbeec43028537ae9bbf0781ab2a5cfa709820b3c /drivers/net/wireless | |
parent | 078daa8b20b5ffe790f8b3cdf9a4df6ee965c30a (diff) | |
download | linux-3.10-6856fbe8d4847fd6b5dd1fe86f8758b2fa912e31.tar.gz linux-3.10-6856fbe8d4847fd6b5dd1fe86f8758b2fa912e31.tar.bz2 linux-3.10-6856fbe8d4847fd6b5dd1fe86f8758b2fa912e31.zip |
iwlwifi: dvm: clear IWL_STA_UCODE_INPROGRESS when assoc fails
commit ec6f678c74dbdb06a6a775bbb00f1d26c17c404b upstream.
We set IWL_STA_UCODE_INPROGRESS flag when we add a station
and clear it when we send the LQ command for it. But the LQ
command is sent only when the association succeeds.
If the association doesn't succeed, we would leave this flag
set and that wouldn't indicate the station entry as vacant.
This probably fixes:
https://bugzilla.redhat.com/show_bug.cgi?id=1065663
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/sta.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/sta.c b/drivers/net/wireless/iwlwifi/dvm/sta.c index c3c13ce96eb..e800002d615 100644 --- a/drivers/net/wireless/iwlwifi/dvm/sta.c +++ b/drivers/net/wireless/iwlwifi/dvm/sta.c @@ -590,6 +590,7 @@ void iwl_deactivate_station(struct iwl_priv *priv, const u8 sta_id, sizeof(priv->tid_data[sta_id][tid])); priv->stations[sta_id].used &= ~IWL_STA_DRIVER_ACTIVE; + priv->stations[sta_id].used &= ~IWL_STA_UCODE_INPROGRESS; priv->num_stations--; |