---

yaml --- r: 78995 b: refs/heads/master c: 797a54c h: refs/heads/master i: 78993: a67c3a3 78991: 5e1038e v: v3
git-mirror · Jan 28, 2008 · 270d662 · 270d662
1 parent 3361e7d
commit 270d662
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;