From b34f83f5a30d0cc58d17fd7c8177e9f555e3573d Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Thu, 1 Sep 2011 12:23:13 -0500
Subject: [PATCH] --- yaml --- r: 268204 b: refs/heads/master c:
 aa9af000a30e81a40294c21861402dd3c8d610ea h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/staging/rtl8192e/rtl_core.c | 22 ----------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index 340b3f00f654..4a806b57563f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf55f4a8b6243b42fb91c56d1421db0d36d60f96
+refs/heads/master: aa9af000a30e81a40294c21861402dd3c8d610ea
diff --git a/trunk/drivers/staging/rtl8192e/rtl_core.c b/trunk/drivers/staging/rtl8192e/rtl_core.c
index 6530058eab6c..ce0b2ff92739 100644
--- a/trunk/drivers/staging/rtl8192e/rtl_core.c
+++ b/trunk/drivers/staging/rtl8192e/rtl_core.c
@@ -588,7 +588,6 @@ static void rtl8192_update_beacon(void *data)
 	rtl8192_update_cap(dev, net->capability);
 }
 
-#define MOVE_INTO_HANDLER
 int WDCAPARA_ADD[] = {EDCAPARA_BE, EDCAPARA_BK, EDCAPARA_VI, EDCAPARA_VO};
 
 static void rtl8192_qos_activate(void *data)
@@ -596,13 +595,6 @@ static void rtl8192_qos_activate(void *data)
 	struct r8192_priv *priv = container_of_work_rsl(data, struct r8192_priv,
 				  qos_activate);
 	struct net_device *dev = priv->rtllib->dev;
-#ifndef MOVE_INTO_HANDLER
-	struct rtllib_qos_parameters *qos_parameters =
-		 &priv->rtllib->current_network.qos_data.parameters;
-	u8 mode = priv->rtllib->current_network.mode;
-	u8  u1bAIFS;
-	u32 u4bAcParam;
-#endif
 	int i;
 
 	if (priv == NULL)
@@ -615,21 +607,7 @@ static void rtl8192_qos_activate(void *data)
 		 "received\n");
 
 	for (i = 0; i <  QOS_QUEUE_NUM; i++) {
-#ifndef MOVE_INTO_HANDLER
-		u1bAIFS = qos_parameters->aifs[i] *
-			  ((mode&(IEEE_G|IEEE_N_24G)) ? 9 : 20) + aSifsTime;
-		u4bAcParam = ((((u32)(qos_parameters->tx_op_limit[i])) <<
-			     AC_PARAM_TXOP_LIMIT_OFFSET) |
-			     (((u32)(qos_parameters->cw_max[i])) <<
-			     AC_PARAM_ECW_MAX_OFFSET) |
-			     (((u32)(qos_parameters->cw_min[i])) <<
-			     AC_PARAM_ECW_MIN_OFFSET) |
-			     ((u32)u1bAIFS << AC_PARAM_AIFS_OFFSET));
-		RT_TRACE(COMP_DBG, "===>ACI:%d:u4bAcParam:%x\n", i, u4bAcParam);
-		write_nic_dword(dev, WDCAPARA_ADD[i], u4bAcParam);
-#else
 		priv->rtllib->SetHwRegHandler(dev, HW_VAR_AC_PARAM, (u8 *)(&i));
-#endif
 	}
 
 success: