Staging: rt3070: remove dead INF_AMAZON_SE code (b34b33ca) · Commits · jan.koester / Linux

drivers/staging/rt3070/common/cmm_data.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -1313,16 +1313,6 @@ VOID RTMPWriteTxWI_Data(

		// for rate adapation
		pTxWI->PacketId = pTxWI->MCS;
		#ifdef INF_AMAZON_SE
		/Iverson patch for WMM A5-T07 ,WirelessStaToWirelessSta do not bulk out aggregate /
		if( RTMP_GET_PACKET_NOBULKOUT(pTxBlk->pPacket))
		{
		if(pTxWI->PHYMODE == MODE_CCK)
		{
		pTxWI->PacketId = 6;
		}
		}
		#endif // INF_AMAZON_SE //
		}

drivers/staging/rt3070/common/mlme.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -6928,9 +6928,6 @@ VOID AsicSetEdcaParm(
		Ac2Cfg.field.Cwmin = pEdcaParm->Cwmin[QID_AC_VI];
		Ac2Cfg.field.Cwmax = pEdcaParm->Cwmax[QID_AC_VI];
		Ac2Cfg.field.Aifsn = pEdcaParm->Aifsn[QID_AC_VI];
		#ifdef INF_AMAZON_SE
		#endif // INF_AMAZON_SE //


		#ifdef CONFIG_STA_SUPPORT
		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
		@@ -7016,9 +7013,6 @@ VOID AsicSetEdcaParm(
		AifsnCsr.field.Aifsn0 = Ac0Cfg.field.Aifsn; //pEdcaParm->Aifsn[QID_AC_BE];
		AifsnCsr.field.Aifsn1 = Ac1Cfg.field.Aifsn; //pEdcaParm->Aifsn[QID_AC_BK];
		AifsnCsr.field.Aifsn2 = Ac2Cfg.field.Aifsn; //pEdcaParm->Aifsn[QID_AC_VI];
		#ifdef INF_AMAZON_SE
		#endif // INF_AMAZON_SE //


		#ifdef CONFIG_STA_SUPPORT
		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

drivers/staging/rt3070/common/rtmp_init.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -185,13 +185,7 @@ RTMP_REG_PAIR MACRegTable[] = {
		// {WMM_CWMIN_CFG, 0x00002344},
		// {WMM_CWMAX_CFG, 0x000034aa},
		//#endif // CONFIG_STA_SUPPORT //
		#ifdef INF_AMAZON_SE
		{PBF_MAX_PCNT, 0x1F3F6F6F}, //iverson modify for usb issue, 2008/09/19
		// 6F + 6F < total page count FE
		// so that RX doesn't occupy TX's buffer space when WMM congestion.
		#else
		{PBF_MAX_PCNT, 0x1F3FBF9F}, //0x1F3f7f9f}, //Jan, 2006/04/20
		#endif // INF_AMAZON_SE //
		//{TX_RTY_CFG, 0x6bb80408}, // Jan, 2006/11/16
		{TX_RTY_CFG, 0x47d01f0f}, // Jan, 2006/11/16, Set TxWI->ACK =0 in Probe Rsp Modify for 2860E ,2007-08-03
		{AUTO_RSP_CFG, 0x00000013}, // Initial Auto_Responder, because QA will turn off Auto-Responder

drivers/staging/rt3070/common/rtusb_bulk.c

+0 −75

Original line number	Diff line number	Diff line
		@@ -281,55 +281,12 @@ VOID RTUSBBulkOutDataPacket(
		//if ((ThisBulkSize != 0) && (pTxWI->AMPDU == 0))
		if ((ThisBulkSize != 0) && (pTxWI->PHYMODE == MODE_CCK))
		{
		#ifdef INF_AMAZON_SE
		/Iverson Add for AMAZON USB (RT2070 && RT3070) to pass WMM A2-T4 ~ A2-T10/
		if(OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_WMM_INUSED))
		{
		/Iverson patch for WMM A5-T07 ,WirelessStaToWirelessSta do not bulk out aggregate/
		if(pTxWI->PacketId == 6)
		{
		pHTTXContext->ENextBulkOutPosition = TmpBulkEndPos;
		break;
		}
		else if (BulkOutPipeId == 1)
		{
		/BK No Limit BulkOut size ./
		pHTTXContext->ENextBulkOutPosition = TmpBulkEndPos;
		break;
		}
		else if (((ThisBulkSize&0xffff8000) != 0) \|\| (((ThisBulkSize&0x1000) == 0x1000) && (BulkOutPipeId == 0) ))
		{
		/BE Limit BulkOut size to about 4k bytes./
		pHTTXContext->ENextBulkOutPosition = TmpBulkEndPos;
		break;
		}
		else if (((ThisBulkSize&0xffff8000) != 0) \|\| (((ThisBulkSize&0x1c00) == 0x1c00) && (BulkOutPipeId == 2) ))
		{
		/VI Limit BulkOut size to about 7k bytes./
		pHTTXContext->ENextBulkOutPosition = TmpBulkEndPos;
		break;
		}
		else if (((ThisBulkSize&0xffff8000) != 0) \|\| (((ThisBulkSize&0x2500) == 0x2500) && (BulkOutPipeId == 3) ))
		{
		/VO Limit BulkOut size to about 9k bytes./
		pHTTXContext->ENextBulkOutPosition = TmpBulkEndPos;
		break;
		}
		}
		else if (((ThisBulkSize&0xffff8000) != 0) \|\| ((ThisBulkSize&0x1000) == 0x1000))
		{
		/* Limit BulkOut size to about 4k bytes.*/
		pHTTXContext->ENextBulkOutPosition = TmpBulkEndPos;
		break;
		}
		#else
		if (((ThisBulkSize&0xffff8000) != 0) \|\| ((ThisBulkSize&0x1000) == 0x1000))
		{
		// Limit BulkOut size to about 4k bytes.
		pHTTXContext->ENextBulkOutPosition = TmpBulkEndPos;
		break;
		}
		#endif // INF_AMAZON_SE //

		else if (((pAd->BulkOutMaxPacketSize < 512) && ((ThisBulkSize&0xfffff800) != 0) ) /\|\| ( (ThisBulkSize != 0) && (pTxWI->AMPDU == 0))/)
		{
		@@ -342,38 +299,6 @@ VOID RTUSBBulkOutDataPacket(
		// end Iverson
		else
		{
		#ifdef INF_AMAZON_SE
		//#ifdef DOT11_N_SUPPORT
		// if(((ThisBulkSize&0xffff8000) != 0) \|\| ((ThisBulkSize&0x6000) == 0x6000) \|\| ( (ThisBulkSize != 0) && (pTxWI->AMPDU == 0)))
		// {
		// /* AMAZON_SE: BG mode Disable BulkOut Aggregate, N mode BulkOut Aggregaet size 24K */
		// pHTTXContext->ENextBulkOutPosition = TmpBulkEndPos;
		// break;
		// }
		// else
		//#endif // DOT11_N_SUPPORT //
		// {
		if(OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_WMM_INUSED) && (pTxWI->AMPDU == 0))
		{
		if (((pAd->BulkOutMaxPacketSize < 512) && ((ThisBulkSize&0xfffff800) != 0)) \|\|
		(ThisBulkSize != 0))
		{
		/* AMAZON_SE: RT2070 Disable BulkOut Aggregate when WMM for USB issue */
		pHTTXContext->ENextBulkOutPosition = TmpBulkEndPos;
		break;
		}
		}
		/*
		else if (((ThisBulkSize&0xffff8000) != 0) \|\| ((ThisBulkSize&0x6000) == 0x6000))
		{
		// Limit BulkOut size to about 24k bytes.
		pHTTXContext->ENextBulkOutPosition = TmpBulkEndPos;
		break;
		}
		}
		*/
		#endif // INF_AMAZON_SE //

		if (((ThisBulkSize&0xffff8000) != 0) \|\| ((ThisBulkSize&0x6000) == 0x6000))
		{ // Limit BulkOut size to about 24k bytes.
		pHTTXContext->ENextBulkOutPosition = TmpBulkEndPos;

drivers/staging/rt3070/common/rtusb_io.c

+0 −19

Original line number	Diff line number	Diff line
		@@ -1108,19 +1108,6 @@ NTSTATUS RTUSB_VendorRequest(
		void *tmpBuf = TransferBuffer;

		// Acquire Control token
		#ifdef INF_AMAZON_SE
		ret = down_interruptible(&(pAd->UsbVendorReq_semaphore));
		if (pAd->UsbVendorReqBuf)
		{
		ASSERT(TransferBufferLength <MAX_PARAM_BUFFER_SIZE);

		tmpBuf = (void *)pAd->UsbVendorReqBuf;
		NdisZeroMemory(pAd->UsbVendorReqBuf, TransferBufferLength);

		if (RequestType == DEVICE_VENDOR_REQUEST_OUT)
		NdisMoveMemory(tmpBuf, TransferBuffer, TransferBufferLength);
		}
		#endif // INF_AMAZON_SE //
		do {
		if( RequestType == DEVICE_VENDOR_REQUEST_OUT)
		ret=usb_control_msg(pObj->pUsb_Dev, usb_sndctrlpipe( pObj->pUsb_Dev, 0 ), Request, RequestType, Value,Index, tmpBuf, TransferBufferLength, CONTROL_TIMEOUT_JIFFIES);
		@@ -1139,12 +1126,6 @@ NTSTATUS RTUSB_VendorRequest(
		}
		} while((ret < 0) && (retryCount < MAX_RETRY_COUNT));

		#ifdef INF_AMAZON_SE
		if ((pAd->UsbVendorReqBuf) && (RequestType == DEVICE_VENDOR_REQUEST_IN))
		NdisMoveMemory(TransferBuffer, tmpBuf, TransferBufferLength);
		up(&(pAd->UsbVendorReq_semaphore));
		#endif // INF_AMAZON_SE //

		if (ret < 0) {
		// DBGPRINT(RT_DEBUG_ERROR, ("USBVendorRequest failed ret=%d \n",ret));
		DBGPRINT(RT_DEBUG_ERROR, ("RTUSB_VendorRequest failed(%d),TxFlags=0x%x, ReqType=%s, Req=0x%x, Index=0x%x\n",