diff options
author | Eliad Peller <eliad@wizery.com> | 2014-05-26 11:11:37 -0400 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-03-12 03:57:24 -0400 |
commit | a76f3bfe016dbda161f9d31cc5cbdd9238d13488 (patch) | |
tree | 07a112518f22d32314cbe8cf2d67bb34b9fd10c5 /drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | |
parent | bdf2fae8376bbf1bdb0baa4c3616e81731214dfb (diff) |
iwlwifi: don't declare support for 5ghz if not supported
Remove a useless debug print about unsupported channels.
Also add a comment about the LAR special case where channels
might become valid later.
Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@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.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c index 99476bd6663a..88703778dbb2 100644 --- a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c +++ b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | |||
@@ -272,9 +272,14 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg, | |||
272 | 272 | ||
273 | if (ch_idx >= num_2ghz_channels && | 273 | if (ch_idx >= num_2ghz_channels && |
274 | !data->sku_cap_band_52GHz_enable) | 274 | !data->sku_cap_band_52GHz_enable) |
275 | ch_flags &= ~NVM_CHANNEL_VALID; | 275 | continue; |
276 | 276 | ||
277 | if (!lar_supported && !(ch_flags & NVM_CHANNEL_VALID)) { | 277 | if (!lar_supported && !(ch_flags & NVM_CHANNEL_VALID)) { |
278 | /* | ||
279 | * Channels might become valid later if lar is | ||
280 | * supported, hence we still want to add them to | ||
281 | * the list of supported channels to cfg80211. | ||
282 | */ | ||
278 | IWL_DEBUG_EEPROM(dev, | 283 | IWL_DEBUG_EEPROM(dev, |
279 | "Ch. %d Flags %x [%sGHz] - No traffic\n", | 284 | "Ch. %d Flags %x [%sGHz] - No traffic\n", |
280 | nvm_chan[ch_idx], | 285 | nvm_chan[ch_idx], |