diff options
| author | John W. Linville | 2014-02-24 20:41:35 +0100 |
|---|---|---|
| committer | John W. Linville | 2014-02-24 20:41:35 +0100 |
| commit | 694d82d913d18c6c6872b0dc93294fdf9c245667 (patch) | |
| tree | 3b5ea01c9cb03f6c988ff09122a4b38d8243ee84 | |
| parent | ath9k: Fix ETSI compliance for AR9462 2.0 (diff) | |
| parent | iwlwifi: dvm: clear IWL_STA_UCODE_INPROGRESS when assoc fails (diff) | |
| download | kernel-qcow2-linux-694d82d913d18c6c6872b0dc93294fdf9c245667.tar.gz kernel-qcow2-linux-694d82d913d18c6c6872b0dc93294fdf9c245667.tar.xz kernel-qcow2-linux-694d82d913d18c6c6872b0dc93294fdf9c245667.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
| -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 c0d070c5df5e..9cdd91cdf661 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--; |