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

diff --combined 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,
@@@ -811,6 -807,12 +811,12 @@@
                            ar->fw_api,
                            ar->htt.target_version_major,
                            ar->htt.target_version_minor);
+               ath10k_info("debug %d debugfs %d tracing %d dfs %d\n",
+                           config_enabled(CONFIG_ATH10K_DEBUG),
+                           config_enabled(CONFIG_ATH10K_DEBUGFS),
+                           config_enabled(CONFIG_ATH10K_TRACING),
+                           config_enabled(CONFIG_ATH10K_DFS_CERTIFIED));
+       }
  
        __set_bit(ATH10K_FLAG_FIRST_BOOT_DONE, &ar->dev_flags);
  
@@@ -988,7 -990,9 +994,9 @@@ err_unregister_mac
  err_release_fw:
        ath10k_core_free_firmware_files(ar);
  err:
-       device_release_driver(ar->dev);
+       /* TODO: It's probably a good idea to release device from the driver
+        * but calling device_release_driver() here will cause a deadlock.
+        */
        return;
  }
  

diff --combined drivers/net/wireless/ath/ath6kl/wmi.h
index bb23fc00111dc6c3329762ee976ce93489015b90,8d4d88531404d4ca05b65140af295752d1e55292..19f88b4a24fbcef48bb31888abcd92a5bb0ce354
--- 1/drivers/net/wireless/ath/ath6kl/wmi.h
--- 2/drivers/net/wireless/ath/ath6kl/wmi.h
+++ b/drivers/net/wireless/ath/ath6kl/wmi.h
@@@ -1067,7 -1067,7 +1067,7 @@@ struct wmi_power_mode_cmd 
  } __packed;
  
  /*
 - * Policy to determnine whether power save failure event should be sent to
 + * Policy to determine whether power save failure event should be sent to
   * host during scanning
   */
  enum power_save_fail_event_policy {
@@@ -2632,7 -2632,7 +2632,7 @@@ int ath6kl_wmi_set_htcap_cmd(struct wm
                             struct ath6kl_htcap *htcap);
  int ath6kl_wmi_test_cmd(struct wmi *wmi, void *buf, size_t len);
  
- s32 ath6kl_wmi_get_rate(s8 rate_index);
+ s32 ath6kl_wmi_get_rate(struct wmi *wmi, s8 rate_index);
  
  int ath6kl_wmi_set_ip_cmd(struct wmi *wmi, u8 if_idx,
                          __be32 ips0, __be32 ips1);