diff options
| author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2009-06-12 22:22:49 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-06-15 21:05:52 +0200 |
| commit | 8e8df3a08c6f3098b54639ee6892e3753ad5f210 (patch) | |
| tree | dc03c73142b2587a48fefc4a2fc2c0727cd4cf49 /drivers/net/wireless/iwlwifi | |
| parent | iwlwifi: revamp bss_info_changed (diff) | |
| download | linux-8e8df3a08c6f3098b54639ee6892e3753ad5f210.tar.xz linux-8e8df3a08c6f3098b54639ee6892e3753ad5f210.zip | |
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/net/wireless/iwlwifi')
| -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, return 0; } - if (iwl_ht_conf->ht_protection & IEEE80211_HT_OP_MODE_PROTECTION_20MHZ) + if (iwl_ht_conf->ht_protection == IEEE80211_HT_OP_MODE_PROTECTION_20MHZ) return 1; else 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) RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK); if (iwl_is_fat_tx_allowed(priv, NULL)) { /* pure 40 fat */ - if (rxon->flags & RXON_FLG_FAT_PROT_MSK) + if (ht_info->ht_protection == IEEE80211_HT_OP_MODE_PROTECTION_20MHZ) rxon->flags |= RXON_FLG_CHANNEL_MODE_PURE_40; else { /* Note: control channel is opposite of extension channel */ |