iwlagn: Remove ht40 support from 5.2GHz for _bgn devices
authorWey-Yi Guy <wey-yi.w.guy@intel.com>
Sat, 23 Jul 2011 17:24:42 +0000 (10:24 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 8 Aug 2011 20:04:02 +0000 (16:04 -0400)
For _bgn device, remove ht40 support for 5.2GHz, it is probably ok since
the "band" is not support but just feel strange.

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-2000.c

index 044328652f0183a8202c1c8f82309fb72d90e738..9e8e06aad508f7aa10a092d7645e1fa2dc23b4bd 100644 (file)
@@ -134,8 +134,7 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv)
        priv->hw_params.max_data_size = IWLAGN_RTC_DATA_SIZE;
        priv->hw_params.max_inst_size = IWLAGN_RTC_INST_SIZE;
 
-       priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
-                                       BIT(IEEE80211_BAND_5GHZ);
+       priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ);
 
        priv->hw_params.tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant);
        if (priv->cfg->rx_with_siso_diversity)
index 7d6372bb862074afa26ab1975a7c7a7bea983b5d..3ce8106426c071cc344f421dc2e185fd083b67fe 100644 (file)
@@ -129,8 +129,7 @@ static int iwl2000_hw_set_hw_params(struct iwl_priv *priv)
        priv->hw_params.max_data_size = IWL60_RTC_DATA_SIZE;
        priv->hw_params.max_inst_size = IWL60_RTC_INST_SIZE;
 
-       priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
-                                       BIT(IEEE80211_BAND_5GHZ);
+       priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ);
 
        priv->hw_params.tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant);
        if (priv->cfg->rx_with_siso_diversity)