diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2015-02-06 01:57:37 -0500 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2015-02-06 01:57:37 -0500 |
| commit | 8cd4cbf249483822c6d52109b3d6ec6fd189a32b (patch) | |
| tree | 2fb0e2e4f54bd2eca28cc22ce00c74268d32f45c /drivers/net/wireless/iwlwifi/dvm/ucode.c | |
| parent | 297540f69fa9c7292c9866e71cb22a7bc4c5003b (diff) | |
| parent | b9a641d9cb768177a7c867e382a2fdb6023b06ad (diff) | |
Merge tag 'iwlwifi-next-for-kalle-2015-02-03' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
* Add support for beamforming
* Enable stuck queue detection for iwlmvm
* A few fixes for EBS scan
* Fixes for various failure paths
* Improvements for TDLS Offchannel
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/ucode.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/ucode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/ucode.c b/drivers/net/wireless/iwlwifi/dvm/ucode.c index d5cee1530597..4dbef7e58c2e 100644 --- a/drivers/net/wireless/iwlwifi/dvm/ucode.c +++ b/drivers/net/wireless/iwlwifi/dvm/ucode.c | |||
| @@ -267,7 +267,7 @@ static int iwl_alive_notify(struct iwl_priv *priv) | |||
| 267 | for (i = 0; i < n_queues; i++) | 267 | for (i = 0; i < n_queues; i++) |
| 268 | if (queue_to_txf[i] != IWL_TX_FIFO_UNUSED) | 268 | if (queue_to_txf[i] != IWL_TX_FIFO_UNUSED) |
| 269 | iwl_trans_ac_txq_enable(priv->trans, i, | 269 | iwl_trans_ac_txq_enable(priv->trans, i, |
| 270 | queue_to_txf[i]); | 270 | queue_to_txf[i], 0); |
| 271 | 271 | ||
| 272 | priv->passive_no_rx = false; | 272 | priv->passive_no_rx = false; |
| 273 | priv->transport_queue_stop = 0; | 273 | priv->transport_queue_stop = 0; |