diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2008-06-11 21:47:00 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-06-14 12:18:06 -0400 |
commit | 963f55178b25cb673ab438edaae4127b1d014bc1 (patch) | |
tree | 0152c2829b8e79621e880bc9b289f016c78fc848 /drivers/net/wireless/iwlwifi/iwl4965-base.c | |
parent | 838f8a748562265f8a5ad5c0c0ef8f454fcc28cf (diff) |
iwlwifi: remove redundant flags regarding to FAT channel
This patch removes redundant flags regarding to FAT channel. Use
mac80211's flag instead.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl4965-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 0acd42bd43c5..de40e893f09e 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c | |||
@@ -664,9 +664,11 @@ static void iwl4965_ht_conf(struct iwl_priv *priv, | |||
664 | iwl_conf->extension_chan_offset = | 664 | iwl_conf->extension_chan_offset = |
665 | ht_bss_conf->bss_cap & IEEE80211_HT_IE_CHA_SEC_OFFSET; | 665 | ht_bss_conf->bss_cap & IEEE80211_HT_IE_CHA_SEC_OFFSET; |
666 | /* If no above or below channel supplied disable FAT channel */ | 666 | /* If no above or below channel supplied disable FAT channel */ |
667 | if (iwl_conf->extension_chan_offset != IWL_EXT_CHANNEL_OFFSET_ABOVE && | 667 | if (iwl_conf->extension_chan_offset != IEEE80211_HT_IE_CHA_SEC_ABOVE && |
668 | iwl_conf->extension_chan_offset != IWL_EXT_CHANNEL_OFFSET_BELOW) | 668 | iwl_conf->extension_chan_offset != IEEE80211_HT_IE_CHA_SEC_BELOW) { |
669 | iwl_conf->extension_chan_offset = IEEE80211_HT_IE_CHA_SEC_NONE; | ||
669 | iwl_conf->supported_chan_width = 0; | 670 | iwl_conf->supported_chan_width = 0; |
671 | } | ||
670 | 672 | ||
671 | iwl_conf->tx_mimo_ps_mode = | 673 | iwl_conf->tx_mimo_ps_mode = |
672 | (u8)((ht_conf->cap & IEEE80211_HT_CAP_MIMO_PS) >> 2); | 674 | (u8)((ht_conf->cap & IEEE80211_HT_CAP_MIMO_PS) >> 2); |