diff options
| author | Joel Stanley <joel@jms.id.au> | 2016-07-22 14:00:50 +0930 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2016-07-22 14:00:50 +0930 |
| commit | 48be0c57f9c5f5c197fba129924709660a23a4a0 (patch) | |
| tree | 4601cbecb454dfab02631248b7bb8eb5d239c165 /drivers/net/wireless/ath/ath10k/core.c | |
| parent | b951233aa15e85d43aed2421e0adac1a2abc5770 (diff) | |
| parent | 35467dc7630af60abacc330f64029d081f160530 (diff) | |
| download | talos-obmc-linux-48be0c57f9c5f5c197fba129924709660a23a4a0.tar.gz talos-obmc-linux-48be0c57f9c5f5c197fba129924709660a23a4a0.zip | |
Merge tag 'v4.4.15' into dev-4.4
This is the 4.4.15 stable release
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/core.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index 0947cc271e69..531de256d58d 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -1681,6 +1681,10 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode) goto err_hif_stop; } + ar->free_vdev_map = (1LL << ar->max_num_vdevs) - 1; + + INIT_LIST_HEAD(&ar->arvifs); + /* we don't care about HTT in UTF mode */ if (mode == ATH10K_FIRMWARE_MODE_NORMAL) { status = ath10k_htt_setup(&ar->htt); @@ -1694,10 +1698,6 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode) if (status) goto err_hif_stop; - ar->free_vdev_map = (1LL << ar->max_num_vdevs) - 1; - - INIT_LIST_HEAD(&ar->arvifs); - return 0; err_hif_stop: |
