diff options
| author | Johannes Berg | 2012-06-19 08:42:08 +0200 |
|---|---|---|
| committer | Johannes Berg | 2012-06-20 08:42:21 +0200 |
| commit | 8d40f4eebf43bd73aa7c6e06665fd7a26012f9c9 (patch) | |
| tree | 6935c786c5a40b91e52e0030bee6641e11025795 /drivers/net/wireless/iwlwifi/dvm/mac80211.c | |
| parent | iwlwifi: use minimal time for radio reset scan (diff) | |
| download | kernel-qcow2-linux-8d40f4eebf43bd73aa7c6e06665fd7a26012f9c9.tar.gz kernel-qcow2-linux-8d40f4eebf43bd73aa7c6e06665fd7a26012f9c9.tar.xz kernel-qcow2-linux-8d40f4eebf43bd73aa7c6e06665fd7a26012f9c9.zip | |
iwlwifi: remove sku field from hw_params
Now that the eeprom parsing code overrides the sku
field directly with 11n_disable parameters, there's
no longer a need to keep a copy of this field.
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/mac80211.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/mac80211.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c index c57726348ffe..b581f035d4b0 100644 --- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c @@ -164,7 +164,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, hw->max_tx_aggregation_subframes = LINK_QUAL_AGG_FRAME_LIMIT_DEF; */ - if (priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE) + if (priv->eeprom_data->sku & EEPROM_SKU_CAP_11N_ENABLE) hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS | IEEE80211_HW_SUPPORTS_STATIC_SMPS; @@ -649,7 +649,7 @@ static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw, IWL_DEBUG_HT(priv, "A-MPDU action on addr %pM tid %d\n", sta->addr, tid); - if (!(priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE)) + if (!(priv->eeprom_data->sku & EEPROM_SKU_CAP_11N_ENABLE)) return -EACCES; IWL_DEBUG_MAC80211(priv, "enter\n"); |