2019-04-17 03:26:24

by Yue Haibing

Subject: [PATCH] iwlwifi: Use correct channel_profile iniwl_get_nvm

From: YueHaibing <[email protected]>

commit 2785ce008e3b ("iwlwifi: support new NVM response API")
seems forgot use correct channel_profile in iwl_get_nvm when call
iwl_init_sbands().

Fixes: 2785ce008e3b ("iwlwifi: support new NVM response API")
Signed-off-by: YueHaibing <[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 40985dc..d87a6bb 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@ -1496,7 +1496,7 @@ struct iwl_nvm_data *iwl_get_nvm(struct iwl_trans *trans,
(void *)rsp_v3->regulatory.channel_profile;

iwl_init_sbands(trans->dev, trans->cfg, nvm,
- rsp->regulatory.channel_profile,
+ channel_profile,
nvm->valid_tx_ant & fw->valid_tx_ant,
nvm->valid_rx_ant & fw->valid_rx_ant,
sbands_flags, v4);
--
2.7.0

2019-04-17 07:16:36

by Luciano Coelho

Subject: Re: [PATCH] iwlwifi: Use correct channel_profile iniwl_get_nvm

On Wed, 2019-04-17 at 11:24 +0800, Yue Haibing wrote:
> From: YueHaibing <[email protected]>
>
> commit 2785ce008e3b ("iwlwifi: support new NVM response API")
> seems forgot use correct channel_profile in iwl_get_nvm when call
> iwl_init_sbands().
>
> Fixes: 2785ce008e3b ("iwlwifi: support new NVM response API")
> Signed-off-by: YueHaibing <[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 40985dc..d87a6bb 100644
> --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
> +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
> @@ -1496,7 +1496,7 @@ struct iwl_nvm_data *iwl_get_nvm(struct
> iwl_trans *trans,
> (void *)rsp_v3->regulatory.channel_profile;
>
> iwl_init_sbands(trans->dev, trans->cfg, nvm,
> - rsp->regulatory.channel_profile,
> + channel_profile,
> nvm->valid_tx_ant & fw->valid_tx_ant,
> nvm->valid_rx_ant & fw->valid_rx_ant,
> sbands_flags, v4);

Thanks!

This was a rebase damage I made when sending this upstream. I've
applied this directly to our upstream feeding tree because it's not
wrong in our internal tree.

--
Cheers,
Luca.