iwl3945: Use iwl-eeprom.c routines

By adding the eeprom ops to the 3945 code, we can now use the iwlcore eeprom
routines (defined in iwl-eeprom.c).
We also removed the heavy eeprom39 reference from iwl_priv and use the eeprom
pointer instead.

Signed-off-by: Samuel Ortiz <samuel.ortiz@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
index cebfb8fa5da1..eaa658f9e54c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
@@ -531,6 +531,13 @@ 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)
+                return 0;
+
         /* Two additional EEPROM bands for 2.4 and 5 GHz FAT channels */
         for (band = 6; band <= 7; band++) {
                 enum ieee80211_band ieeeband;
@@ -582,6 +589,7 @@ void iwl_free_channel_map(struct iwl_priv *priv)
         kfree(priv->channel_info);
         priv->channel_count = 0;
 }
+EXPORT_SYMBOL(iwl_free_channel_map);
 
 /**
  * iwl_get_channel_info - Find driver's private channel info