3 files changed, 8 insertions, 6 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index d2df4945ca6a..d49e48b9b037 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -2738,8 +2738,8 @@ static struct iwl_lib_ops iwl3945_lib = {
                         EEPROM_REGULATORY_BAND_3_CHANNELS,
                         EEPROM_REGULATORY_BAND_4_CHANNELS,
                         EEPROM_REGULATORY_BAND_5_CHANNELS,
-                        IWL3945_EEPROM_IMG_SIZE,
-                        IWL3945_EEPROM_IMG_SIZE,
+                        EEPROM_REGULATORY_BAND_NO_FAT,
+                        EEPROM_REGULATORY_BAND_NO_FAT,
                 },
                 .verify_signature  = iwlcore_eeprom_verify_signature,
                 .acquire_semaphore = iwl3945_eeprom_acquire_semaphore,
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
index d1d1d9bcfeae..75517d05df08 100644
--- 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 */
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
index 17fed49f9d96..3479153d96ca 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
@@ -370,6 +370,8 @@ struct iwl_eeprom_calib_info {
  */
 #define EEPROM_4965_REGULATORY_BAND_52_FAT_CHANNELS (2*0xA8)    /* 22 bytes */
 
+#define EEPROM_REGULATORY_BAND_NO_FAT                   (0)
+
 struct iwl_eeprom_ops {
         const u32 regulatory_bands[7];
         int (*verify_signature) (struct iwl_priv *priv);