diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-02-07 18:44:14 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-02-07 18:44:14 (GMT) |
| commit | 0f96b860bc5e97d4776d0cb375c7ca1f4864f9e9 (patch) | |
| tree | ef46bd077c1710a0474b5b3b31c543783197a274 /drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | |
| parent | ee262ad827f89e2dc7851ec2986953b5b125c6bc (diff) | |
| parent | 348f7d4adee97f222e3ad9ff97956ca3793d11c6 (diff) | |
| download | linux-0f96b860bc5e97d4776d0cb375c7ca1f4864f9e9.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-nvm-parse.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c index f06f4cb..725e954d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c +++ b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c @@ -182,6 +182,11 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg, for (ch_idx = 0; ch_idx < IWL_NUM_CHANNELS; ch_idx++) { ch_flags = __le16_to_cpup(nvm_ch_flags + ch_idx); + + if (ch_idx >= NUM_2GHZ_CHANNELS && + !data->sku_cap_band_52GHz_enable) + ch_flags &= ~NVM_CHANNEL_VALID; + if (!(ch_flags & NVM_CHANNEL_VALID)) { IWL_DEBUG_EEPROM(dev, "Ch. %d Flags %x [%sGHz] - No traffic\n", |