Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c816b21 authored by Shaul Triebitz's avatar Shaul Triebitz Committed by Luca Coelho
Browse files

iwlwifi: do not fail on large amount of channels 



Until supporting UHB (ultra high band) channels for
devices AX210, do not fail if number of channels reported
by firmware is greater than NL80211_MAX_SUPP_REG_RULES.
The Driver in that case will use only the non-UHB channels.

Signed-off-by: default avatarShaul Triebitz <shaul.triebitz@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent f130bb75

drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

+3 −3
Original line number Diff line number Diff line
@@ -1102,12 +1102,12 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg, 
	int max_num_ch = cfg->nvm_type == IWL_NVM_EXT ?

			 IWL_NVM_NUM_CHANNELS_EXT : IWL_NVM_NUM_CHANNELS;



	if (WARN_ON_ONCE(num_of_ch > NL80211_MAX_SUPP_REG_RULES))

		return ERR_PTR(-EINVAL);



	if (WARN_ON(num_of_ch > max_num_ch))

		num_of_ch = max_num_ch;



	if (WARN_ON_ONCE(num_of_ch > NL80211_MAX_SUPP_REG_RULES))

		return ERR_PTR(-EINVAL);



	IWL_DEBUG_DEV(dev, IWL_DL_LAR, "building regdom for %d channels\n",

		      num_of_ch);