From 797a54c68e0eb551c60e3dc843627f967919a951 Mon Sep 17 00:00:00 2001 From: Zhu Yi Date: Mon, 12 Nov 2007 11:37:43 +0800 Subject: [PATCH] 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 Signed-off-by: John W. Linville --- drivers/net/wireless/iwlwifi/iwl4965-base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 7d0b7c994d98..24dc40f2f4c8 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; -- GitLab