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

diff --cc drivers/net/wireless/ath/ath10k/core.c
index e6c56c5bb0f608c3c7377b06cb9d3ff491caee42,aaf5f0eea2dca32999bbc4d69a02c501e25091da..93adb8c5896926c787bb80e6c0869cd7f5fd4672
--- 1/drivers/net/wireless/ath/ath10k/core.c
--- 2/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,

diff --cc drivers/net/wireless/ath/ath6kl/wmi.h
Simple merge