diff options
| author | Johannes Berg | 2012-03-06 22:30:55 +0100 |
|---|---|---|
| committer | John W. Linville | 2012-03-07 19:56:31 +0100 |
| commit | b9ad70da6a7ed166539b188a95e0aef119555e14 (patch) | |
| tree | dd07a1249c09f78494d7fbcf4d1fded81d45c0e0 /drivers/net/wireless/iwlwifi/iwl-mac80211.c | |
| parent | iwlwifi: use watchdog timeout from hw_params (diff) | |
| download | kernel-qcow2-linux-b9ad70da6a7ed166539b188a95e0aef119555e14.tar.gz kernel-qcow2-linux-b9ad70da6a7ed166539b188a95e0aef119555e14.tar.xz kernel-qcow2-linux-b9ad70da6a7ed166539b188a95e0aef119555e14.zip | |
iwlwifi: put use_rts_for_aggregation into hw_params
The hardware config ht_params shouldn't be modified,
so copy the use_rts_for_aggregation parameter into
hw_params and use/modify it there.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-mac80211.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-mac80211.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c index 30861765b512..d2c1d714c89c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c +++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c @@ -660,8 +660,8 @@ static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw, IWL_DEBUG_HT(priv, "priv->agg_tids_count = %u\n", priv->agg_tids_count); } - if (!priv->agg_tids_count && cfg(priv)->ht_params && - cfg(priv)->ht_params->use_rts_for_aggregation) { + if (!priv->agg_tids_count && + hw_params(priv).use_rts_for_aggregation) { /* * switch off RTS/CTS if it was previously enabled */ |