| Message ID | 20190417032409.23924-1-yuehaibing@huawei.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | iwlwifi: Use correct channel_profile iniwl_get_nvm | expand |
On Wed, 2019-04-17 at 11:24 +0800, Yue Haibing wrote: > From: YueHaibing <yuehaibing@huawei.com> > > 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 <yuehaibing@huawei.com> > --- > 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.
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);