dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Staging: rt3070: remove dead INF_AMAZON_SE code 

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2009-04-26 16:05:35 +02:00 committed by Greg Kroah-Hartman
parent 2891e90873
commit b34b33ca5d
8 changed files with 2 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/rt3070/common/cmm_data.c
View File

@ -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 //
}

6
drivers/staging/rt3070/common/mlme.c
View File

@ -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)

6
drivers/staging/rt3070/common/rtmp_init.c
View File

@ -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

75
drivers/staging/rt3070/common/rtusb_bulk.c
View File

@ -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;

19
drivers/staging/rt3070/common/rtusb_io.c
View File

@ -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",

9
drivers/staging/rt3070/rt_linux.h
View File

@ -724,15 +724,6 @@ void RTMP_GetCurrentSystemTime(LARGE_INTEGER *time);
#define RTMP_SET_PACKET_5VT(_p, _flg) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+22] = _flg)
#define RTMP_GET_PACKET_5VT(_p) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+22])
#ifdef INF_AMAZON_SE
/*Iverson patch for WMM A5-T07 ,WirelessStaToWirelessSta do not bulk out aggregate */
#define RTMP_SET_PACKET_NOBULKOUT(_p, _morebit) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+23] = _morebit)
#define RTMP_GET_PACKET_NOBULKOUT(_p) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+23])
#endif // INF_AMAZON_SE //
#ifdef CONFIG_5VT_ENHANCE
#define BRIDGE_TAG 0x35564252 // depends on 5VT define in br_input.c
#endif

23
drivers/staging/rt3070/rt_main_dev.c
View File

@ -348,13 +348,6 @@ int rt28xx_close(IN PNET_DEV dev)
ba_reordering_resource_release(pAd);
#endif // DOT11_N_SUPPORT //
#ifdef RT2870
#ifdef INF_AMAZON_SE
if (pAd->UsbVendorReqBuf)
os_free_mem(pAd, pAd->UsbVendorReqBuf);
#endif // INF_AMAZON_SE //
#endif // RT2870 //
RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_START_UP);
return 0; // close ok
@ -371,18 +364,6 @@ static int rt28xx_init(IN struct net_device *net_dev)
// WPDMA_GLO_CFG_STRUC GloCfg;
UINT32 MacCsr0 = 0;
#ifdef RT2870
#ifdef INF_AMAZON_SE
init_MUTEX(&(pAd->UsbVendorReq_semaphore));
os_alloc_mem(pAd, (PUCHAR)&pAd->UsbVendorReqBuf, MAX_PARAM_BUFFER_SIZE - 1);
if (pAd->UsbVendorReqBuf == NULL)
{
DBGPRINT(RT_DEBUG_ERROR, ("Allocate vendor request temp buffer failed!\n"));
goto err0;
}
#endif // INF_AMAZON_SE //
#endif // RT2870 //
#ifdef DOT11_N_SUPPORT
// Allocate BA Reordering memory
ba_reordering_resource_init(pAd, MAX_REORDERING_MPDU_NUM);
@ -625,9 +606,7 @@ err1:
// shall not set priv to NULL here because the priv didn't been free yet.
//net_dev->ml_priv = 0;
#ifdef INF_AMAZON_SE
err0:
#endif // INF_AMAZON_SE //
printk("!!! %s Initialized fail !!!\n", RT28xx_CHIP_NAME);
return FALSE;
} /* End of rt28xx_init */

5
drivers/staging/rt3070/rtmp.h
View File

@ -2547,10 +2547,7 @@ typedef struct _RTMP_ADAPTER
struct semaphore mlme_semaphore; /* to sleep thread on */
struct semaphore RTUSBCmd_semaphore; /* to sleep thread on */
struct semaphore RTUSBTimer_semaphore;
#ifdef INF_AMAZON_SE
struct semaphore UsbVendorReq_semaphore;
PVOID UsbVendorReqBuf;
#endif // INF_AMAZON_SE //
struct completion TimerQComplete;
struct completion mlmeComplete;
struct completion CmdQComplete;