ath10k: Fix invalid STS_CAP_OFFSET_MASK.
diff mbox

Message ID 1510679819-24115-1-git-send-email-greearb@candelatech.com
State New
Headers show

Commit Message

Ben Greear Nov. 14, 2017, 5:16 p.m. UTC
From: Ben Greear <greearb@candelatech.com>

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 <greearb@candelatech.com>
---
 drivers/net/wireless/ath/ath10k/wmi.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Sebastian Gottschall Nov. 14, 2017, 6:29 p.m. UTC | #1
Am 14.11.2017 um 18:16 schrieb greearb@candelatech.com:
> From: Ben Greear <greearb@candelatech.com>
>
> 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 <greearb@candelatech.com>
> ---
>   drivers/net/wireless/ath/ath10k/wmi.h | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
> index ff15c37..9522f22 100644
> --- a/drivers/net/wireless/ath/ath10k/wmi.h
> +++ b/drivers/net/wireless/ath/ath10k/wmi.h
> @@ -5195,7 +5195,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
i can validate this. good finding
>
Kalle Valo Dec. 7, 2017, 2:41 p.m. UTC | #2
Ben Greear <greearb@candelatech.com> wrote:

> 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 <greearb@candelatech.com>
> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

Patch applied to ath-next branch of ath.git, thanks.

8cec57f5277e ath10k: fix invalid STS_CAP_OFFSET_MASK

Patch
diff mbox

diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
index ff15c37..9522f22 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -5195,7 +5195,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