From b13902429a37cc8c86565f0503390c56e525a609 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sun, 23 Aug 2009 15:31:09 +0200
Subject: [PATCH] --- yaml --- r: 162461 b: refs/heads/master c:
 a0f2906f3385cfb84a6ec6b0c2c0c028dcc8cfde h: refs/heads/master i:   162459:
 fc7b196facdcbc1289995901083aa7102faac86c v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/staging/rt2860/sta/assoc.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index bd3ddd424292..27f7f50264fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e514725c8fe3128dee131a8d4ee23545c3e8c1f
+refs/heads/master: a0f2906f3385cfb84a6ec6b0c2c0c028dcc8cfde
diff --git a/trunk/drivers/staging/rt2860/sta/assoc.c b/trunk/drivers/staging/rt2860/sta/assoc.c
index 689b0468141a..1a587153c75e 100644
--- a/trunk/drivers/staging/rt2860/sta/assoc.c
+++ b/trunk/drivers/staging/rt2860/sta/assoc.c
@@ -454,9 +454,7 @@ VOID MlmeAssocReqAction(
 				RSNIe = IE_WPA2;
 			}
 
-#ifdef RT30xx
 			if (pAd->StaCfg.WpaSupplicantUP != 1)
-#endif
             RTMPMakeRSNIE(pAd, pAd->StaCfg.AuthMode, pAd->StaCfg.WepStatus, BSS0);
 
             // Check for WPA PMK cache list
@@ -483,7 +481,6 @@ VOID MlmeAssocReqAction(
 				}
 			}
 
-#ifdef RT30xx
 			if (pAd->StaCfg.WpaSupplicantUP == 1)
 			{
 				MakeOutgoingFrame(pOutBuffer + FrameLen,    		&tmp,
@@ -491,7 +488,6 @@ VOID MlmeAssocReqAction(
 		                        	END_OF_ARGS);
 			}
 			else
-#endif
 			{
 				MakeOutgoingFrame(pOutBuffer + FrameLen,    		&tmp,
 				              		1,                              &RSNIe,
@@ -502,9 +498,7 @@ VOID MlmeAssocReqAction(
 
 			FrameLen += tmp;
 
-#ifdef RT30xx
 			if (pAd->StaCfg.WpaSupplicantUP != 1)
-#endif
 			{
 	            // Append Variable IE
 	            NdisMoveMemory(pAd->StaCfg.ReqVarIEs + VarIesOffset, &RSNIe, 1);