From fee98b426559a95399aa3b61904f21dcc7a71eb0 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Tue, 12 Jul 2011 21:54:48 -0500
Subject: [PATCH] --- yaml --- r: 267661 b: refs/heads/master c:
 34a7eb3db27f3bcb6e1544523e283a9bf6acfd0d h: refs/heads/master i:   267659:
 34447d4469c598f93bc30e4be420d7223e80bdb4 v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/staging/rtl8192e/r8192E_dev.c | 26 ---------------------
 trunk/drivers/staging/rtl8192e/rtl_ps.c     |  6 -----
 trunk/drivers/staging/rtl8192e/rtllib_rx.c  |  3 ---
 4 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/[refs] b/[refs]
index 38a7d866343c..476e5fc1d5c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e1acf20a7a17ef7f0442ab0a2da640477720424
+refs/heads/master: 34a7eb3db27f3bcb6e1544523e283a9bf6acfd0d
diff --git a/trunk/drivers/staging/rtl8192e/r8192E_dev.c b/trunk/drivers/staging/rtl8192e/r8192E_dev.c
index 9d13705ad4b4..267efb421f52 100644
--- a/trunk/drivers/staging/rtl8192e/r8192E_dev.c
+++ b/trunk/drivers/staging/rtl8192e/r8192E_dev.c
@@ -166,24 +166,6 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val)
 			priv->slot_time = val[0];
 			write_nic_byte(dev, SLOT_TIME, val[0]);
 
-#ifdef MERGE_TO_DO
-			if (priv->rtllib->current_network.qos_data.supported !=0)
-			{
-				for (eACI = 0; eACI < AC_MAX; eACI++)
-				{
-					priv->rtllib->SetHwRegHandler(dev, HW_VAR_AC_PARAM, (u8*)(&eACI));
-				}
-			}
-			else
-			{
-				u8	u1bAIFS = aSifsTime + (2 * priv->slot_time);
-
-				write_nic_byte(dev, EDCAPARA_VO, u1bAIFS);
-				write_nic_byte(dev, EDCAPARA_VI, u1bAIFS);
-				write_nic_byte(dev, EDCAPARA_BE, u1bAIFS);
-				write_nic_byte(dev, EDCAPARA_BK, u1bAIFS);
-			}
-#endif
 		}
 		break;
 
@@ -205,11 +187,7 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val)
 		case HW_VAR_AC_PARAM:
 		{
 			u8	pAcParam = *((u8*)val);
-#ifdef MERGE_TO_DO
-			u32	eACI = GET_WMM_AC_PARAM_ACI(pAcParam);
-#else
 			u32	eACI = pAcParam;
-#endif
 			u8		u1bAIFS;
 			u32		u4bAcParam;
 			u8 mode = priv->rtllib->mode;
@@ -256,11 +234,7 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val)
 		{
 			struct rtllib_qos_parameters *qos_parameters = &priv->rtllib->current_network.qos_data.parameters;
 			u8	pAcParam = *((u8*)val);
-#ifdef MERGE_TO_DO
-			u32	eACI = GET_WMM_AC_PARAM_ACI(pAciAifsn);
-#else
 			u32	eACI = pAcParam;
-#endif
 			PACI_AIFSN	pAciAifsn = (PACI_AIFSN)&(qos_parameters->aifs[0]);
 			u8		ACM = pAciAifsn->f.ACM;
 			u8		AcmCtrl = read_nic_byte( dev, AcmHwCtrl);
diff --git a/trunk/drivers/staging/rtl8192e/rtl_ps.c b/trunk/drivers/staging/rtl8192e/rtl_ps.c
index 786106f0d8c6..5c9900762128 100644
--- a/trunk/drivers/staging/rtl8192e/rtl_ps.c
+++ b/trunk/drivers/staging/rtl8192e/rtl_ps.c
@@ -443,12 +443,6 @@ bool PlatformSwitchClkReq(struct net_device *dev, u8 value)
 
 	Buffer= value;
 
-#ifdef MERGE_TO_DO
-	if (Adapter->bDriverIsGoingToPnpSetPowerSleep && pDevice->RegSupportLowPowerState
-		&& value == 0x0)
-		return false;
-#endif
-
 	pci_write_config_byte(priv->pdev,0x81,value);
 	bResult = true;
 
diff --git a/trunk/drivers/staging/rtl8192e/rtllib_rx.c b/trunk/drivers/staging/rtl8192e/rtllib_rx.c
index 96f824ba8129..7e0fabad64d4 100644
--- a/trunk/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/trunk/drivers/staging/rtl8192e/rtllib_rx.c
@@ -894,9 +894,6 @@ rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee,	PRX_TS_RECORD pTS)
 	rtllib_indicate_packets(ieee, RfdArray, RfdCnt);
 
 	pTS->RxIndicateSeq = 0xffff;
-
-#ifdef MERGE_TO_DO
-#endif
 }