From c9d235fd723ed34b3b4fc7bddcfcce754f2581ed Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sun, 23 Aug 2009 15:30:50 +0200
Subject: [PATCH] --- yaml --- r: 162458 b: refs/heads/master c:
 b14e5084e429a88591c92d50f36f2e0ec348325d h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/staging/rt2860/common/mlme.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e9018a4a863e..18d3314ecb6b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 375d662f9fbbc177485f6f6ce030fc0eb622f3d3
+refs/heads/master: b14e5084e429a88591c92d50f36f2e0ec348325d
diff --git a/trunk/drivers/staging/rt2860/common/mlme.c b/trunk/drivers/staging/rt2860/common/mlme.c
index da026eadafd8..3a72359e3e69 100644
--- a/trunk/drivers/staging/rt2860/common/mlme.c
+++ b/trunk/drivers/staging/rt2860/common/mlme.c
@@ -3840,18 +3840,14 @@ ULONG BssTableSetEntry(
 	}
 	else
 	{
-#ifdef RT30xx
 		/* avoid  Hidden SSID form beacon to overwirite correct SSID from probe response */
 		if ((SSID_EQUAL(Ssid, SsidLen, Tab->BssEntry[Idx].Ssid, Tab->BssEntry[Idx].SsidLen)) ||
 			(NdisEqualMemory(Tab->BssEntry[Idx].Ssid, ZeroSsid, Tab->BssEntry[Idx].SsidLen)))
 		{
-#endif
 		BssEntrySet(pAd, &Tab->BssEntry[Idx], pBssid, Ssid, SsidLen, BssType, BeaconPeriod,CfParm, AtimWin,
 					CapabilityInfo, SupRate, SupRateLen, ExtRate, ExtRateLen,pHtCapability, pAddHtInfo,HtCapabilityLen, AddHtInfoLen,
 					NewExtChanOffset, ChannelNo, Rssi, TimeStamp, CkipFlag, pEdcaParm, pQosCapability, pQbssLoad, LengthVIE, pVIE);
-#ifdef RT30xx
 		}
-#endif
 	}
 
 	return Idx;