aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartosz Markowski <bartosz.markowski@tieto.com>2013-10-02 02:48:51 -0400
committerKalle Valo <kvalo@qca.qualcomm.com>2013-10-07 08:22:06 -0400
commit8acd3c97ff9ea803513c55f89d3f1832481b5b76 (patch)
tree1e2dc15a4a24cf71e5e2eacf466fcf6d37f80781
parenta07b5b840c5f4fda31b835806c0095408637f432 (diff)
ath10k: enable 10.x firmware branch support
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>
-rw-r--r--drivers/net/wireless/ath/ath10k/wmi.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index be75571d21a0..416dabbc4993 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -1970,26 +1970,21 @@ static void ath10k_wmi_process_rx(struct ath10k *ar, struct sk_buff *skb)
1970/* WMI Initialization functions */ 1970/* WMI Initialization functions */
1971int ath10k_wmi_attach(struct ath10k *ar) 1971int ath10k_wmi_attach(struct ath10k *ar)
1972{ 1972{
1973 int ret;
1974
1975 if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) { 1973 if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {
1976 ath10k_warn("Firmware 10.X is not yet supported\n");
1977 ar->wmi.cmd = &wmi_10x_cmd_map; 1974 ar->wmi.cmd = &wmi_10x_cmd_map;
1978 ar->wmi.vdev_param = &wmi_10x_vdev_param_map; 1975 ar->wmi.vdev_param = &wmi_10x_vdev_param_map;
1979 ar->wmi.pdev_param = &wmi_10x_pdev_param_map; 1976 ar->wmi.pdev_param = &wmi_10x_pdev_param_map;
1980 ret = -ENOTSUPP;
1981 } else { 1977 } else {
1982 ar->wmi.cmd = &wmi_cmd_map; 1978 ar->wmi.cmd = &wmi_cmd_map;
1983 ar->wmi.vdev_param = &wmi_vdev_param_map; 1979 ar->wmi.vdev_param = &wmi_vdev_param_map;
1984 ar->wmi.pdev_param = &wmi_pdev_param_map; 1980 ar->wmi.pdev_param = &wmi_pdev_param_map;
1985 ret = 0;
1986 } 1981 }
1987 1982
1988 init_completion(&ar->wmi.service_ready); 1983 init_completion(&ar->wmi.service_ready);
1989 init_completion(&ar->wmi.unified_ready); 1984 init_completion(&ar->wmi.unified_ready);
1990 init_waitqueue_head(&ar->wmi.tx_credits_wq); 1985 init_waitqueue_head(&ar->wmi.tx_credits_wq);
1991 1986
1992 return ret; 1987 return 0;
1993} 1988}
1994 1989
1995void ath10k_wmi_detach(struct ath10k *ar) 1990void ath10k_wmi_detach(struct ath10k *ar)