Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / iwlwifi / iwl-eeprom.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
index d1d1d9bcfeaeefee095ecbfcd884103cdfb5fbc6..75517d05df0833fee49564672336785abaa2adf5 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
@@ -532,10 +532,10 @@ int iwl_init_channel_map(struct iwl_priv *priv)
        }
 
        /* Check if we do have FAT channels */
-       if (priv->cfg->ops->lib->eeprom_ops.regulatory_bands[5] >=
-           priv->cfg->eeprom_size &&
-           priv->cfg->ops->lib->eeprom_ops.regulatory_bands[6] >=
-           priv->cfg->eeprom_size)
+       if (priv->cfg->ops->lib->eeprom_ops.regulatory_bands[5] ==
+           EEPROM_REGULATORY_BAND_NO_FAT &&
+           priv->cfg->ops->lib->eeprom_ops.regulatory_bands[6] ==
+           EEPROM_REGULATORY_BAND_NO_FAT)
                return 0;
 
        /* Two additional EEPROM bands for 2.4 and 5 GHz FAT channels */