]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
iwlwifi: don't declare support for 5ghz if not supported
authorEliad Peller <eliad@wizery.com>
Mon, 26 May 2014 15:11:37 +0000 (18:11 +0300)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Thu, 12 Mar 2015 07:57:24 +0000 (09:57 +0200)
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>
drivers/net/wireless/iwlwifi/iwl-nvm-parse.c

index 99476bd6663a4df4e2b14070260717eaf454a82c..88703778dbb2f88cee56163170c3ad976ce35dce 100644 (file)
@@ -272,9 +272,14 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,
 
                if (ch_idx >= num_2ghz_channels &&
                    !data->sku_cap_band_52GHz_enable)
-                       ch_flags &= ~NVM_CHANNEL_VALID;
+                       continue;
 
                if (!lar_supported && !(ch_flags & NVM_CHANNEL_VALID)) {
+                       /*
+                        * Channels might become valid later if lar is
+                        * supported, hence we still want to add them to
+                        * the list of supported channels to cfg80211.
+                        */
                        IWL_DEBUG_EEPROM(dev,
                                         "Ch. %d Flags %x [%sGHz] - No traffic\n",
                                         nvm_chan[ch_idx],