iwlwifi: fix FAT channel config for 5000 series

The test to find out if we have FAT channels do not consider that
the value of regulatory_bands for the 5000 series is larger than its
eeprom size. Using the eeprom size is strange in itself.

Use a new EEPROM_REGULATORY_BAND_NO_FAT to indicate no FAT support
and test for that explicitly.

Signed-off-by: Reinette Chatre <[email protected]>
Acked-by: Samuel Ortiz <[email protected]>
Tested-by: Johannes Berg <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index d2df4945ca6ab23d16b60db49343a2c370bc5174..d49e48b9b037b7b74f5368639900d7ed24ea922d 100644 (file)
--- 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 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 */

diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
index 17fed49f9d9618a8793b2c9f9371dffb62a2e3aa..3479153d96ca1cd164855725292d6a2287cf6ba0 100644 (file)
--- 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);