diff options
author | David S. Miller <davem@davemloft.net> | 2011-01-26 13:49:30 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-26 13:49:30 -0800 |
commit | b4e69ac670d71b5748dc81e536b2cb103489badd (patch) | |
tree | 26a04ba5d950657132fd6acb4e0ef17d0bcabe93 /drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c | |
parent | net_sched: sch_mqprio: dont leak kernel memory (diff) | |
parent | xfrm6: Don't forget to propagate peer into ipsec route. (diff) | |
download | linux-dev-b4e69ac670d71b5748dc81e536b2cb103489badd.tar.xz linux-dev-b4e69ac670d71b5748dc81e536b2cb103489badd.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c index 14ceb4df72f6..27b5a3eec9dc 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c @@ -152,11 +152,14 @@ int iwl_eeprom_check_sku(struct iwl_priv *priv) eeprom_sku = iwl_eeprom_query16(priv, EEPROM_SKU_CAP); - priv->cfg->sku = ((eeprom_sku & EEPROM_SKU_CAP_BAND_SELECTION) >> + 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; - + if (eeprom_sku & EEPROM_SKU_CAP_11N_ENABLE) + priv->cfg->sku |= IWL_SKU_N; + } if (!priv->cfg->sku) { IWL_ERR(priv, "Invalid device sku\n"); return -EINVAL; |