From fc7b196facdcbc1289995901083aa7102faac86c Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sun, 23 Aug 2009 15:30:56 +0200
Subject: [PATCH] --- yaml --- r: 162459 b: refs/heads/master c:
 598dc0e39b6267968f5a02d122295981e176ee2b h: refs/heads/master i:   162457:
 e49ead5b6b82c3a009bd459b424100bd2c26fbc8   162455:
 9bae6338c1c9ae4f43923f03c2baa3a006b4469a v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/staging/rt2860/common/mlme.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 18d3314ecb6b..ad6c2f875247 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b14e5084e429a88591c92d50f36f2e0ec348325d
+refs/heads/master: 598dc0e39b6267968f5a02d122295981e176ee2b
diff --git a/trunk/drivers/staging/rt2860/common/mlme.c b/trunk/drivers/staging/rt2860/common/mlme.c
index 3a72359e3e69..994821e18c54 100644
--- a/trunk/drivers/staging/rt2860/common/mlme.c
+++ b/trunk/drivers/staging/rt2860/common/mlme.c
@@ -1566,12 +1566,7 @@ VOID MlmeSelectTxRateTable(
 		}
 
 		//else if ((pAd->StaActive.SupRateLen == 4) && (pAd->StaActive.ExtRateLen == 0) && (pAd->StaActive.SupportedPhyInfo.MCSSet[0] == 0) && (pAd->StaActive.SupportedPhyInfo.MCSSet[1] == 0))
-		if ((pEntry->RateLen == 4)
-#ifndef RT30xx
-//Iverson mark for Adhoc b mode,sta will use rate 54  Mbps when connect with sta b/g/n mode
-			&& (pEntry->HTCapability.MCSSet[0] == 0) && (pEntry->HTCapability.MCSSet[1] == 0)
-#endif
-			)
+		if (pEntry->RateLen == 4)
 		{// B only AP
 			*ppTable = RateSwitchTable11B;
 			*pTableSize = RateSwitchTable11B[0];