---

yaml --- r: 255758 b: refs/heads/master c: 4f0642a h: refs/heads/master v: v3
git-mirror · Jun 11, 2011 · 27f8cb9 · 27f8cb9
1 parent 5c248f1
commit 27f8cb9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f8bf0396ae7e63648b210fd197b1a5ab0db51bf
+refs/heads/master: 4f0642a6665d1f4dbf8ef472dd5620e7585357b9
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
@@ -113,6 +113,11 @@ int iwl_eeprom_check_sku(struct iwl_priv *priv)
 	if (!priv->cfg->sku) {
 		/* not using sku overwrite */
 		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");