aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-core.c
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2011-06-06 15:05:46 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2011-06-11 10:09:28 -0400
commit8895075886bbcfdab6ad7923ae8ab3b3314549c4 (patch)
tree3890b7456d8747e58f66ee805b70d7d7e3568b0b /drivers/net/wireless/iwlwifi/iwl-core.c
parent052692976e40bc124a8615ec880dd83046d71c24 (diff)
iwlagn: use sku capabilities information from EEPROM
Instead of having the separated define, use the sku capabilities in EEPROM Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index ad54f82597ca..445ddac06541 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -143,7 +143,7 @@ int iwlcore_init_geos(struct iwl_priv *priv)
143 sband->bitrates = &rates[IWL_FIRST_OFDM_RATE]; 143 sband->bitrates = &rates[IWL_FIRST_OFDM_RATE];
144 sband->n_bitrates = IWL_RATE_COUNT_LEGACY - IWL_FIRST_OFDM_RATE; 144 sband->n_bitrates = IWL_RATE_COUNT_LEGACY - IWL_FIRST_OFDM_RATE;
145 145
146 if (priv->cfg->sku & IWL_SKU_N) 146 if (priv->cfg->sku & EEPROM_SKU_CAP_11N_ENABLE)
147 iwlcore_init_ht_hw_capab(priv, &sband->ht_cap, 147 iwlcore_init_ht_hw_capab(priv, &sband->ht_cap,
148 IEEE80211_BAND_5GHZ); 148 IEEE80211_BAND_5GHZ);
149 149
@@ -153,7 +153,7 @@ int iwlcore_init_geos(struct iwl_priv *priv)
153 sband->bitrates = rates; 153 sband->bitrates = rates;
154 sband->n_bitrates = IWL_RATE_COUNT_LEGACY; 154 sband->n_bitrates = IWL_RATE_COUNT_LEGACY;
155 155
156 if (priv->cfg->sku & IWL_SKU_N) 156 if (priv->cfg->sku & EEPROM_SKU_CAP_11N_ENABLE)
157 iwlcore_init_ht_hw_capab(priv, &sband->ht_cap, 157 iwlcore_init_ht_hw_capab(priv, &sband->ht_cap,
158 IEEE80211_BAND_2GHZ); 158 IEEE80211_BAND_2GHZ);
159 159
@@ -208,12 +208,12 @@ int iwlcore_init_geos(struct iwl_priv *priv)
208 priv->tx_power_next = max_tx_power; 208 priv->tx_power_next = max_tx_power;
209 209
210 if ((priv->bands[IEEE80211_BAND_5GHZ].n_channels == 0) && 210 if ((priv->bands[IEEE80211_BAND_5GHZ].n_channels == 0) &&
211 priv->cfg->sku & IWL_SKU_A) { 211 priv->cfg->sku & EEPROM_SKU_CAP_BAND_52GHZ) {
212 IWL_INFO(priv, "Incorrectly detected BG card as ABG. " 212 IWL_INFO(priv, "Incorrectly detected BG card as ABG. "
213 "Please send your PCI ID 0x%04X:0x%04X to maintainer.\n", 213 "Please send your PCI ID 0x%04X:0x%04X to maintainer.\n",
214 priv->pci_dev->device, 214 priv->pci_dev->device,
215 priv->pci_dev->subsystem_device); 215 priv->pci_dev->subsystem_device);
216 priv->cfg->sku &= ~IWL_SKU_A; 216 priv->cfg->sku &= ~EEPROM_SKU_CAP_BAND_52GHZ;
217 } 217 }
218 218
219 IWL_INFO(priv, "Tunable channels: %d 802.11bg, %d 802.11a channels\n", 219 IWL_INFO(priv, "Tunable channels: %d 802.11bg, %d 802.11a channels\n",