From 270d6622c276cb82d7905d9ebcb0ea17cda55a20 Mon Sep 17 00:00:00 2001 From: Zhu Yi Date: Mon, 12 Nov 2007 11:37:43 +0800 Subject: [PATCH] --- yaml --- r: 78995 b: refs/heads/master c: 797a54c68e0eb551c60e3dc843627f967919a951 h: refs/heads/master i: 78993: a67c3a3c8f6cc22ed1dbf7729da481a4d361112b 78991: 5e1038ef9becceb512548f5d0141c6dbf1524330 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index aafe37180349..a323ce32ec8f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7223e8d900d415fe128152d7a4061501b7593d37 +refs/heads/master: 797a54c68e0eb551c60e3dc843627f967919a951 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c index 7d0b7c994d98..24dc40f2f4c8 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/trunk/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;