OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1f8bf03
)
iwlagn: Sanity check for 11n capability
author
Wey-Yi Guy
<wey-yi.w.guy@intel.com>
Mon, 6 Jun 2011 23:28:54 +0000
(16:28 -0700)
committer
Wey-Yi Guy
<wey-yi.w.guy@intel.com>
Sat, 11 Jun 2011 14:13:15 +0000
(07:13 -0700)
Make sure when we say 11n enable, we really support it.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
b/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
index
512d8be
..
7745816
100644
(file)
--- 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)
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");