From: Zhu Yi Date: Mon, 12 Nov 2007 03:37:43 +0000 (+0800) Subject: iwl4965: fix rxon flags set to wrong value for A mode in .erp_ie_changed X-Git-Tag: v2.6.25-rc1~1162^2~553 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=797a54c68e0eb551c60e3dc843627f967919a951;p=linux-2.6 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 --- diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 7d0b7c994d..24dc40f2f4 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;