From patchwork Wed Oct 2 06:48:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Markowski X-Patchwork-Id: 2973151 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 566AABFF0B for ; Wed, 2 Oct 2013 06:49:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F145A20394 for ; Wed, 2 Oct 2013 06:49:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1BD642034D for ; Wed, 2 Oct 2013 06:49:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752868Ab3JBGtC (ORCPT ); Wed, 2 Oct 2013 02:49:02 -0400 Received: from mail-ee0-f47.google.com ([74.125.83.47]:51373 "EHLO mail-ee0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750835Ab3JBGtB (ORCPT ); Wed, 2 Oct 2013 02:49:01 -0400 Received: by mail-ee0-f47.google.com with SMTP id d49so154554eek.6 for ; Tue, 01 Oct 2013 23:49:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id; bh=iOOIn/CIux4W7S6pLJd0mdn4gFtDTcwC083Gl4yG5+E=; b=3HUVditPZF07nEOsZSp1RzoVEqNIgkieTnUHTrGc7VJHHBSq6u+U35N0OyaYxohnFy stP/j9zgNE0M0rz6FvA2JaFKIhYEu7wIcrZAxN4vmktyKWCtq3PuWvSyoEBdL6/LiVIk 8LymKhsB/tAeziuz8dYqViuPcbCIJgINp/UtM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=iOOIn/CIux4W7S6pLJd0mdn4gFtDTcwC083Gl4yG5+E=; b=fVuXTeL3aQ8SZxJ4NbBqOpJk9Nv1y7TcEtbyOTw16Pj/jEWWKsp2qx4rUD/+zNCXbP K0rMvpqGzxWumAhYJkJMB4hbqjzib2l4/nUY2/IA2jvY3WcGtrf/IKkJFLrMIvxYbzla Fj+EhdDoFiDbaNpstKwUPQr4wFfxNBxhk+CTvDqP92QCgI1+/ooPjlaNhqD0lOweg6r5 +22695kxXq7S06B54k8VmtbJY9mjpeYmNcrA396RgItgWctjkCELQybrf8WNXO62TQxf z1k311kLWyItHq45CCw78ajY77ayEMxJGrQW+qNUlQmdMrb89Zj4MRIpr8x7SQwTNKiu B6nw== X-Gm-Message-State: ALoCoQnJlodjxMMIid9ZfimqFMAvlypPBbdoGeeumtUpA02fEVxRR8k3mhVUwTSrsK8NoYPR6qoJl1k9nG3GzmfQQUKiROI49QYoEFIZkl14QjWcL/Y4lcg= X-Received: by 10.14.100.138 with SMTP id z10mr297641eef.74.1380696539983; Tue, 01 Oct 2013 23:48:59 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id d8sm284593eeh.8.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 01 Oct 2013 23:48:59 -0700 (PDT) From: Bartosz Markowski To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Bartosz Markowski Subject: [PATCH 1/2] ath10k: advestise 10.X fw support on wmi_attach Date: Wed, 2 Oct 2013 08:48:51 +0200 Message-Id: <1380696532-4147-1-git-send-email-bartosz.markowski@tieto.com> X-Mailer: git-send-email 1.7.9.5 X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since the WMI API has been added and we can detect from the FW IEs what firmware variant we deal with, turn on 10.X support. Signed-off-by: Bartosz Markowski --- drivers/net/wireless/ath/ath10k/wmi.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index be75571..416dabb 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) /* 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)