2021-03-26 10:58:49

by Luca Coelho

[permalink] [raw]
Subject: [PATCH v2 for v5.12 1/7] iwlwifi: fix 11ax disabled bit in the regulatory capability flags

From: Luca Coelho <[email protected]>

When version 2 of the regulatory capability flags API was implemented,
the flag to disable 11ax was defined as bit 13, but this was later
changed and the bit remained as bit 10, like in version 1. This was
never changed in the driver, so we were checking for the wrong bit in
newer devices. Fix it.

Signed-off-by: Luca Coelho <[email protected]>
Fixes: e27c506a985c ("iwlwifi: regulatory: regulatory capabilities api change")
Signed-off-by: Luca Coelho <[email protected]>
---
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index af684f80b0cc..c5a1e84dc1ab 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@ -232,7 +232,7 @@ enum iwl_reg_capa_flags_v2 {
REG_CAPA_V2_MCS_9_ALLOWED = BIT(6),
REG_CAPA_V2_WEATHER_DISABLED = BIT(7),
REG_CAPA_V2_40MHZ_ALLOWED = BIT(8),
- REG_CAPA_V2_11AX_DISABLED = BIT(13),
+ REG_CAPA_V2_11AX_DISABLED = BIT(10),
};

/*
--
2.31.0


2021-04-06 19:42:11

by Kalle Valo

[permalink] [raw]
Subject: Re: [PATCH v2 for v5.12 1/7] iwlwifi: fix 11ax disabled bit in the regulatory capability flags

Luca Coelho <[email protected]> wrote:

> From: Luca Coelho <[email protected]>
>
> When version 2 of the regulatory capability flags API was implemented,
> the flag to disable 11ax was defined as bit 13, but this was later
> changed and the bit remained as bit 10, like in version 1. This was
> never changed in the driver, so we were checking for the wrong bit in
> newer devices. Fix it.
>
> Signed-off-by: Luca Coelho <[email protected]>
> Fixes: e27c506a985c ("iwlwifi: regulatory: regulatory capabilities api change")
> Signed-off-by: Luca Coelho <[email protected]>

7 patches applied to wireless-drivers.git, thanks.

07cc40fec9a8 iwlwifi: fix 11ax disabled bit in the regulatory capability flags
25628bc08d45 iwlwifi: pcie: properly set LTR workarounds on 22000 devices
97195d3cad85 iwlwifi: add support for Qu with AX201 device
9c04fd95fa83 iwlwifi: fw: fix notification wait locking
08f4b0b1c07b iwlwifi: pcie: add support for So-F devices
39fb06f79142 iwlwifi: mvm: rfi: don't lock mvm->mutex when sending config command
65db391dd874 iwlwifi: mvm: fix beacon protection checks

--
https://patchwork.kernel.org/project/linux-wireless/patch/iwlwifi.202103[email protected]changeid/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches