summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/iwlwifi/pcie/6000.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-05-21 22:03:01 +0400
committerJohannes Berg <johannes.berg@intel.com>2012-06-06 15:21:16 +0400
commitd370493f9be79530950dfab23b980ce60bc84f34 (patch)
tree4be4bec91797f5becbc516c9cfeb42111118a6f4 /drivers/net/wireless/iwlwifi/pcie/6000.c
parent2587d36b1e121b84993e66dc8624c60793e25921 (diff)
downloadlinux-d370493f9be79530950dfab23b980ce60bc84f34.tar.xz
iwlwifi: move ht40 bitmap into config
There's no need to dynamically fill the HT40 band bitmap as it's a device parameter, just put it into the HT configuration. Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie/6000.c')
-rw-r--r--drivers/net/wireless/iwlwifi/pcie/6000.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/6000.c b/drivers/net/wireless/iwlwifi/pcie/6000.c
index f9e396182ef3..7b9c02cc67e5 100644
--- a/drivers/net/wireless/iwlwifi/pcie/6000.c
+++ b/drivers/net/wireless/iwlwifi/pcie/6000.c
@@ -124,6 +124,7 @@ static const struct iwl_base_params iwl6000_g2_base_params = {
static const struct iwl_ht_params iwl6000_ht_params = {
.ht_greenfield_support = true,
.use_rts_for_aggregation = true, /* use rts/cts protection */
+ .ht40_bands = BIT(IEEE80211_BAND_2GHZ) | BIT(IEEE80211_BAND_5GHZ),
};
static const struct iwl_bt_params iwl6000_bt_params = {