diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-06-06 15:05:46 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-06-11 10:09:28 -0400 |
commit | 8895075886bbcfdab6ad7923ae8ab3b3314549c4 (patch) | |
tree | 3890b7456d8747e58f66ee805b70d7d7e3568b0b /drivers/net/wireless/iwlwifi/iwl-agn.c | |
parent | 052692976e40bc124a8615ec880dd83046d71c24 (diff) |
iwlagn: use sku capabilities information from EEPROM
Instead of having the separated define, use the sku capabilities in EEPROM
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 3cd42a520956..488081fe1831 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -2515,7 +2515,7 @@ static int iwl_mac_setup_register(struct iwl_priv *priv, | |||
2515 | hw->flags |= IEEE80211_HW_SUPPORTS_PS | | 2515 | hw->flags |= IEEE80211_HW_SUPPORTS_PS | |
2516 | IEEE80211_HW_SUPPORTS_DYNAMIC_PS; | 2516 | IEEE80211_HW_SUPPORTS_DYNAMIC_PS; |
2517 | 2517 | ||
2518 | if (priv->cfg->sku & IWL_SKU_N) | 2518 | if (priv->cfg->sku & EEPROM_SKU_CAP_11N_ENABLE) |
2519 | hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS | | 2519 | hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS | |
2520 | IEEE80211_HW_SUPPORTS_STATIC_SMPS; | 2520 | IEEE80211_HW_SUPPORTS_STATIC_SMPS; |
2521 | 2521 | ||
@@ -2756,7 +2756,7 @@ static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw, | |||
2756 | IWL_DEBUG_HT(priv, "A-MPDU action on addr %pM tid %d\n", | 2756 | IWL_DEBUG_HT(priv, "A-MPDU action on addr %pM tid %d\n", |
2757 | sta->addr, tid); | 2757 | sta->addr, tid); |
2758 | 2758 | ||
2759 | if (!(priv->cfg->sku & IWL_SKU_N)) | 2759 | if (!(priv->cfg->sku & EEPROM_SKU_CAP_11N_ENABLE)) |
2760 | return -EACCES; | 2760 | return -EACCES; |
2761 | 2761 | ||
2762 | mutex_lock(&priv->mutex); | 2762 | mutex_lock(&priv->mutex); |
@@ -3375,7 +3375,7 @@ static int iwl_set_hw_params(struct iwl_priv *priv) | |||
3375 | priv->hw_params.max_beacon_itrvl = IWL_MAX_UCODE_BEACON_INTERVAL; | 3375 | priv->hw_params.max_beacon_itrvl = IWL_MAX_UCODE_BEACON_INTERVAL; |
3376 | 3376 | ||
3377 | if (iwlagn_mod_params.disable_11n) | 3377 | if (iwlagn_mod_params.disable_11n) |
3378 | priv->cfg->sku &= ~IWL_SKU_N; | 3378 | priv->cfg->sku &= ~EEPROM_SKU_CAP_11N_ENABLE; |
3379 | 3379 | ||
3380 | /* Device-specific setup */ | 3380 | /* Device-specific setup */ |
3381 | return priv->cfg->ops->lib->set_hw_params(priv); | 3381 | return priv->cfg->ops->lib->set_hw_params(priv); |