Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…

…t/iwlwifi/iwlwifi-fixes
git-mirror · Feb 24, 2014 · 694d82d · 694d82d
2 parents b305024 + ec6f678
commit 694d82d
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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--;