Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

694d82d9 · John W. Linville · b3050248 · ec6f678c · 694d82d9
Commit 694d82d9 authored Feb 24, 2014 by John W. Linville
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

drivers/net/wireless/iwlwifi/dvm/sta.c drivers/net/wireless/iwlwifi/dvm/sta.c +1 -0

No files found.
--- 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--;