aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-mac80211.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-03-06 16:30:55 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-03-07 13:56:31 -0500
commitb9ad70da6a7ed166539b188a95e0aef119555e14 (patch)
treedd07a1249c09f78494d7fbcf4d1fded81d45c0e0 /drivers/net/wireless/iwlwifi/iwl-mac80211.c
parente7a09438b3369732b9c5cfbca24d3bc894fc1ec1 (diff)
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.c4
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,
660 IWL_DEBUG_HT(priv, "priv->agg_tids_count = %u\n", 660 IWL_DEBUG_HT(priv, "priv->agg_tids_count = %u\n",
661 priv->agg_tids_count); 661 priv->agg_tids_count);
662 } 662 }
663 if (!priv->agg_tids_count && cfg(priv)->ht_params && 663 if (!priv->agg_tids_count &&
664 cfg(priv)->ht_params->use_rts_for_aggregation) { 664 hw_params(priv).use_rts_for_aggregation) {
665 /* 665 /*
666 * switch off RTS/CTS if it was previously enabled 666 * switch off RTS/CTS if it was previously enabled
667 */ 667 */