From 0a0bd2e828de352df1306a22ae6ec1f17df3e4cf Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sun, 23 Aug 2009 15:29:58 +0200
Subject: [PATCH] --- yaml --- r: 162450 b: refs/heads/master c:
 6e50c49684ff3240b04b91d8d8e64ad7a902ca78 h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/staging/rt2860/common/cmm_data.c | 5 ++---
 trunk/drivers/staging/rt2870/common/rtusb_io.c | 6 ------
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index d96c4b678e3b..cc61bc35b699 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0df20b67eb6db0e4a8c011e8d5a45c47a228083a
+refs/heads/master: 6e50c49684ff3240b04b91d8d8e64ad7a902ca78
diff --git a/trunk/drivers/staging/rt2860/common/cmm_data.c b/trunk/drivers/staging/rt2860/common/cmm_data.c
index 3700cb816ad8..9b8337d76292 100644
--- a/trunk/drivers/staging/rt2860/common/cmm_data.c
+++ b/trunk/drivers/staging/rt2860/common/cmm_data.c
@@ -2459,10 +2459,9 @@ BOOLEAN MacTableDeleteEntry(
 	if (pAd->MacTab.Size == 0)
 	{
 		pAd->CommonCfg.AddHTInfo.AddHtInfo2.OperaionMode = 0;
-#ifndef RT30xx
+#ifdef RT2860
 		AsicUpdateProtect(pAd, 0 /*pAd->CommonCfg.AddHTInfo.AddHtInfo2.OperaionMode*/, (ALLN_SETPROTECT), TRUE, 0 /*pAd->MacTab.fAnyStationNonGF*/);
-#endif
-#ifdef RT30xx
+#else
 		// edit by johnli, fix "in_interrupt" error when call "MacTableDeleteEntry" in Rx tasklet
 		// Set MAC register value according operation mode
 		RTUSBEnqueueInternalCmd(pAd, CMDTHREAD_UPDATE_PROTECT, NULL, 0);
diff --git a/trunk/drivers/staging/rt2870/common/rtusb_io.c b/trunk/drivers/staging/rt2870/common/rtusb_io.c
index 30c032d614ec..7acfdf883138 100644
--- a/trunk/drivers/staging/rt2870/common/rtusb_io.c
+++ b/trunk/drivers/staging/rt2870/common/rtusb_io.c
@@ -1810,17 +1810,11 @@ VOID CMDHandler(
 								pEntry->Addr[0], pEntry->Addr[1], pEntry->Addr[2], pEntry->Addr[3], pEntry->Addr[4], pEntry->Addr[5]);
 					}
 					break;
-
-#ifdef RT30xx
-// add by johnli, fix "in_interrupt" error when call "MacTableDeleteEntry" in Rx tasklet
 				case CMDTHREAD_UPDATE_PROTECT:
 					{
 						AsicUpdateProtect(pAd, 0, (ALLN_SETPROTECT), TRUE, 0);
 					}
 					break;
-// end johnli
-#endif
-
 				case OID_802_11_ADD_WEP:
 					{
 						UINT	i;