From patchwork Thu Jul 16 02:01:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 6802911 X-Patchwork-Delegate: kvalo@adurom.com 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6CEFEC05AD for ; Thu, 16 Jul 2015 02:01:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8E99E20700 for ; Thu, 16 Jul 2015 02:01:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8A8D6206F7 for ; Thu, 16 Jul 2015 02:01:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756703AbbGPCBj (ORCPT ); Wed, 15 Jul 2015 22:01:39 -0400 Received: from wolverine01.qualcomm.com ([199.106.114.254]:12466 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755773AbbGPCBe (ORCPT ); Wed, 15 Jul 2015 22:01:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1437012094; x=1468548094; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=LXRXoE4cELYRRQW0rq4id+W8IdLhMjDue/mMZ/0eJtw=; b=rFjozXv4MHaz+LobV5dx3Dxk6Ld6u3uaovKd7yNv4AbdJ4yj2gNISmdV MZdIVmK1v/P5JXLQjW2HXWIVijUjP2hXZClIy2xcchp/8fV3Js/4EdrIb iGXk0s1/31wlM5UwW2+aQzTkm1lGLuq06FMs+3IDiSDVOrzS+d8jksSv/ Y=; X-IronPort-AV: E=McAfee;i="5700,7163,7863"; a="128071475" Received: from ironmsg01-lv.qualcomm.com ([10.47.202.180]) by wolverine01.qualcomm.com with ESMTP; 15 Jul 2015 19:01:34 -0700 X-IronPort-AV: E=Sophos;i="5.15,484,1432623600"; d="scan'208";a="33561897" Received: from nasanexm01b.na.qualcomm.com ([10.85.0.82]) by ironmsg01-lv.qualcomm.com with ESMTP/TLS/RC4-SHA; 15 Jul 2015 19:01:33 -0700 Received: from poh-linux2.qualcomm.com (10.80.80.8) by NASANEXM01B.na.qualcomm.com (10.85.0.82) with Microsoft SMTP Server (TLS) id 15.0.1076.9; Wed, 15 Jul 2015 19:01:33 -0700 From: Peter Oh To: CC: Subject: [PATCH v3 2/3] ath10k: redefine rx_ppdu_end_common structure to cover qca99x0 Date: Wed, 15 Jul 2015 19:01:20 -0700 Message-ID: <378147cac1ea1c963173360837080dfcc9af7ba5.1437011880.git.poh@qca.qualcomm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01F.na.qualcomm.com (10.85.0.32) To NASANEXM01B.na.qualcomm.com (10.85.0.82) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-8.2 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 rx_ppdu_end_common structure is valid for both of qca998x and qca6174, but not for qca99x0 since it has new additional members. Hence update the common structure to cover qca99x0 as well. Signed-off-by: Peter Oh --- drivers/net/wireless/ath/ath10k/rx_desc.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/rx_desc.h b/drivers/net/wireless/ath/ath10k/rx_desc.h index 492b5a5..6cb078d 100644 --- a/drivers/net/wireless/ath/ath10k/rx_desc.h +++ b/drivers/net/wireless/ath/ath10k/rx_desc.h @@ -891,13 +891,13 @@ struct rx_ppdu_end_common { __le32 evm_p15; __le32 tsf_timestamp; __le32 wb_timestamp; - u8 locationing_timestamp; - u8 phy_err_code; - __le16 flags; /* %RX_PPDU_END_FLAGS_ */ - __le32 info0; /* %RX_PPDU_END_INFO0_ */ } __packed; struct rx_ppdu_end_qca988x { + u8 locationing_timestamp; + u8 phy_err_code; + __le16 flags; /* %RX_PPDU_END_FLAGS_ */ + __le32 info0; /* %RX_PPDU_END_INFO0_ */ __le16 bb_length; __le16 info1; /* %RX_PPDU_END_INFO1_ */ } __packed; @@ -909,6 +909,10 @@ struct rx_ppdu_end_qca988x { #define RX_PPDU_END_RTT_NORMAL_MODE BIT(31) struct rx_ppdu_end_qca6174 { + u8 locationing_timestamp; + u8 phy_err_code; + __le16 flags; /* %RX_PPDU_END_FLAGS_ */ + __le32 info0; /* %RX_PPDU_END_INFO0_ */ __le32 rtt; /* %RX_PPDU_END_RTT_ */ __le16 bb_length; __le16 info1; /* %RX_PPDU_END_INFO1_ */