Received: by 10.213.65.68 with SMTP id h4csp1752692imn; Mon, 19 Mar 2018 12:17:40 -0700 (PDT) X-Google-Smtp-Source: AG47ELuEBxUAtlhRFhcDbv5ueXN25EwjqnuGd+JwsVzJAmjRsMQsmcDl/8mDmrB5Hg0HNBO2PQ/E X-Received: by 2002:a17:902:760e:: with SMTP id k14-v6mr2807570pll.292.1521487060660; Mon, 19 Mar 2018 12:17:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521487060; cv=none; d=google.com; s=arc-20160816; b=scA3VpIkc6pOydTJ+MxQzfstwskhP9WVCgcUO8Nxshtr/qR28uxSXBJ272QodNhoho 2Ba/WUuSkHlGkERfiRBgxTlfgGyaROnrJWGaWplFfxXNIEjmyiyGV0ezDYPUhtIkPAMu 1O0tG1nqZpI2vWdbL6KMIdEC5xWxMHwRk+uAMVnmvu0F2MtsJTxkUogfTUtjvD6xfNRb 0t8cV98NdSzj2xVPbDhvN3gaTy7cz2JNe+yKY1B9CTKibRMoQPHuxNecSNNyA+sZWXYI Ad1dzMgMzcKqXs2h/NRTp63KnbdUSDWxrVcVU5c4st1Fk3Gwo4ih/4/aGtFca2SEFvC9 bQAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=/rDQA2Cnuy3pV7T3XUjICdNduPdm4CauCgSXtB7POEM=; b=g5crS4nl03FGZY3nK4RzkQdzyUJIDBwt077jWc2QGZA9a7sFJSrRgr2pXLnxxeXgJX eS7qgtncpB/vYiF+79G6Dcm/6VGjwoEf/ih/BBEGFIgSMWbaG7R4P12uWSyUqav8FF06 Ohp7jx4HmvIbEk9jGYFxp3KykE+b+4ZN3O/D7HhxQPLa4oFlCAjBcu4d9x2+jeAAL/PW 4GG2U+KDwxbbcqI2ZG1CCxXOMqGzCHNbUJulkgVE5C2olWjebDM50ONzfsxVI2NY3/L8 Ux4WGPEjBP6czJA8RKX40PayfPyPM6JjzkL2cTXQhkZbyicwOvoieshEjqry1V31jL/1 mpEg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i35-v6si409447plg.48.2018.03.19.12.17.24; Mon, 19 Mar 2018 12:17:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755573AbeCSTP5 (ORCPT + 99 others); Mon, 19 Mar 2018 15:15:57 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:50778 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S969642AbeCSS0Z (ORCPT ); Mon, 19 Mar 2018 14:26:25 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 86016113C; Mon, 19 Mar 2018 18:26:24 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ben Greear , Kalle Valo , Sasha Levin Subject: [PATCH 4.9 190/241] ath10k: fix invalid STS_CAP_OFFSET_MASK Date: Mon, 19 Mar 2018 19:07:35 +0100 Message-Id: <20180319180759.008654033@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319180751.172155436@linuxfoundation.org> References: <20180319180751.172155436@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ben Greear [ Upstream commit 8cec57f5277ef0e354e37a0bf909dc71bc1f865b ] The 10.4 firmware defines this as a 3-bit field, as does the mac80211 stack. The 4th bit is defined as CONF_IMPLICIT_BF at least in the firmware header I have seen. This patch fixes the ath10k wmi header to match the firmware. Signed-off-by: Ben Greear Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/ath/ath10k/wmi.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/net/wireless/ath/ath10k/wmi.h +++ b/drivers/net/wireless/ath/ath10k/wmi.h @@ -5017,7 +5017,8 @@ enum wmi_10_4_vdev_param { #define WMI_VDEV_PARAM_TXBF_MU_TX_BFER BIT(3) #define WMI_TXBF_STS_CAP_OFFSET_LSB 4 -#define WMI_TXBF_STS_CAP_OFFSET_MASK 0xf0 +#define WMI_TXBF_STS_CAP_OFFSET_MASK 0x70 +#define WMI_TXBF_CONF_IMPLICIT_BF BIT(7) #define WMI_BF_SOUND_DIM_OFFSET_LSB 8 #define WMI_BF_SOUND_DIM_OFFSET_MASK 0xf00