aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2011-06-06 19:28:54 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2011-06-11 10:13:15 -0400
commit4f0642a6665d1f4dbf8ef472dd5620e7585357b9 (patch)
treec7664d2a5e5aae91f802230d0dcef21b0b87ba52
parent1f8bf0396ae7e63648b210fd197b1a5ab0db51bf (diff)
iwlagn: Sanity check for 11n capability
Make sure when we say 11n enable, we really support it. Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
index 512d8beb3dfd..7745816eaff4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
@@ -113,6 +113,11 @@ int iwl_eeprom_check_sku(struct iwl_priv *priv)
113 if (!priv->cfg->sku) { 113 if (!priv->cfg->sku) {
114 /* not using sku overwrite */ 114 /* not using sku overwrite */
115 priv->cfg->sku = iwl_eeprom_query16(priv, EEPROM_SKU_CAP); 115 priv->cfg->sku = iwl_eeprom_query16(priv, EEPROM_SKU_CAP);
116 if (priv->cfg->sku & EEPROM_SKU_CAP_11N_ENABLE &&
117 !priv->cfg->ht_params) {
118 IWL_ERR(priv, "Invalid 11n configuration\n");
119 return -EINVAL;
120 }
116 } 121 }
117 if (!priv->cfg->sku) { 122 if (!priv->cfg->sku) {
118 IWL_ERR(priv, "Invalid device sku\n"); 123 IWL_ERR(priv, "Invalid device sku\n");