aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorZhu Yi <yi.zhu@intel.com>2007-11-12 11:37:43 +0800
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:04:39 -0800
commit797a54c68e0eb551c60e3dc843627f967919a951 (patch)
tree04c57351356aa248a7d5b42c4d1f63c5435e12c1 /drivers
parent7223e8d900d415fe128152d7a4061501b7593d37 (diff)
iwl4965: fix rxon flags set to wrong value for A mode in .erp_ie_changed
The patch fixes a bug that enables RXON_FLG_TGG_PROTECT_MSK erroneously for A mode in the erp_ie_changed mac80211 callback. Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl4965-base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 7d0b7c994d9..24dc40f2f4c 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -7674,7 +7674,7 @@ static void iwl4965_mac_erp_ie_changed(struct ieee80211_hw *hw,
}
if (changes & IEEE80211_ERP_CHANGE_PROTECTION) {
- if (cts_protection)
+ if (cts_protection && (priv->phymode != MODE_IEEE80211A))
priv->staging_rxon.flags |= RXON_FLG_TGG_PROTECT_MSK;
else
priv->staging_rxon.flags &= ~RXON_FLG_TGG_PROTECT_MSK;