iwlagn: remove the indirection for the dma channel num

[pandora-kernel.git] / drivers / net / wireless / iwlwifi / iwl-agn-eeprom.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
index 2ef9448..7745816 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
@@ -108,18 +108,16 @@ err:
 
 int iwl_eeprom_check_sku(struct iwl_priv *priv)
 {
-       u16 eeprom_sku;
        u16 radio_cfg;
 
-       eeprom_sku = iwl_eeprom_query16(priv, EEPROM_SKU_CAP);
-
        if (!priv->cfg->sku) {
                /* not using sku overwrite */
-               priv->cfg->sku =
-                       ((eeprom_sku & EEPROM_SKU_CAP_BAND_SELECTION) >>
-                       EEPROM_SKU_CAP_BAND_POS);
-               if (eeprom_sku & EEPROM_SKU_CAP_11N_ENABLE)
-                       priv->cfg->sku |= IWL_SKU_N;
+               priv->cfg->sku = iwl_eeprom_query16(priv, EEPROM_SKU_CAP);
+               if (priv->cfg->sku & EEPROM_SKU_CAP_11N_ENABLE &&
+                   !priv->cfg->ht_params) {
+                       IWL_ERR(priv, "Invalid 11n configuration\n");
+                       return -EINVAL;
+               }
        }
        if (!priv->cfg->sku) {
                IWL_ERR(priv, "Invalid device sku\n");