aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
diff options
context:
space:
mode:
authorArik Nemtsov <arikx.nemtsov@intel.com>2014-06-10 04:25:35 -0400
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2015-03-12 03:57:26 -0400
commit162ee3c9a81556316e22305e455166e470fbb2b2 (patch)
tree5a154666ea935ce1a6d2da4920d0f5465f35f75b /drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
parent88931cc92872151d53f86720c848e469574ce7f0 (diff)
iwlwifi: nvm: init correct nvm channel list for 8000 devices
Otherwise the regulatory data will mistakenly contain only 7000 series channels. Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-nvm-parse.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-nvm-parse.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
index 88703778dbb2..5959329e83c9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
@@ -709,12 +709,13 @@ static u32 iwl_nvm_get_regdom_bw_flags(const u8 *nvm_chan,
709} 709}
710 710
711struct ieee80211_regdomain * 711struct ieee80211_regdomain *
712iwl_parse_nvm_mcc_info(struct device *dev, int num_of_ch, __le32 *channels, 712iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
713 u16 fw_mcc) 713 int num_of_ch, __le32 *channels, u16 fw_mcc)
714{ 714{
715 int ch_idx; 715 int ch_idx;
716 u16 ch_flags, prev_ch_flags = 0; 716 u16 ch_flags, prev_ch_flags = 0;
717 const u8 *nvm_chan = iwl_nvm_channels; /* TODO: 8000 series differs */ 717 const u8 *nvm_chan = cfg->device_family == IWL_DEVICE_FAMILY_8000 ?
718 iwl_nvm_channels_family_8000 : iwl_nvm_channels;
718 struct ieee80211_regdomain *regd; 719 struct ieee80211_regdomain *regd;
719 int size_of_regd; 720 int size_of_regd;
720 struct ieee80211_reg_rule *rule; 721 struct ieee80211_reg_rule *rule;