diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2009-06-12 16:22:49 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-06-15 15:05:52 -0400 |
commit | 8e8df3a08c6f3098b54639ee6892e3753ad5f210 (patch) | |
tree | dc03c73142b2587a48fefc4a2fc2c0727cd4cf49 /drivers | |
parent | d7129e190c3107db8ac11a9e51035641b68d2aa7 (diff) |
iwlwifi: checking for 40MHz mode
when checking for 40MHz, compare ht_protection to
IEEE80211_HT_OP_MODE_PROTECTION_20MHZ. ht_protection is not a bit-mask
field
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index e05faa004dae..b2875fe12561 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -630,7 +630,7 @@ u8 iwl_is_fat_tx_allowed(struct iwl_priv *priv, | |||
630 | return 0; | 630 | return 0; |
631 | } | 631 | } |
632 | 632 | ||
633 | if (iwl_ht_conf->ht_protection & IEEE80211_HT_OP_MODE_PROTECTION_20MHZ) | 633 | if (iwl_ht_conf->ht_protection == IEEE80211_HT_OP_MODE_PROTECTION_20MHZ) |
634 | return 1; | 634 | return 1; |
635 | else | 635 | else |
636 | return iwl_is_channel_extension(priv, priv->band, | 636 | return iwl_is_channel_extension(priv, priv->band, |
@@ -826,7 +826,7 @@ void iwl_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_info *ht_info) | |||
826 | RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK); | 826 | RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK); |
827 | if (iwl_is_fat_tx_allowed(priv, NULL)) { | 827 | if (iwl_is_fat_tx_allowed(priv, NULL)) { |
828 | /* pure 40 fat */ | 828 | /* pure 40 fat */ |
829 | if (rxon->flags & RXON_FLG_FAT_PROT_MSK) | 829 | if (ht_info->ht_protection == IEEE80211_HT_OP_MODE_PROTECTION_20MHZ) |
830 | rxon->flags |= RXON_FLG_CHANNEL_MODE_PURE_40; | 830 | rxon->flags |= RXON_FLG_CHANNEL_MODE_PURE_40; |
831 | else { | 831 | else { |
832 | /* Note: control channel is opposite of extension channel */ | 832 | /* Note: control channel is opposite of extension channel */ |