From patchwork Fri Nov 14 03:17:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 5302761 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1EAB09FD72 for ; Fri, 14 Nov 2014 03:18:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 505662012E for ; Fri, 14 Nov 2014 03:18:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6348220123 for ; Fri, 14 Nov 2014 03:18:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933619AbaKNDR7 (ORCPT ); Thu, 13 Nov 2014 22:17:59 -0500 Received: from wolverine02.qualcomm.com ([199.106.114.251]:64997 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933486AbaKNDR7 (ORCPT ); Thu, 13 Nov 2014 22:17:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1415935079; x=1447471079; h=from:to:cc:subject:date:message-id:mime-version; bh=T5Qb1Gy12yfI/KZr+spZNXBROQAZA6fUS+8T1ndJBnk=; b=CnG+fisRvb2xv3+1LrgwpNt/mt2KehwEYQP5t+GxaiXMahuaTH6AzoAG 4ooQ6tYcyUZogx2V9jabnhByVoFmsGCn5U6/py+V1Ay2egIHT7LNpe7ee VxKA81Kb4cjSmHQVUc2/wIhTd0p402bMS7Kz26mTQS9uOPivTLMcqDt5C 8=; X-IronPort-AV: E=McAfee;i="5600,1067,7621"; a="175839558" Received: from ironmsg04-r.qualcomm.com ([172.30.46.18]) by wolverine02.qualcomm.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 13 Nov 2014 19:17:58 -0800 X-IronPort-AV: E=Sophos;i="5.07,382,1413270000"; d="scan'208";a="844743948" Received: from nasanexm01b.na.qualcomm.com ([129.46.53.226]) by Ironmsg04-R.qualcomm.com with ESMTP/TLS/RC4-SHA; 13 Nov 2014 19:17:59 -0800 Received: from poh-linux2.qualcomm.com (10.80.80.8) by NASANEXM01B.na.qualcomm.com (129.46.53.226) with Microsoft SMTP Server (TLS) id 15.0.913.22; Thu, 13 Nov 2014 19:17:57 -0800 From: Peter Oh To: CC: Subject: [PATCH] ath10k: fix mismatched wmi api call Date: Thu, 13 Nov 2014 19:17:51 -0800 Message-ID: <1415935071-21422-1-git-send-email-poh@qca.qualcomm.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01C.na.qualcomm.com (129.46.53.236) To NASANEXM01B.na.qualcomm.com (129.46.53.226) 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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 Fix to use v10.2 wmi call for firmware v10.2. It turned out that peer association function was using v10.1 wmi call for v10.2 firmware during code review. Signed-off-by: Peter Oh --- drivers/net/wireless/ath/ath10k/wmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index ae746ce..f5d1081 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.c +++ b/drivers/net/wireless/ath/ath10k/wmi.c @@ -4187,9 +4187,9 @@ int ath10k_wmi_peer_assoc(struct ath10k *ar, if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) { if (test_bit(ATH10K_FW_FEATURE_WMI_10_2, ar->fw_features)) - ath10k_wmi_peer_assoc_fill_10_1(ar, skb->data, arg); - else ath10k_wmi_peer_assoc_fill_10_2(ar, skb->data, arg); + else + ath10k_wmi_peer_assoc_fill_10_1(ar, skb->data, arg); } else { ath10k_wmi_peer_assoc_fill_main(ar, skb->data, arg); }