---

yaml --- r: 225118 b: refs/heads/master c: a95f160 h: refs/heads/master v: v3
git-mirror · Dec 7, 2010 · 82d8fc9 · 82d8fc9
1 parent b9b16b1
commit 82d8fc9
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: 11441fb8b700bd782ae72d3dd87453fc5bc2ff12
+refs/heads/master: a95f1600081211433c5ff6f3668061c821552e9f
diff --git a/trunk/drivers/net/wireless/ath/ath9k/ani.c b/trunk/drivers/net/wireless/ath/ath9k/ani.c
@@ -358,7 +358,7 @@ static void ath9k_hw_set_cck_nil(struct ath_hw *ah, u_int8_t immunityLevel)
 				     entry_cck->fir_step_level);
 
 	/* Skip MRC CCK for pre AR9003 families */
-	if (!AR_SREV_9300_20_OR_LATER(ah))
+	if (!AR_SREV_9300_20_OR_LATER(ah) || AR_SREV_9485(ah))
 		return;
 
 	if (aniState->mrcCCKOff == entry_cck->mrc_cck_on)