From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 18 Jul 2014 17:44:50 +0000 (-0400)
Subject: Merge tag 'for-linville-20140717' of git://github.com/kvalo/ath
X-Git-Tag: v4.14-rc1~7092^2~12^2~85
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5235cd21212ca3701b678d7e93682999a772c995;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'for-linville-20140717' of git://github.com/kvalo/ath
---

5235cd21212ca3701b678d7e93682999a772c995
diff --cc drivers/net/wireless/ath/ath10k/core.c
index e6c56c5,aaf5f0e..93adb8c
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@@ -795,14 -795,10 +795,14 @@@ int ath10k_core_start(struct ath10k *ar
  	if (status)
  		goto err_htc_stop;
  
 -	ar->free_vdev_map = (1 << TARGET_NUM_VDEVS) - 1;
 +	if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features))
 +		ar->free_vdev_map = (1 << TARGET_10X_NUM_VDEVS) - 1;
 +	else
 +		ar->free_vdev_map = (1 << TARGET_NUM_VDEVS) - 1;
 +
  	INIT_LIST_HEAD(&ar->arvifs);
  
- 	if (!test_bit(ATH10K_FLAG_FIRST_BOOT_DONE, &ar->dev_flags))
+ 	if (!test_bit(ATH10K_FLAG_FIRST_BOOT_DONE, &ar->dev_flags)) {
  		ath10k_info("%s (0x%08x, 0x%08x) fw %s api %d htt %d.%d\n",
  			    ar->hw_params.name,
  			    ar->target_version,