ath10k: enable 10.x firmware branch support
authorBartosz Markowski <bartosz.markowski@tieto.com>
Wed, 2 Oct 2013 06:48:51 +0000 (08:48 +0200)
committerKalle Valo <kvalo@qca.qualcomm.com>
Mon, 7 Oct 2013 12:22:06 +0000 (15:22 +0300)
Since the WMI API has been added and we can detect from the
FW IEs what firmware variant we deal with, turn on support
for 10.x firmware branch in ath10k_wmi_attach().

kvalo: improve the commit log

Signed-off-by: Bartosz Markowski <bartosz.markowski@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
drivers/net/wireless/ath/ath10k/wmi.c

index be75571d21a0f0ad1bfdbfa59970ddc8c3b32dbb..416dabbc49935f2529d9ea02e9a339cb3819fd9b 100644 (file)
@@ -1970,26 +1970,21 @@ static void ath10k_wmi_process_rx(struct ath10k *ar, struct sk_buff *skb)
 /* WMI Initialization functions */
 int ath10k_wmi_attach(struct ath10k *ar)
 {
-       int ret;
-
        if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {
-               ath10k_warn("Firmware 10.X is not yet supported\n");
                ar->wmi.cmd = &wmi_10x_cmd_map;
                ar->wmi.vdev_param = &wmi_10x_vdev_param_map;
                ar->wmi.pdev_param = &wmi_10x_pdev_param_map;
-               ret = -ENOTSUPP;
        } else {
                ar->wmi.cmd = &wmi_cmd_map;
                ar->wmi.vdev_param = &wmi_vdev_param_map;
                ar->wmi.pdev_param = &wmi_pdev_param_map;
-               ret = 0;
        }
 
        init_completion(&ar->wmi.service_ready);
        init_completion(&ar->wmi.unified_ready);
        init_waitqueue_head(&ar->wmi.tx_credits_wq);
 
-       return ret;
+       return 0;
 }
 
 void ath10k_wmi_detach(struct ath10k *ar)