iwlwifi: allocate bigger nvm data in case of UHB

In case of Ultra-high-band (UHB), need to allocate nvm data structure in
size of UHB channels array.

Signed-off-by: Tova Mussai <tova.mussai@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index fd386bfbd5dff648d5a15fef3b049d50bb38337b..6d95941f56a70ef5049a1bf3afb0fbc2741df5ee 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@ -942,7 +942,11 @@ iwl_parse_nvm_data(struct iwl_trans *trans, const struct iwl_cfg *cfg,
        u16 lar_config;
        const __le16 *ch_section;
 
-       if (cfg->nvm_type != IWL_NVM_EXT)
+       if (cfg->uhb_supported)
+               data = kzalloc(struct_size(data, channels,
+                                          IWL_NVM_NUM_CHANNELS_UHB),
+                                          GFP_KERNEL);
+       else if (cfg->nvm_type != IWL_NVM_EXT)
                data = kzalloc(struct_size(data, channels,
                                           IWL_NVM_NUM_CHANNELS),
                                           GFP_KERNEL);