Received: by 10.213.65.68 with SMTP id h4csp1788864imn; Mon, 19 Mar 2018 13:17:55 -0700 (PDT) X-Google-Smtp-Source: AG47ELuCVDiSQDKrmNpEDKWvG3JEL9mbxZ0cBJMeEp/rssNGASu2oHzhVJQppY11wjsgY7koPTF4 X-Received: by 10.98.96.133 with SMTP id u127mr11369535pfb.48.1521490675868; Mon, 19 Mar 2018 13:17:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521490675; cv=none; d=google.com; s=arc-20160816; b=g/kdBeDsns2qoljKfCw/1kNDe9Czxw+2UocvRHArvteR8SKVyE1DKx6fJs0lrqebk2 8GrptYIdKDIh3rIF9IvKtx+pEHqI1NhdhQObZ9TkcKFJJE5EcOOqpZ8M5qTCIfnbTZqk DlPJ3NzA/mabnxDeAWSut0h8wNn6zajiqfImIK4iBXKH44e6mOEUusm/3tvb6EhxDnNq TfWQwkjF6YOnACI0IOuo+Uv9P/7SByDsAFuiGESKqwu6AmbA+GHKF11oAiRCwMsp14pW tEOZVULhAuua93b7MLYvyt2g7+AZ1sOvUHpiPhjPX0znYD7KijytkWshCoUu4MESwDkT xmRA== 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=YkgagwdzN5JasXKdQ61Luh4KdKRWoFXEvtdVTwMR/H8=; b=ioHykKghd4EKHP3qqBW+thixqScVWG+OKozYCx6vJvZm5NElW20bWs0BIshxYv/DzL Acf9BSHJ0wj/yW8nMXKWjygz5W0gKCcuUxmaYeI5RhChNGVm0xMFyimalMBaHIGhfuNO gKv5erA59m60o1EZqVkrA2UZMjKhoHblHtFyDkKrZxmZHC7voZbJ8cvYcBdTw9TRls1E 2zQD65KMpDugheArDbJqLVeq51lK1nKCX06fnOBkHAW7z+i2X/EvI7FnWMgfLtPorjK8 1jiT+qeRa528F6LohQWy/kcO2OpRfHXadlebRR1NHuhqOJGy5oCsypHXu7KKS8Z8+XQx iWLA== 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 i16si5771pgv.255.2018.03.19.13.17.41; Mon, 19 Mar 2018 13:17:55 -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 S971095AbeCSUQJ (ORCPT + 99 others); Mon, 19 Mar 2018 16:16:09 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:44820 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S969023AbeCSSP5 (ORCPT ); Mon, 19 Mar 2018 14:15:57 -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 1D2AFFE3; Mon, 19 Mar 2018 18:15:56 +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.4 094/134] ath10k: fix invalid STS_CAP_OFFSET_MASK Date: Mon, 19 Mar 2018 19:06:17 +0100 Message-Id: <20180319171902.877771095@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319171849.024066323@linuxfoundation.org> References: <20180319171849.024066323@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.4-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 @@ -4826,7 +4826,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