projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'regulator/topic/tps65218', 'regulator/topic/tps6524x...
[cascardo/linux.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
dvm
/
sta.c
diff --git
a/drivers/net/wireless/iwlwifi/dvm/sta.c
b/drivers/net/wireless/iwlwifi/dvm/sta.c
index
c0d070c
..
9cdd91c
100644
(file)
--- 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--;