Skip to content

L
linux
Commit ac7e7d5a authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files
Options

Staging: rt2870: remove dead code 

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 96f139ee
Expand all Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 2249 deletions
drivers/staging/rt2870/ap.h
View file @ ac7e7d5a
...@@ -163,18 +163,6 @@ USHORT APBuildAssociation( ...@@ -163,18 +163,6 @@ USHORT APBuildAssociation(
IN UCHAR HtCapabilityLen, IN UCHAR HtCapabilityLen,
OUT USHORT *pAid); OUT USHORT *pAid);
/*
VOID RTMPAddClientSec(
IN PRTMP_ADAPTER pAd,
IN UCHAR BssIdx,
IN UCHAR KeyIdx,
IN UCHAR CipherAlg,
IN PUCHAR pKey,
IN PUCHAR pTxMic,
IN PUCHAR pRxMic,
IN MAC_TABLE_ENTRY *pEntry);
*/
// ap_auth.c // ap_auth.c
void APAuthStateMachineInit( void APAuthStateMachineInit(
......
drivers/staging/rt2870/chlist.h
View file @ ac7e7d5a
...@@ -1195,49 +1195,6 @@ static inline VOID N_ChannelCheck( ...@@ -1195,49 +1195,6 @@ static inline VOID N_ChannelCheck(
pAd->CommonCfg.RegTransmitSetting.field.BW = BW_20; pAd->CommonCfg.RegTransmitSetting.field.BW = BW_20;
//pAd->CommonCfg.RegTransmitSetting.field.EXTCHA = EXTCHA_NONE; // We didn't set the ExtCh as NONE due to it'll set in RTMPSetHT() //pAd->CommonCfg.RegTransmitSetting.field.EXTCHA = EXTCHA_NONE; // We didn't set the ExtCh as NONE due to it'll set in RTMPSetHT()
} }
#if 0
switch (pAd->CommonCfg.CountryRegion & 0x7f)
{
case REGION_0_BG_BAND: // 1 -11
case REGION_1_BG_BAND: // 1 - 13
case REGION_5_BG_BAND: // 1 - 14
if (Channel <= 4)
{
pAd->CommonCfg.RegTransmitSetting.field.EXTCHA = EXTCHA_ABOVE;
}
else if (Channel >= 8)
{
if ((ChannelNum - Channel) < 4)
pAd->CommonCfg.RegTransmitSetting.field.EXTCHA = EXTCHA_BELOW;
}
break;
case REGION_2_BG_BAND: // 10 - 11
case REGION_3_BG_BAND: // 10 - 13
case REGION_4_BG_BAND: // 14
pAd->CommonCfg.RegTransmitSetting.field.BW = BW_20;
break;
case REGION_6_BG_BAND: // 3 - 9
if (Channel <= 5)
pAd->CommonCfg.RegTransmitSetting.field.EXTCHA = EXTCHA_ABOVE;
else if (Channel == 6)
pAd->CommonCfg.RegTransmitSetting.field.BW = BW_20;
else if (Channel >= 7)
pAd->CommonCfg.RegTransmitSetting.field.EXTCHA = EXTCHA_BELOW;
break;
case REGION_7_BG_BAND: // 5 - 13
if (Channel <= 8)
pAd->CommonCfg.RegTransmitSetting.field.EXTCHA = EXTCHA_ABOVE;
else if (Channel >= 10)
pAd->CommonCfg.RegTransmitSetting.field.EXTCHA = EXTCHA_BELOW;
break;
default: // Error. should never happen
break;
}
#endif
} }
} }
......
drivers/staging/rt2870/common/2870_rtmp_init.c
View file @ ac7e7d5a
...@@ -266,27 +266,6 @@ NDIS_STATUS NICInitTransmit( ...@@ -266,27 +266,6 @@ NDIS_STATUS NICInitTransmit(
// //
// MGMT_RING_SIZE // MGMT_RING_SIZE
// //
#if 0
for(i=0; i<MGMT_RING_SIZE; i++) // 8
{
PTX_CONTEXT pMLMEContext = &(pAd->MLMEContext[i]);
NdisZeroMemory(pMLMEContext, sizeof(TX_CONTEXT));
//Allocate URB
LM_USB_ALLOC(pObj, pMLMEContext, PTX_BUFFER, sizeof(TX_BUFFER), Status,
("<-- ERROR in Alloc TX MLMEContext[%d] urb!! \n", i),
out2,
("<-- ERROR in Alloc TX MLMEContext[%d] TX_BUFFER !! \n", i),
out2);
pMLMEContext->pAd = pAd;
pMLMEContext->pIrp = NULL;
pMLMEContext->InUse = FALSE;
pMLMEContext->IRPPending = FALSE;
}
#else
// Allocate MGMT ring descriptor's memory // Allocate MGMT ring descriptor's memory
pAd->MgmtDescRing.AllocSize = MGMT_RING_SIZE * sizeof(TX_CONTEXT); pAd->MgmtDescRing.AllocSize = MGMT_RING_SIZE * sizeof(TX_CONTEXT);
RTMPAllocateMemory(&pAd->MgmtDescRing.AllocVa, pAd->MgmtDescRing.AllocSize); RTMPAllocateMemory(&pAd->MgmtDescRing.AllocVa, pAd->MgmtDescRing.AllocSize);
...@@ -336,7 +315,6 @@ NDIS_STATUS NICInitTransmit( ...@@ -336,7 +315,6 @@ NDIS_STATUS NICInitTransmit(
pAd->MgmtRing.TxSwFreeIdx = MGMT_RING_SIZE; pAd->MgmtRing.TxSwFreeIdx = MGMT_RING_SIZE;
pAd->MgmtRing.TxCpuIdx = 0; pAd->MgmtRing.TxCpuIdx = 0;
pAd->MgmtRing.TxDmaIdx = 0; pAd->MgmtRing.TxDmaIdx = 0;
#endif
// //
// BEACON_RING_SIZE // BEACON_RING_SIZE
......
drivers/staging/rt2870/common/action.c
View file @ ac7e7d5a
...@@ -466,11 +466,6 @@ VOID ORIBATimerTimeout( ...@@ -466,11 +466,6 @@ VOID ORIBATimerTimeout(
{ {
MAC_TABLE_ENTRY *pEntry; MAC_TABLE_ENTRY *pEntry;
INT i, total; INT i, total;
// FRAME_BAR FrameBar;
// ULONG FrameLen;
// NDIS_STATUS NStatus;
// PUCHAR pOutBuffer = NULL;
// USHORT Sequence;
UCHAR TID; UCHAR TID;
total = pAd->MacTab.Size * NUM_OF_TID; total = pAd->MacTab.Size * NUM_OF_TID;
...@@ -535,10 +530,9 @@ VOID SendRefreshBAR( ...@@ -535,10 +530,9 @@ VOID SendRefreshBAR(
MakeOutgoingFrame(pOutBuffer, &FrameLen, MakeOutgoingFrame(pOutBuffer, &FrameLen,
sizeof(FRAME_BAR), &FrameBar, sizeof(FRAME_BAR), &FrameBar,
END_OF_ARGS); END_OF_ARGS);
//if (!(CLIENT_STATUS_TEST_FLAG(pEntry, fCLIENT_STATUS_RALINK_CHIPSET)))
if (1) // Now we always send BAR. if (1) // Now we always send BAR.
{ {
//MiniportMMRequestUnlock(pAd, 0, pOutBuffer, FrameLen);
MiniportMMRequest(pAd, 0, pOutBuffer, FrameLen); MiniportMMRequest(pAd, 0, pOutBuffer, FrameLen);
} }
MlmeFreeMemory(pAd, pOutBuffer); MlmeFreeMemory(pAd, pOutBuffer);
...@@ -568,8 +562,6 @@ VOID BarHeaderInit( ...@@ -568,8 +562,6 @@ VOID BarHeaderInit(
IN PUCHAR pDA, IN PUCHAR pDA,
IN PUCHAR pSA) IN PUCHAR pSA)
{ {
// USHORT Duration;
NdisZeroMemory(pCntlBar, sizeof(FRAME_BAR)); NdisZeroMemory(pCntlBar, sizeof(FRAME_BAR));
pCntlBar->FC.Type = BTYPE_CNTL; pCntlBar->FC.Type = BTYPE_CNTL;
pCntlBar->FC.SubType = SUBTYPE_BLOCK_ACK_REQ; pCntlBar->FC.SubType = SUBTYPE_BLOCK_ACK_REQ;
......
drivers/staging/rt2870/common/ba_action.c
View file @ ac7e7d5a
...@@ -462,19 +462,6 @@ void ba_flush_reordering_timeout_mpdus( ...@@ -462,19 +462,6 @@ void ba_flush_reordering_timeout_mpdus(
} }
} }
#if 0
else if (
(RTMP_TIME_AFTER((unsigned long)Now32, (unsigned long)(pBAEntry->LastIndSeqAtTimer+(MAX_REORDERING_PACKET_TIMEOUT))) &&
(pBAEntry->list.qlen > 1))
)
{
DBGPRINT(RT_DEBUG_TRACE,("timeout[%d] (%lx-%lx = %d > %d): %x\n ", pBAEntry->list.qlen, Now32, (pBAEntry->LastIndSeqAtTimer),
(int)((long) Now32 - (long)(pBAEntry->LastIndSeqAtTimer)), MAX_REORDERING_PACKET_TIMEOUT,
pBAEntry->LastIndSeq));
ba_refresh_reordering_mpdus(pAd, pBAEntry);
pBAEntry->LastIndSeqAtTimer = Now32;
}
#endif
} }
...@@ -688,10 +675,6 @@ BOOLEAN BARecSessionAdd( ...@@ -688,10 +675,6 @@ BOOLEAN BARecSessionAdd(
RTMPInitTimer(pAd, &pBAEntry->RECBATimer, GET_TIMER_FUNCTION(BARecSessionIdleTimeout), pBAEntry, TRUE); RTMPInitTimer(pAd, &pBAEntry->RECBATimer, GET_TIMER_FUNCTION(BARecSessionIdleTimeout), pBAEntry, TRUE);
} }
#if 0 // for debugging
RTMPSetTimer(&pBAEntry->RECBATimer, REC_BA_SESSION_IDLE_TIMEOUT);
#endif
// Set Bitmap flag. // Set Bitmap flag.
pEntry->RXBAbitmap |= (1<<TID); pEntry->RXBAbitmap |= (1<<TID);
pEntry->BARecWcidArray[TID] = Idx; pEntry->BARecWcidArray[TID] = Idx;
...@@ -1552,13 +1535,9 @@ static VOID ba_enqueue_reordering_packet( ...@@ -1552,13 +1535,9 @@ static VOID ba_enqueue_reordering_packet(
} }
else else
{ {
#if 0
DBGPRINT(RT_DEBUG_ERROR, ("!!! (%d:%d) Can't allocate reordering mpdu blk\n",
blk_count, pBAEntry->list.qlen));
#else
DBGPRINT(RT_DEBUG_ERROR, ("!!! (%d) Can't allocate reordering mpdu blk\n", DBGPRINT(RT_DEBUG_ERROR, ("!!! (%d) Can't allocate reordering mpdu blk\n",
pBAEntry->list.qlen)); pBAEntry->list.qlen));
#endif
/* /*
* flush all pending reordering mpdus * flush all pending reordering mpdus
* and receving mpdu to upper layer * and receving mpdu to upper layer
...@@ -1606,29 +1585,11 @@ VOID Indicate_AMPDU_Packet( ...@@ -1606,29 +1585,11 @@ VOID Indicate_AMPDU_Packet(
if (!RX_BLK_TEST_FLAG(pRxBlk, fRX_AMSDU) && (pRxBlk->DataSize > MAX_RX_PKT_LEN)) if (!RX_BLK_TEST_FLAG(pRxBlk, fRX_AMSDU) && (pRxBlk->DataSize > MAX_RX_PKT_LEN))
{ {
#if 0 // sample take off, no use
static int err_size;
err_size++;
if (err_size > 20) {
printk("AMPDU DataSize = %d\n", pRxBlk->DataSize);
hex_dump("802.11 Header", (UCHAR *)pRxBlk->pHeader, 24);
hex_dump("Payload", pRxBlk->pData, 64);
err_size = 0;
}
#endif
// release packet // release packet
RELEASE_NDIS_PACKET(pAd, pRxBlk->pRxPacket, NDIS_STATUS_FAILURE); RELEASE_NDIS_PACKET(pAd, pRxBlk->pRxPacket, NDIS_STATUS_FAILURE);
return; return;
} }
#if 0 // test
/* Rec BA Session had been torn down */
INDICATE_LEGACY_OR_AMSDU(pAd, pRxBlk, FromWhichBSSID);
return;
#endif
if (Wcid < MAX_LEN_OF_MAC_TABLE) if (Wcid < MAX_LEN_OF_MAC_TABLE)
{ {
Idx = pAd->MacTab.Content[Wcid].BARecWcidArray[TID]; Idx = pAd->MacTab.Content[Wcid].BARecWcidArray[TID];
...@@ -1723,10 +1684,6 @@ VOID Indicate_AMPDU_Packet( ...@@ -1723,10 +1684,6 @@ VOID Indicate_AMPDU_Packet(
// //
else else
{ {
#if 0
ba_refresh_reordering_mpdus(pAd, pBAEntry);
INDICATE_LEGACY_OR_AMSDU(pAd, pRxBlk, FromWhichBSSID);
#else
LONG WinStartSeq, TmpSeq; LONG WinStartSeq, TmpSeq;
...@@ -1748,6 +1705,5 @@ VOID Indicate_AMPDU_Packet( ...@@ -1748,6 +1705,5 @@ VOID Indicate_AMPDU_Packet(
{ {
pBAEntry->LastIndSeq = TmpSeq; pBAEntry->LastIndSeq = TmpSeq;
} }
#endif
} }
} }
drivers/staging/rt2870/common/cmm_data.c
View file @ ac7e7d5a
...@@ -67,7 +67,6 @@ UCHAR RxwiMCSToOfdmRate[12] = { ...@@ -67,7 +67,6 @@ UCHAR RxwiMCSToOfdmRate[12] = {
char* MCSToMbps[] = {"1Mbps","2Mbps","5.5Mbps","11Mbps","06Mbps","09Mbps","12Mbps","18Mbps","24Mbps","36Mbps","48Mbps","54Mbps","MM-0","MM-1","MM-2","MM-3","MM-4","MM-5","MM-6","MM-7","MM-8","MM-9","MM-10","MM-11","MM-12","MM-13","MM-14","MM-15","MM-32","ee1","ee2","ee3"}; char* MCSToMbps[] = {"1Mbps","2Mbps","5.5Mbps","11Mbps","06Mbps","09Mbps","12Mbps","18Mbps","24Mbps","36Mbps","48Mbps","54Mbps","MM-0","MM-1","MM-2","MM-3","MM-4","MM-5","MM-6","MM-7","MM-8","MM-9","MM-10","MM-11","MM-12","MM-13","MM-14","MM-15","MM-32","ee1","ee2","ee3"};
UCHAR default_cwmin[]={CW_MIN_IN_BITS, CW_MIN_IN_BITS, CW_MIN_IN_BITS-1, CW_MIN_IN_BITS-2}; UCHAR default_cwmin[]={CW_MIN_IN_BITS, CW_MIN_IN_BITS, CW_MIN_IN_BITS-1, CW_MIN_IN_BITS-2};
//UCHAR default_cwmax[]={CW_MAX_IN_BITS, CW_MAX_IN_BITS, CW_MIN_IN_BITS, CW_MIN_IN_BITS-1};
UCHAR default_sta_aifsn[]={3,7,2,2}; UCHAR default_sta_aifsn[]={3,7,2,2};
UCHAR MapUserPriorityToAccessCategory[8] = {QID_AC_BE, QID_AC_BK, QID_AC_BK, QID_AC_BE, QID_AC_VI, QID_AC_VI, QID_AC_VO, QID_AC_VO}; UCHAR MapUserPriorityToAccessCategory[8] = {QID_AC_BE, QID_AC_BK, QID_AC_BK, QID_AC_BE, QID_AC_VI, QID_AC_VI, QID_AC_VO, QID_AC_VO};
...@@ -233,17 +232,11 @@ NDIS_STATUS MlmeHardTransmitMgmtRing( ...@@ -233,17 +232,11 @@ NDIS_STATUS MlmeHardTransmitMgmtRing(
RTMP_QueryPacketInfo(pPacket, &PacketInfo, &pSrcBufVA, &SrcBufLen); RTMP_QueryPacketInfo(pPacket, &PacketInfo, &pSrcBufVA, &SrcBufLen);
// Make sure MGMT ring resource won't be used by other threads
// sample, for IRQ LOCK -> SEM LOCK
// IrqState = pAd->irq_disabled;
// if (!IrqState)
RTMP_SEM_LOCK(&pAd->MgmtRingLock); RTMP_SEM_LOCK(&pAd->MgmtRingLock);
if (pSrcBufVA == NULL) if (pSrcBufVA == NULL)
{ {
// The buffer shouldn't be NULL
// if (!IrqState)
RTMP_SEM_UNLOCK(&pAd->MgmtRingLock); RTMP_SEM_UNLOCK(&pAd->MgmtRingLock);
return NDIS_STATUS_FAILURE; return NDIS_STATUS_FAILURE;
} }
...@@ -318,9 +311,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing( ...@@ -318,9 +311,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing(
} }
else // BTYPE_MGMT or BTYPE_DATA(must be NULL frame) else // BTYPE_MGMT or BTYPE_DATA(must be NULL frame)
{ {
//pAd->Sequence++;
//pHeader_802_11->Sequence = pAd->Sequence;
if (pHeader_802_11->Addr1[0] & 0x01) // MULTICAST, BROADCAST if (pHeader_802_11->Addr1[0] & 0x01) // MULTICAST, BROADCAST
{ {
bAckRequired = FALSE; bAckRequired = FALSE;
...@@ -348,7 +338,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing( ...@@ -348,7 +338,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing(
&& (pAd->CommonCfg.RadarDetect.RDMode != RD_NORMAL_MODE)) && (pAd->CommonCfg.RadarDetect.RDMode != RD_NORMAL_MODE))
{ {
DBGPRINT(RT_DEBUG_ERROR,("MlmeHardTransmit --> radar detect not in normal mode !!!\n")); DBGPRINT(RT_DEBUG_ERROR,("MlmeHardTransmit --> radar detect not in normal mode !!!\n"));
// if (!IrqState)
RTMP_SEM_UNLOCK(&pAd->MgmtRingLock); RTMP_SEM_UNLOCK(&pAd->MgmtRingLock);
return (NDIS_STATUS_FAILURE); return (NDIS_STATUS_FAILURE);
} }
...@@ -362,7 +351,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing( ...@@ -362,7 +351,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing(
// Initialize TX Descriptor // Initialize TX Descriptor
// For inter-frame gap, the number is for this frame and next frame // For inter-frame gap, the number is for this frame and next frame
// For MLME rate, we will fix as 2Mb to match other vendor's implement // For MLME rate, we will fix as 2Mb to match other vendor's implement
// pAd->CommonCfg.MlmeTransmit.field.MODE = 1;
// management frame doesn't need encryption. so use RESERVED_WCID no matter u are sending to specific wcid or not. // management frame doesn't need encryption. so use RESERVED_WCID no matter u are sending to specific wcid or not.
if (pMacEntry == NULL) if (pMacEntry == NULL)
...@@ -384,7 +372,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing( ...@@ -384,7 +372,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing(
HAL_KickOutMgmtTx(pAd, QueIdx, pPacket, pSrcBufVA, SrcBufLen); HAL_KickOutMgmtTx(pAd, QueIdx, pPacket, pSrcBufVA, SrcBufLen);
// Make sure to release MGMT ring resource // Make sure to release MGMT ring resource
// if (!IrqState)
RTMP_SEM_UNLOCK(&pAd->MgmtRingLock); RTMP_SEM_UNLOCK(&pAd->MgmtRingLock);
return NDIS_STATUS_SUCCESS; return NDIS_STATUS_SUCCESS;
} }
...@@ -408,51 +395,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing( ...@@ -408,51 +395,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing(
RTMP_IRQ_UNLOCK((lock), IrqFlags); \ RTMP_IRQ_UNLOCK((lock), IrqFlags); \
}while(0) }while(0)
#if 0
static VOID dumpTxBlk(TX_BLK *pTxBlk)
{
NDIS_PACKET *pPacket;
int i, frameNum;
PQUEUE_ENTRY pQEntry;
printk("Dump TX_BLK Structure:\n");
printk("\tTxFrameType=%d!\n", pTxBlk->TxFrameType);
printk("\tTotalFrameLen=%d\n", pTxBlk->TotalFrameLen);
printk("\tTotalFrameNum=%ld!\n", pTxBlk->TxPacketList.Number);
printk("\tTotalFragNum=%d!\n", pTxBlk->TotalFragNum);
printk("\tpPacketList=\n");
frameNum = pTxBlk->TxPacketList.Number;
for(i=0; i < frameNum; i++)
{ int j;
UCHAR *pBuf;
pQEntry = RemoveHeadQueue(&pTxBlk->TxPacketList);
pPacket = QUEUE_ENTRY_TO_PACKET(pQEntry);
if (pPacket)
{
pBuf = GET_OS_PKT_DATAPTR(pPacket);
printk("\t\t[%d]:ptr=0x%x, Len=%d!\n", i, (UINT32)(GET_OS_PKT_DATAPTR(pPacket)), GET_OS_PKT_LEN(pPacket));
printk("\t\t");
for (j =0 ; j < GET_OS_PKT_LEN(pPacket); j++)
{
printk("%02x ", (pBuf[j] & 0xff));
if (j == 16)
break;
}
InsertTailQueue(&pTxBlk->TxPacketList, PACKET_TO_QUEUE_ENTRY(pPacket));
}
}
printk("\tWcid=%d!\n", pTxBlk->Wcid);
printk("\tapidx=%d!\n", pTxBlk->apidx);
printk("----EndOfDump\n");
}
#endif
/* /*
======================================================================== ========================================================================
Tx Path design algorithm: Tx Path design algorithm:
...@@ -813,7 +755,6 @@ VOID RTMPDeQueuePacket( ...@@ -813,7 +755,6 @@ VOID RTMPDeQueuePacket(
pTxBlk = &TxBlk; pTxBlk = &TxBlk;
NdisZeroMemory((PUCHAR)pTxBlk, sizeof(TX_BLK)); NdisZeroMemory((PUCHAR)pTxBlk, sizeof(TX_BLK));
//InitializeQueueHeader(&pTxBlk->TxPacketList); // Didn't need it because we already memzero it.
pTxBlk->QueIdx = QueIdx; pTxBlk->QueIdx = QueIdx;
pPacket = QUEUE_ENTRY_TO_PKT(pEntry); pPacket = QUEUE_ENTRY_TO_PKT(pEntry);
...@@ -880,14 +821,6 @@ VOID RTMPDeQueuePacket( ...@@ -880,14 +821,6 @@ VOID RTMPDeQueuePacket(
// Do HardTransmit now. // Do HardTransmit now.
Status = STAHardTransmit(pAd, pTxBlk, QueIdx); Status = STAHardTransmit(pAd, pTxBlk, QueIdx);
#if 0 // We should not break if HardTransmit failed. Well, at least now we should not!
if (Status != NDIS_STATUS_SUCCESS)
{
DBGPRINT(RT_DEBUG_TRACE /*RT_DEBUG_INFO*/,("RTMPHardTransmit return failed!!!\n"));
break;
}
#endif
} }
RT28XX_STOP_DEQUEUE(pAd, QueIdx, IrqFlags); RT28XX_STOP_DEQUEUE(pAd, QueIdx, IrqFlags);
...@@ -1129,11 +1062,6 @@ VOID RTMPWriteTxWI_Data( ...@@ -1129,11 +1062,6 @@ VOID RTMPWriteTxWI_Data(
BASize = pAd->BATable.BAOriEntry[RABAOriIdx].BAWinSize; BASize = pAd->BATable.BAOriEntry[RABAOriIdx].BAWinSize;
} }
#if 0 // 3*3
if (BASize > 7)
BASize = 7;
#endif
pTxWI->TxBF = pTransmit->field.TxBF; pTxWI->TxBF = pTransmit->field.TxBF;
pTxWI->BAWinSize = BASize; pTxWI->BAWinSize = BASize;
pTxWI->ShortGI = pTransmit->field.ShortGI; pTxWI->ShortGI = pTransmit->field.ShortGI;
...@@ -1187,7 +1115,7 @@ VOID RTMPWriteTxWI_Cache( ...@@ -1187,7 +1115,7 @@ VOID RTMPWriteTxWI_Cache(
IN OUT PTXWI_STRUC pTxWI, IN OUT PTXWI_STRUC pTxWI,
IN TX_BLK *pTxBlk) IN TX_BLK *pTxBlk)
{ {
PHTTRANSMIT_SETTING /*pTxHTPhyMode,*/ pTransmit; PHTTRANSMIT_SETTING pTransmit;
PMAC_TABLE_ENTRY pMacEntry; PMAC_TABLE_ENTRY pMacEntry;
// //
...@@ -1288,8 +1216,6 @@ VOID RTMPWriteTxDescriptor( ...@@ -1288,8 +1216,6 @@ VOID RTMPWriteTxDescriptor(
pTxD->WIV = (bWIV) ? 1: 0; pTxD->WIV = (bWIV) ? 1: 0;
pTxD->QSEL= (QueueSEL); pTxD->QSEL= (QueueSEL);
//RT2860c?? fixed using EDCA queue for test... We doubt Queue1 has problem. 2006-09-26 Jan
//pTxD->QSEL= FIFO_EDCA;
if (pAd->bGenOneHCCA == TRUE) if (pAd->bGenOneHCCA == TRUE)
pTxD->QSEL= FIFO_HCCA; pTxD->QSEL= FIFO_HCCA;
pTxD->DMADONE = 0; pTxD->DMADONE = 0;
...@@ -1388,11 +1314,7 @@ PQUEUE_HEADER RTMPCheckTxSwQueue( ...@@ -1388,11 +1314,7 @@ PQUEUE_HEADER RTMPCheckTxSwQueue(
IN PRTMP_ADAPTER pAd, IN PRTMP_ADAPTER pAd,
OUT PUCHAR pQueIdx) OUT PUCHAR pQueIdx)
{ {
ULONG Number; ULONG Number;
// 2004-11-15 to be removed. test aggregation only
// if ((OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_AGGREGATION_INUSED)) && (*pNumber < 2))
// return NULL;
Number = pAd->TxSwQueue[QID_AC_BK].Number Number = pAd->TxSwQueue[QID_AC_BK].Number
+ pAd->TxSwQueue[QID_AC_BE].Number + pAd->TxSwQueue[QID_AC_BE].Number
...@@ -1463,14 +1385,11 @@ VOID RTMPSuspendMsduTransmission( ...@@ -1463,14 +1385,11 @@ VOID RTMPSuspendMsduTransmission(
RTMP_BBP_IO_READ8_BY_REG_ID(pAd, BBP_R66, &pAd->BbpTuning.R66CurrentValue); RTMP_BBP_IO_READ8_BY_REG_ID(pAd, BBP_R66, &pAd->BbpTuning.R66CurrentValue);
// set BBP_R66 to 0x30/0x40 when scanning (AsicSwitchChannel will set R66 according to channel when scanning) // set BBP_R66 to 0x30/0x40 when scanning (AsicSwitchChannel will set R66 according to channel when scanning)
//RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R66, (0x26 + GET_LNA_GAIN(pAd)));
RTMPSetAGCInitValue(pAd, BW_20); RTMPSetAGCInitValue(pAd, BW_20);
RTMP_SET_FLAG(pAd, fRTMP_ADAPTER_BSS_SCAN_IN_PROGRESS); RTMP_SET_FLAG(pAd, fRTMP_ADAPTER_BSS_SCAN_IN_PROGRESS);
//RTMP_IO_WRITE32(pAd, TX_CNTL_CSR, 0x000f0000); // abort all TX rings
} }
/* /*
======================================================================== ========================================================================
...@@ -1492,19 +1411,12 @@ VOID RTMPSuspendMsduTransmission( ...@@ -1492,19 +1411,12 @@ VOID RTMPSuspendMsduTransmission(
VOID RTMPResumeMsduTransmission( VOID RTMPResumeMsduTransmission(
IN PRTMP_ADAPTER pAd) IN PRTMP_ADAPTER pAd)
{ {
// UCHAR IrqState;
DBGPRINT(RT_DEBUG_TRACE,("SCAN done, resume MSDU transmission ...\n")); DBGPRINT(RT_DEBUG_TRACE,("SCAN done, resume MSDU transmission ...\n"));
RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R66, pAd->BbpTuning.R66CurrentValue); RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R66, pAd->BbpTuning.R66CurrentValue);
RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_BSS_SCAN_IN_PROGRESS); RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_BSS_SCAN_IN_PROGRESS);
// sample, for IRQ LOCK to SEM LOCK
// IrqState = pAd->irq_disabled;
// if (IrqState)
// RTMPDeQueuePacket(pAd, TRUE, NUM_OF_TX_RING, MAX_TX_PROCESS);
// else
RTMPDeQueuePacket(pAd, FALSE, NUM_OF_TX_RING, MAX_TX_PROCESS); RTMPDeQueuePacket(pAd, FALSE, NUM_OF_TX_RING, MAX_TX_PROCESS);
} }
...@@ -1533,9 +1445,7 @@ UINT deaggregate_AMSDU_announce( ...@@ -1533,9 +1445,7 @@ UINT deaggregate_AMSDU_announce(
nMSDU++; nMSDU++;
//hex_dump("subheader", pData, 64);
pAMSDUsubheader = (PHEADER_802_3)pData; pAMSDUsubheader = (PHEADER_802_3)pData;
//pData += LENGTH_802_3;
PayloadSize = pAMSDUsubheader->Octet[1] + (pAMSDUsubheader->Octet[0]<<8); PayloadSize = pAMSDUsubheader->Octet[1] + (pAMSDUsubheader->Octet[0]<<8);
SubFrameSize = PayloadSize + LENGTH_802_3; SubFrameSize = PayloadSize + LENGTH_802_3;
...@@ -1545,8 +1455,6 @@ UINT deaggregate_AMSDU_announce( ...@@ -1545,8 +1455,6 @@ UINT deaggregate_AMSDU_announce(
break; break;
} }
//printk("%d subframe: Size = %d\n", nMSDU, PayloadSize);
pPayload = pData + LENGTH_802_3; pPayload = pData + LENGTH_802_3;
pDA = pData; pDA = pData;
pSA = pData + MAC_ADDR_LEN; pSA = pData + MAC_ADDR_LEN;
...@@ -1792,8 +1700,6 @@ BOOLEAN MacTableDeleteEntry( ...@@ -1792,8 +1700,6 @@ BOOLEAN MacTableDeleteEntry(
USHORT HashIdx; USHORT HashIdx;
MAC_TABLE_ENTRY *pEntry, *pPrevEntry, *pProbeEntry; MAC_TABLE_ENTRY *pEntry, *pPrevEntry, *pProbeEntry;
BOOLEAN Cancelled; BOOLEAN Cancelled;
//USHORT offset; // unused variable
//UCHAR j; // unused variable
if (wcid >= MAX_LEN_OF_MAC_TABLE) if (wcid >= MAX_LEN_OF_MAC_TABLE)
return FALSE; return FALSE;
...@@ -1801,7 +1707,6 @@ BOOLEAN MacTableDeleteEntry( ...@@ -1801,7 +1707,6 @@ BOOLEAN MacTableDeleteEntry(
NdisAcquireSpinLock(&pAd->MacTabLock); NdisAcquireSpinLock(&pAd->MacTabLock);
HashIdx = MAC_ADDR_HASH_INDEX(pAddr); HashIdx = MAC_ADDR_HASH_INDEX(pAddr);
//pEntry = pAd->MacTab.Hash[HashIdx];
pEntry = &pAd->MacTab.Content[wcid]; pEntry = &pAd->MacTab.Content[wcid];
if (pEntry && (pEntry->ValidAsCLI || pEntry->ValidAsApCli || pEntry->ValidAsWDS || pEntry->ValidAsMesh if (pEntry && (pEntry->ValidAsCLI || pEntry->ValidAsApCli || pEntry->ValidAsWDS || pEntry->ValidAsMesh
...@@ -2209,18 +2114,6 @@ VOID Indicate_Legacy_Packet( ...@@ -2209,18 +2114,6 @@ VOID Indicate_Legacy_Packet(
if (pRxBlk->DataSize > MAX_RX_PKT_LEN) if (pRxBlk->DataSize > MAX_RX_PKT_LEN)
{ {
#if 0 // sample take off, for multiple card design
static int err_size;
err_size++;
if (err_size > 20)
{
printk("Legacy DataSize = %d\n", pRxBlk->DataSize);
hex_dump("802.3 Header", Header802_3, LENGTH_802_3);
hex_dump("Payload", pRxBlk->pData, 64);
err_size = 0;
}
#endif
// release packet // release packet
RELEASE_NDIS_PACKET(pAd, pRxPacket, NDIS_STATUS_FAILURE); RELEASE_NDIS_PACKET(pAd, pRxPacket, NDIS_STATUS_FAILURE);
......
drivers/staging/rt2870/common/cmm_info.c
View file @ ac7e7d5a
This diff is collapsed.
drivers/staging/rt2870/common/cmm_sanity.c
View file @ ac7e7d5a
...@@ -81,14 +81,6 @@ BOOLEAN MlmeAddBAReqSanity( ...@@ -81,14 +81,6 @@ BOOLEAN MlmeAddBAReqSanity(
return FALSE; return FALSE;
} }
/*
if ((pInfo->BaBufSize > MAX_RX_REORDERBUF) || (pInfo->BaBufSize < 2))
{
DBGPRINT(RT_DEBUG_TRACE, ("MlmeAddBAReqSanity fail - Rx Reordering buffer too big or too small\n"));
return FALSE;
}
*/
if ((pInfo->pAddr[0]&0x01) == 0x01) if ((pInfo->pAddr[0]&0x01) == 0x01)
{ {
DBGPRINT(RT_DEBUG_TRACE, ("MlmeAddBAReqSanity fail - broadcast address not support BA\n")); DBGPRINT(RT_DEBUG_TRACE, ("MlmeAddBAReqSanity fail - broadcast address not support BA\n"));
...@@ -185,7 +177,6 @@ BOOLEAN PeerAddBARspActionSanity( ...@@ -185,7 +177,6 @@ BOOLEAN PeerAddBARspActionSanity(
IN VOID *pMsg, IN VOID *pMsg,
IN ULONG MsgLen) IN ULONG MsgLen)
{ {
//PFRAME_802_11 pFrame = (PFRAME_802_11)pMsg;
PFRAME_ADDBA_RSP pAddFrame; PFRAME_ADDBA_RSP pAddFrame;
pAddFrame = (PFRAME_ADDBA_RSP)(pMsg); pAddFrame = (PFRAME_ADDBA_RSP)(pMsg);
...@@ -341,8 +332,6 @@ BOOLEAN PeerBeaconAndProbeRspSanity( ...@@ -341,8 +332,6 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
COPY_MAC_ADDR(pAddr2, pFrame->Hdr.Addr2); COPY_MAC_ADDR(pAddr2, pFrame->Hdr.Addr2);
COPY_MAC_ADDR(pBssid, pFrame->Hdr.Addr3); COPY_MAC_ADDR(pBssid, pFrame->Hdr.Addr3);
// hex_dump("Beacon", Msg, MsgLen);
Ptr = pFrame->Octet; Ptr = pFrame->Octet;
Length += LENGTH_802_11; Length += LENGTH_802_11;
...@@ -556,26 +545,6 @@ BOOLEAN PeerBeaconAndProbeRspSanity( ...@@ -556,26 +545,6 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
// Wifi WMM use the same IE vale, need to parse that too // Wifi WMM use the same IE vale, need to parse that too
// case IE_WPA: // case IE_WPA:
case IE_VENDOR_SPECIFIC: case IE_VENDOR_SPECIFIC:
// Check Broadcom/Atheros 802.11n OUI version, for HT Capability IE.
// This HT IE is before IEEE draft set HT IE value.2006-09-28 by Jan.
/*if (NdisEqualMemory(pEid->Octet, BROADCOM_OUI, 3) && (pEid->Len >= 4))
{
if ((pEid->Octet[3] == OUI_BROADCOM_HT) && (pEid->Len >= 30))
{
{
NdisMoveMemory(pHtCapability, &pEid->Octet[4], sizeof(HT_CAPABILITY_IE));
*pHtCapabilityLen = SIZE_HT_CAP_IE; // Nnow we only support 26 bytes.
}
}
if ((pEid->Octet[3] == OUI_BROADCOM_HT) && (pEid->Len >= 26))
{
{
NdisMoveMemory(AddHtInfo, &pEid->Octet[4], sizeof(ADD_HT_INFO_IE));
*AddHtInfoLen = SIZE_ADD_HT_INFO_IE; // Nnow we only support 26 bytes.
}
}
}
*/
// Check the OUI version, filter out non-standard usage // Check the OUI version, filter out non-standard usage
if (NdisEqualMemory(pEid->Octet, RALINK_OUI, 3) && (pEid->Len == 7)) if (NdisEqualMemory(pEid->Octet, RALINK_OUI, 3) && (pEid->Len == 7))
{ {
......
drivers/staging/rt2870/common/cmm_wpa.c
View file @ ac7e7d5a
...@@ -1248,16 +1248,6 @@ VOID ConstructEapolMsg( ...@@ -1248,16 +1248,6 @@ VOID ConstructEapolMsg(
*(USHORT *)(&pMsg->KeyDesc.KeyInfo) = cpu2le16(*(USHORT *)(&pMsg->KeyDesc.KeyInfo)); *(USHORT *)(&pMsg->KeyDesc.KeyInfo) = cpu2le16(*(USHORT *)(&pMsg->KeyDesc.KeyInfo));
// Fill in Key Length // Fill in Key Length
#if 0
if (bWPA2)
{
// In WPA2 mode, the field indicates the length of pairwise key cipher,
// so only pairwise_msg_1 and pairwise_msg_3 need to fill.
if ((MsgType == EAPOL_PAIR_MSG_1) || (MsgType == EAPOL_PAIR_MSG_3))
pMsg->KeyDesc.KeyLength[1] = ((WepStatus == Ndis802_11Encryption2Enabled) ? LEN_TKIP_KEY : LEN_AES_KEY);
}
else if (!bWPA2)
#endif
{ {
if (MsgType >= EAPOL_GROUP_MSG_1) if (MsgType >= EAPOL_GROUP_MSG_1)
{ {
......
drivers/staging/rt2870/common/dfs.c
View file @ ac7e7d5a
...@@ -80,18 +80,6 @@ VOID BbpRadarDetectionStart( ...@@ -80,18 +80,6 @@ VOID BbpRadarDetectionStart(
RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, 124, 0x28); RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, 124, 0x28);
RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, 125, 0xff); RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, 125, 0xff);
#if 0
// toggle Rx enable bit for radar detection.
// it's Andy's recommand.
{
UINT32 Value;
RTMP_IO_READ32(pAd, MAC_SYS_CTRL, &Value);
Value |= (0x1 << 3);
RTMP_IO_WRITE32(pAd, MAC_SYS_CTRL, Value);
Value &= ~(0x1 << 3);
RTMP_IO_WRITE32(pAd, MAC_SYS_CTRL, Value);
}
#endif
RadarPeriod = ((UINT)RdIdleTimeTable[pAd->CommonCfg.RadarDetect.RDDurRegion][0] + (UINT)pAd->CommonCfg.RadarDetect.DfsSessionTime) < 250 ? RadarPeriod = ((UINT)RdIdleTimeTable[pAd->CommonCfg.RadarDetect.RDDurRegion][0] + (UINT)pAd->CommonCfg.RadarDetect.DfsSessionTime) < 250 ?
(RdIdleTimeTable[pAd->CommonCfg.RadarDetect.RDDurRegion][0] + pAd->CommonCfg.RadarDetect.DfsSessionTime) : 250; (RdIdleTimeTable[pAd->CommonCfg.RadarDetect.RDDurRegion][0] + pAd->CommonCfg.RadarDetect.DfsSessionTime) : 250;
......
drivers/staging/rt2870/common/eeprom.c
View file @ ac7e7d5a
...@@ -36,16 +36,6 @@ ...@@ -36,16 +36,6 @@
*/ */
#include "../rt_config.h" #include "../rt_config.h"
#if 0
#define EEPROM_SIZE 0x200
#define NVRAM_OFFSET 0x30000
#define RF_OFFSET 0x40000
static UCHAR init_flag = 0;
static PUCHAR nv_ee_start = 0;
static UCHAR EeBuffer[EEPROM_SIZE];
#endif
// IRQL = PASSIVE_LEVEL // IRQL = PASSIVE_LEVEL
VOID RaiseClock( VOID RaiseClock(
IN PRTMP_ADAPTER pAd, IN PRTMP_ADAPTER pAd,
......
drivers/staging/rt2870/common/mlme.c
View file @ ac7e7d5a
This diff is collapsed.
drivers/staging/rt2870/common/rtmp_init.c
View file @ ac7e7d5a
This diff is collapsed.
drivers/staging/rt2870/common/rtmp_tkip.c
View file @ ac7e7d5a
...@@ -464,7 +464,6 @@ VOID RTMPInitTkipEngine( ...@@ -464,7 +464,6 @@ VOID RTMPInitTkipEngine(
tkipIv.IV16.field.rc2 = *pTSC; tkipIv.IV16.field.rc2 = *pTSC;
tkipIv.IV16.field.CONTROL.field.ExtIV = 1; // 0: non-extended IV, 1: an extended IV tkipIv.IV16.field.CONTROL.field.ExtIV = 1; // 0: non-extended IV, 1: an extended IV
tkipIv.IV16.field.CONTROL.field.KeyID = KeyId; tkipIv.IV16.field.CONTROL.field.KeyID = KeyId;
// tkipIv.IV32 = *(PULONG)(pTSC + 2);
NdisMoveMemory(&tkipIv.IV32, (pTSC + 2), 4); // Copy IV NdisMoveMemory(&tkipIv.IV32, (pTSC + 2), 4); // Copy IV
*pIV16 = tkipIv.IV16.word; *pIV16 = tkipIv.IV16.word;
...@@ -1211,11 +1210,9 @@ BOOLEAN RTMPSoftDecryptTKIP( ...@@ -1211,11 +1210,9 @@ BOOLEAN RTMPSoftDecryptTKIP(
if (!NdisEqualMemory(MIC, TrailMIC, 8)) if (!NdisEqualMemory(MIC, TrailMIC, 8))
{ {
DBGPRINT(RT_DEBUG_ERROR, ("RTMPSoftDecryptTKIP, WEP Data MIC Error !\n")); //MIC error. DBGPRINT(RT_DEBUG_ERROR, ("RTMPSoftDecryptTKIP, WEP Data MIC Error !\n")); //MIC error.
//RTMPReportMicError(pAd, &pWpaKey[KeyID]); // marked by AlbertY @ 20060630
return (FALSE); return (FALSE);
} }
//DBGPRINT(RT_DEBUG_TRACE, "RTMPSoftDecryptTKIP Decript done!!\n");
return TRUE; return TRUE;
} }
......
drivers/staging/rt2870/common/rtmp_wep.c
View file @ ac7e7d5a
...@@ -105,15 +105,6 @@ UINT FCSTAB_32[256] = ...@@ -105,15 +105,6 @@ UINT FCSTAB_32[256] =
0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
}; };
/*
UCHAR WEPKEY[] = {
//IV
0x00, 0x11, 0x22,
//WEP KEY
0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xAA, 0xBB, 0xCC
};
*/
/* /*
======================================================================== ========================================================================
......
drivers/staging/rt2870/common/rtusb_bulk.c
View file @ ac7e7d5a
This diff is collapsed.
drivers/staging/rt2870/common/rtusb_data.c
View file @ ac7e7d5a
...@@ -135,24 +135,11 @@ BOOLEAN RTUSBNeedQueueBackForAgg( ...@@ -135,24 +135,11 @@ BOOLEAN RTUSBNeedQueueBackForAgg(
RTMP_IRQ_LOCK(&pAd->TxContextQueueLock[BulkOutPipeId], IrqFlags); RTMP_IRQ_LOCK(&pAd->TxContextQueueLock[BulkOutPipeId], IrqFlags);
if ((pHTTXContext->IRPPending == TRUE) /*&& (pAd->TxSwQueue[BulkOutPipeId].Number == 0) */) if ((pHTTXContext->IRPPending == TRUE) /*&& (pAd->TxSwQueue[BulkOutPipeId].Number == 0) */)
{ {
#if 0
if ((pHTTXContext->CurWritePosition <= 8) &&
(pHTTXContext->NextBulkOutPosition > 8 && (pHTTXContext->NextBulkOutPosition+MAX_AGGREGATION_SIZE) < MAX_TXBULK_LIMIT))
{
needQueBack = TRUE;
}
else if ((pHTTXContext->CurWritePosition < pHTTXContext->NextBulkOutPosition) &&
((pHTTXContext->NextBulkOutPosition + MAX_AGGREGATION_SIZE) < MAX_TXBULK_LIMIT))
{
needQueBack = TRUE;
}
#else
if ((pHTTXContext->CurWritePosition < pHTTXContext->ENextBulkOutPosition) && if ((pHTTXContext->CurWritePosition < pHTTXContext->ENextBulkOutPosition) &&
(((pHTTXContext->ENextBulkOutPosition+MAX_AGGREGATION_SIZE) < MAX_TXBULK_LIMIT) || (pHTTXContext->CurWritePosition > MAX_AGGREGATION_SIZE))) (((pHTTXContext->ENextBulkOutPosition+MAX_AGGREGATION_SIZE) < MAX_TXBULK_LIMIT) || (pHTTXContext->CurWritePosition > MAX_AGGREGATION_SIZE)))
{ {
needQueBack = TRUE; needQueBack = TRUE;
} }
#endif
else if ((pHTTXContext->CurWritePosition > pHTTXContext->ENextBulkOutPosition) && else if ((pHTTXContext->CurWritePosition > pHTTXContext->ENextBulkOutPosition) &&
((pHTTXContext->ENextBulkOutPosition + MAX_AGGREGATION_SIZE) < pHTTXContext->CurWritePosition)) ((pHTTXContext->ENextBulkOutPosition + MAX_AGGREGATION_SIZE) < pHTTXContext->CurWritePosition))
{ {
......
drivers/staging/rt2870/common/rtusb_io.c
View file @ ac7e7d5a
...@@ -1222,28 +1222,6 @@ NTSTATUS RTUSB_VendorRequest( ...@@ -1222,28 +1222,6 @@ NTSTATUS RTUSB_VendorRequest(
if ((TransferBuffer!= NULL) && (TransferBufferLength > 0)) if ((TransferBuffer!= NULL) && (TransferBufferLength > 0))
hex_dump("Failed TransferBuffer value", TransferBuffer, TransferBufferLength); hex_dump("Failed TransferBuffer value", TransferBuffer, TransferBufferLength);
} }
#if 0
// retry
if (ret < 0) {
int temp_i=0;
DBGPRINT(RT_DEBUG_ERROR, ("USBVendorRequest failed ret=%d, \n",ret));
ret = 0;
do
{
if( RequestType == DEVICE_VENDOR_REQUEST_OUT)
ret=usb_control_msg(pObj->pUsb_Dev, usb_sndctrlpipe( pObj->pUsb_Dev, 0 ), Request, RequestType, Value,Index, TransferBuffer, TransferBufferLength, CONTROL_TIMEOUT_JIFFIES);
else if(RequestType == DEVICE_VENDOR_REQUEST_IN)
ret=usb_control_msg(pObj->pUsb_Dev, usb_rcvctrlpipe( pObj->pUsb_Dev, 0 ), Request, RequestType, Value,Index, TransferBuffer, TransferBufferLength, CONTROL_TIMEOUT_JIFFIES);
temp_i++;
} while( (ret < 0) && (temp_i <= 1) );
if( ret >= 0)
return ret;
}
#endif
} }
return ret; return ret;
} }
...@@ -1621,15 +1599,6 @@ VOID CMDHandler( ...@@ -1621,15 +1599,6 @@ VOID CMDHandler(
} }
else else
{ // success { // success
#if 0
RTMP_IRQ_LOCK(&pAd->BulkInLock, IrqFlags);
pRxContext->IRPPending = TRUE;
//NdisInterlockedIncrement(&pAd->PendingRx);
pAd->PendingRx++;
RTMP_IRQ_UNLOCK(&pAd->BulkInLock, IrqFlags);
pAd->BulkInReq++;
#endif
//printk("BIDone, Pend=%d,BIIdx=%d,BIRIdx=%d!\n", pAd->PendingRx, pAd->NextRxBulkInIndex, pAd->NextRxBulkInReadIndex);
DBGPRINT_RAW(RT_DEBUG_TRACE, ("CMDTHREAD_RESET_BULK_IN: Submit Rx URB Done, status=%d!\n", pUrb->status)); DBGPRINT_RAW(RT_DEBUG_TRACE, ("CMDTHREAD_RESET_BULK_IN: Submit Rx URB Done, status=%d!\n", pUrb->status));
ASSERT((pRxContext->InUse == pRxContext->IRPPending)); ASSERT((pRxContext->InUse == pRxContext->IRPPending));
} }
......
drivers/staging/rt2870/mlme.h
View file @ ac7e7d5a
...@@ -39,8 +39,6 @@ ...@@ -39,8 +39,6 @@
#ifndef __MLME_H__ #ifndef __MLME_H__
#define __MLME_H__ #define __MLME_H__
//extern UCHAR BROADCAST_ADDR[];
// maximum supported capability information - // maximum supported capability information -
// ESS, IBSS, Privacy, Short Preamble, Spectrum mgmt, Short Slot // ESS, IBSS, Privacy, Short Preamble, Spectrum mgmt, Short Slot
#define SUPPORTED_CAPABILITY_INFO 0x0533 #define SUPPORTED_CAPABILITY_INFO 0x0533
...@@ -51,7 +49,6 @@ ...@@ -51,7 +49,6 @@
#define LEAD_TIME 5 #define LEAD_TIME 5
#define MLME_TASK_EXEC_MULTIPLE 10 /*5*/ // MLME_TASK_EXEC_MULTIPLE * MLME_TASK_EXEC_INTV = 1 sec #define MLME_TASK_EXEC_MULTIPLE 10 /*5*/ // MLME_TASK_EXEC_MULTIPLE * MLME_TASK_EXEC_INTV = 1 sec
#define REORDER_EXEC_INTV 100 // 0.1 sec #define REORDER_EXEC_INTV 100 // 0.1 sec
//#define TBTT_PRELOAD_TIME 384 // usec. LomgPreamble + 24-byte at 1Mbps
// The definition of Radar detection duration region // The definition of Radar detection duration region
#define CE 0 #define CE 0
...@@ -106,13 +103,6 @@ ...@@ -106,13 +103,6 @@
#define TX_WEIGHTING 30 #define TX_WEIGHTING 30
#define RX_WEIGHTING 20 #define RX_WEIGHTING 20
//#define PEER_KEY_NOT_USED 0
//#define PEER_KEY_64_BIT 64
//#define PEER_KEY_128_BIT 128
//#define PEER_KEY_64BIT_LEN 8
//#define PEER_KEY_128BIT_LEN 16
#define BSS_NOT_FOUND 0xFFFFFFFF #define BSS_NOT_FOUND 0xFFFFFFFF
#define MAX_LEN_OF_MLME_QUEUE 40 //10 #define MAX_LEN_OF_MLME_QUEUE 40 //10
...@@ -125,7 +115,6 @@ ...@@ -125,7 +115,6 @@
#define SCAN_CISCO_CHANNEL_LOAD 23 // Single channel passive scan for channel load collection #define SCAN_CISCO_CHANNEL_LOAD 23 // Single channel passive scan for channel load collection
#define FAST_SCAN_ACTIVE 24 // scan with probe request, and wait beacon and probe response #define FAST_SCAN_ACTIVE 24 // scan with probe request, and wait beacon and probe response
//#define BSS_TABLE_EMPTY(x) ((x).BssNr == 0)
#define MAC_ADDR_IS_GROUP(Addr) (((Addr[0]) & 0x01)) #define MAC_ADDR_IS_GROUP(Addr) (((Addr[0]) & 0x01))
#define MAC_ADDR_HASH(Addr) (Addr[0] ^ Addr[1] ^ Addr[2] ^ Addr[3] ^ Addr[4] ^ Addr[5]) #define MAC_ADDR_HASH(Addr) (Addr[0] ^ Addr[1] ^ Addr[2] ^ Addr[3] ^ Addr[4] ^ Addr[5])
#define MAC_ADDR_HASH_INDEX(Addr) (MAC_ADDR_HASH(Addr) % HASH_TABLE_SIZE) #define MAC_ADDR_HASH_INDEX(Addr) (MAC_ADDR_HASH(Addr) % HASH_TABLE_SIZE)
...@@ -157,8 +146,6 @@ ...@@ -157,8 +146,6 @@
#define CAP_GENERATE(ess,ibss,priv,s_pre,s_slot,spectrum) (((ess) ? 0x0001 : 0x0000) | ((ibss) ? 0x0002 : 0x0000) | ((priv) ? 0x0010 : 0x0000) | ((s_pre) ? 0x0020 : 0x0000) | ((s_slot) ? 0x0400 : 0x0000) | ((spectrum) ? 0x0100 : 0x0000)) #define CAP_GENERATE(ess,ibss,priv,s_pre,s_slot,spectrum) (((ess) ? 0x0001 : 0x0000) | ((ibss) ? 0x0002 : 0x0000) | ((priv) ? 0x0010 : 0x0000) | ((s_pre) ? 0x0020 : 0x0000) | ((s_slot) ? 0x0400 : 0x0000) | ((spectrum) ? 0x0100 : 0x0000))
//#define STA_QOS_CAPABILITY 0 // 1-byte. see 802.11e d9.0 for bit definition
#define ERP_IS_NON_ERP_PRESENT(x) (((x) & 0x01) != 0) // 802.11g #define ERP_IS_NON_ERP_PRESENT(x) (((x) & 0x01) != 0) // 802.11g
#define ERP_IS_USE_PROTECTION(x) (((x) & 0x02) != 0) // 802.11g #define ERP_IS_USE_PROTECTION(x) (((x) & 0x02) != 0) // 802.11g
#define ERP_IS_USE_BARKER_PREAMBLE(x) (((x) & 0x04) != 0) // 802.11g #define ERP_IS_USE_BARKER_PREAMBLE(x) (((x) & 0x04) != 0) // 802.11g
...@@ -401,12 +388,6 @@ typedef struct { ...@@ -401,12 +388,6 @@ typedef struct {
//This structure substracts ralink supports from all 802.11n-related features. //This structure substracts ralink supports from all 802.11n-related features.
//Features not listed here but contained in 802.11n spec are not supported in rt2860. //Features not listed here but contained in 802.11n spec are not supported in rt2860.
typedef struct { typedef struct {
#if 0 // move to
BOOLEAN bHtEnable; // If we should use ht rate.
BOOLEAN bPreNHt; // If we should use ht rate.
//Substract from HT Capability IE
UCHAR MCSSet[16]; //only supoort MCS=0-15,32 ,
#endif
USHORT ChannelWidth:1; USHORT ChannelWidth:1;
USHORT MimoPs:2;//mimo power safe MMPS_ USHORT MimoPs:2;//mimo power safe MMPS_
USHORT GF:1; //green field USHORT GF:1; //green field
...@@ -1099,11 +1080,6 @@ typedef struct PACKED _RTMP_TX_RATE_SWITCH ...@@ -1099,11 +1080,6 @@ typedef struct PACKED _RTMP_TX_RATE_SWITCH
#define TBTT_PRELOAD_TIME 384 // usec. LomgPreamble + 24-byte at 1Mbps #define TBTT_PRELOAD_TIME 384 // usec. LomgPreamble + 24-byte at 1Mbps
#define DEFAULT_DTIM_PERIOD 1 #define DEFAULT_DTIM_PERIOD 1
// weighting factor to calculate Channel quality, total should be 100%
//#define RSSI_WEIGHTING 0
//#define TX_WEIGHTING 40
//#define RX_WEIGHTING 60
#define MAC_TABLE_AGEOUT_TIME 300 // unit: sec #define MAC_TABLE_AGEOUT_TIME 300 // unit: sec
#define MAC_TABLE_ASSOC_TIMEOUT 5 // unit: sec #define MAC_TABLE_ASSOC_TIMEOUT 5 // unit: sec
#define MAC_TABLE_FULL(Tab) ((Tab).size == MAX_LEN_OF_MAC_TABLE) #define MAC_TABLE_FULL(Tab) ((Tab).size == MAX_LEN_OF_MAC_TABLE)
......
drivers/staging/rt2870/oid.h
View file @ ac7e7d5a
...@@ -585,19 +585,6 @@ typedef struct _NDIS_802_11_AUTHENTICATION_EVENT ...@@ -585,19 +585,6 @@ typedef struct _NDIS_802_11_AUTHENTICATION_EVENT
NDIS_802_11_AUTHENTICATION_REQUEST Request[1]; NDIS_802_11_AUTHENTICATION_REQUEST Request[1];
} NDIS_802_11_AUTHENTICATION_EVENT, *PNDIS_802_11_AUTHENTICATION_EVENT; } NDIS_802_11_AUTHENTICATION_EVENT, *PNDIS_802_11_AUTHENTICATION_EVENT;
/*
typedef struct _NDIS_802_11_TEST
{
ULONG Length;
ULONG Type;
union
{
NDIS_802_11_AUTHENTICATION_EVENT AuthenticationEvent;
NDIS_802_11_RSSI RssiTrigger;
};
} NDIS_802_11_TEST, *PNDIS_802_11_TEST;
*/
// 802.11 Media stream constraints, associated with OID_802_11_MEDIA_STREAM_MODE // 802.11 Media stream constraints, associated with OID_802_11_MEDIA_STREAM_MODE
typedef enum _NDIS_802_11_MEDIA_STREAM_MODE typedef enum _NDIS_802_11_MEDIA_STREAM_MODE
{ {
...@@ -691,7 +678,6 @@ typedef union _HTTRANSMIT_SETTING { ...@@ -691,7 +678,6 @@ typedef union _HTTRANSMIT_SETTING {
USHORT BW:1; //channel bandwidth 20MHz or 40 MHz USHORT BW:1; //channel bandwidth 20MHz or 40 MHz
USHORT ShortGI:1; USHORT ShortGI:1;
USHORT STBC:2; //SPACE USHORT STBC:2; //SPACE
// USHORT rsv:3;
USHORT rsv:2; USHORT rsv:2;
USHORT TxBF:1; USHORT TxBF:1;
USHORT MODE:2; // Use definition MODE_xxx. USHORT MODE:2; // Use definition MODE_xxx.
...@@ -779,15 +765,6 @@ typedef struct _RT_802_11_HARDWARE_REGISTER { ...@@ -779,15 +765,6 @@ typedef struct _RT_802_11_HARDWARE_REGISTER {
ULONG Data; // R/W data buffer ULONG Data; // R/W data buffer
} RT_802_11_HARDWARE_REGISTER, *PRT_802_11_HARDWARE_REGISTER; } RT_802_11_HARDWARE_REGISTER, *PRT_802_11_HARDWARE_REGISTER;
// structure to tune BBP R17 "RX AGC VGC init"
//typedef struct _RT_802_11_RX_AGC_VGC_TUNING {
// UCHAR FalseCcaLowerThreshold; // 0-255, def 10
// UCHAR FalseCcaUpperThreshold; // 0-255, def 100
// UCHAR VgcDelta; // R17 +-= VgcDelta whenever flase CCA over UpprThreshold
// // or lower than LowerThresholdupper threshold
// UCHAR VgcUpperBound; // max value of R17
//} RT_802_11_RX_AGC_VGC_TUNING, *PRT_802_11_RX_AGC_VGC_TUNING;
typedef struct _RT_802_11_AP_CONFIG { typedef struct _RT_802_11_AP_CONFIG {
ULONG EnableTxBurst; // 0-disable, 1-enable ULONG EnableTxBurst; // 0-disable, 1-enable
ULONG EnableTurboRate; // 0-disable, 1-enable 72/100mbps turbo rate ULONG EnableTurboRate; // 0-disable, 1-enable 72/100mbps turbo rate
......
drivers/staging/rt2870/rt2870.h
View file @ ac7e7d5a
...@@ -219,19 +219,8 @@ typedef struct _MGMT_STRUC { ...@@ -219,19 +219,8 @@ typedef struct _MGMT_STRUC {
/* ----------------- Frimware Related MACRO ----------------- */ /* ----------------- Frimware Related MACRO ----------------- */
#if 0
#define RT28XX_FIRMUD_INIT(pAd) \
{ UINT32 MacReg; \
RTUSBReadMACRegister(pAd, MAC_CSR0, &MacReg); }
#define RT28XX_FIRMUD_END(pAd) \
RTUSBWriteMACRegister(pAd, 0x7014, 0xffffffff); \
RTUSBWriteMACRegister(pAd, 0x701c, 0xffffffff); \
RTUSBFirmwareRun(pAd);
#else
#define RT28XX_WRITE_FIRMWARE(_pAd, _pFwImage, _FwLen) \ #define RT28XX_WRITE_FIRMWARE(_pAd, _pFwImage, _FwLen) \
RTUSBFirmwareWrite(_pAd, _pFwImage, _FwLen) RTUSBFirmwareWrite(_pAd, _pFwImage, _FwLen)
#endif
/* ----------------- TX Related MACRO ----------------- */ /* ----------------- TX Related MACRO ----------------- */
#define RT28XX_START_DEQUEUE(pAd, QueIdx, irqFlags) \ #define RT28XX_START_DEQUEUE(pAd, QueIdx, irqFlags) \
...@@ -316,13 +305,6 @@ extern UCHAR EpToQueue[6]; ...@@ -316,13 +305,6 @@ extern UCHAR EpToQueue[6];
/* ----------------- RX Related MACRO ----------------- */ /* ----------------- RX Related MACRO ----------------- */
//#define RT28XX_RX_ERROR_CHECK RTMPCheckRxWI //#define RT28XX_RX_ERROR_CHECK RTMPCheckRxWI
#if 0
#define RT28XX_RCV_INIT(pAd) \
pAd->TransferBufferLength = 0; \
pAd->ReadPosition = 0; \
pAd->pCurrRxContext = NULL;
#endif
#define RT28XX_RV_ALL_BUF_END(bBulkReceive) \ #define RT28XX_RV_ALL_BUF_END(bBulkReceive) \
/* We return STATUS_MORE_PROCESSING_REQUIRED so that the completion */ \ /* We return STATUS_MORE_PROCESSING_REQUIRED so that the completion */ \
/* routine (IofCompleteRequest) will stop working on the irp. */ \ /* routine (IofCompleteRequest) will stop working on the irp. */ \
...@@ -330,27 +312,6 @@ extern UCHAR EpToQueue[6]; ...@@ -330,27 +312,6 @@ extern UCHAR EpToQueue[6];
/* ----------------- ASIC Related MACRO ----------------- */ /* ----------------- ASIC Related MACRO ----------------- */
#if 0
#define RT28XX_DMA_WRITE_INIT(GloCfg) \
{ GloCfg.field.EnTXWriteBackDDONE = 1; \
GloCfg.field.EnableRxDMA = 1; \
GloCfg.field.EnableTxDMA = 1; }
#define RT28XX_DMA_POST_WRITE(_pAd) \
do{ USB_DMA_CFG_STRUC UsbCfg; \
UsbCfg.word = 0; \
/* for last packet, PBF might use more than limited, so minus 2 to prevent from error */ \
UsbCfg.field.RxBulkAggLmt = (MAX_RXBULK_SIZE /1024)-3; \
UsbCfg.field.phyclear = 0; \
/* usb version is 1.1,do not use bulk in aggregation */ \
if (_pAd->BulkInMaxPacketSize == 512) \
UsbCfg.field.RxBulkAggEn = 1; \
UsbCfg.field.RxBulkEn = 1; \
UsbCfg.field.TxBulkEn = 1; \
UsbCfg.field.RxBulkAggTOut = 0x80; /* 2006-10-18 */ \
RTUSBWriteMACRegister(_pAd, USB_DMA_CFG, UsbCfg.word); \
}while(0)
#endif
// reset MAC of a station entry to 0xFFFFFFFFFFFF // reset MAC of a station entry to 0xFFFFFFFFFFFF
#define RT28XX_STA_ENTRY_MAC_RESET(pAd, Wcid) \ #define RT28XX_STA_ENTRY_MAC_RESET(pAd, Wcid) \
......
drivers/staging/rt2870/rt28xx.h
View file @ ac7e7d5a
...@@ -963,21 +963,6 @@ typedef struct _HW_WCID_ENTRY { // 8-byte per entry ...@@ -963,21 +963,6 @@ typedef struct _HW_WCID_ENTRY { // 8-byte per entry
#define HW_DEBUG_SETTING_BASE 0x77f0 // 0x77f0~0x77ff total 16 bytes #define HW_DEBUG_SETTING_BASE 0x77f0 // 0x77f0~0x77ff total 16 bytes
#define HW_DEBUG_SETTING_BASE2 0x7770 // 0x77f0~0x77ff total 16 bytes #define HW_DEBUG_SETTING_BASE2 0x7770 // 0x77f0~0x77ff total 16 bytes
#if 0
// on-chip BEACON frame space - base address = 0x7800
#define HW_BEACON_MAX_SIZE 0x0800 /* unit: byte */
#define HW_BEACON_BASE0 0x7800
#define HW_BEACON_BASE1 0x7900
#define HW_BEACON_BASE2 0x7a00
#define HW_BEACON_BASE3 0x7b00
#define HW_BEACON_BASE4 0x7c00
#define HW_BEACON_BASE5 0x7d00
#define HW_BEACON_BASE6 0x7e00
#define HW_BEACON_BASE7 0x7f00
/* 1. HW_BEACON_OFFSET/64B must be 0;
2. BCN_OFFSET0 must also be changed in NICInitializeAsic();
3. max 0x0800 for 8 beacon frames; */
#else
// In order to support maximum 8 MBSS and its maximum length is 512 for each beacon // In order to support maximum 8 MBSS and its maximum length is 512 for each beacon
// Three section discontinue memory segments will be used. // Three section discontinue memory segments will be used.
// 1. The original region for BCN 0~3 // 1. The original region for BCN 0~3
...@@ -994,7 +979,6 @@ typedef struct _HW_WCID_ENTRY { // 8-byte per entry ...@@ -994,7 +979,6 @@ typedef struct _HW_WCID_ENTRY { // 8-byte per entry
#define HW_BEACON_BASE5 0x7400 #define HW_BEACON_BASE5 0x7400
#define HW_BEACON_BASE6 0x5DC0 #define HW_BEACON_BASE6 0x5DC0
#define HW_BEACON_BASE7 0x5BC0 #define HW_BEACON_BASE7 0x5BC0
#endif
#define HW_BEACON_MAX_COUNT 8 #define HW_BEACON_MAX_COUNT 8
#define HW_BEACON_OFFSET 0x0200 #define HW_BEACON_OFFSET 0x0200
...@@ -1029,11 +1013,6 @@ typedef struct _HW_WCID_ENTRY { // 8-byte per entry ...@@ -1029,11 +1013,6 @@ typedef struct _HW_WCID_ENTRY { // 8-byte per entry
#define MAX_FIRMWARE_IMAGE_SIZE 0x1000 // 4kbyte #define MAX_FIRMWARE_IMAGE_SIZE 0x1000 // 4kbyte
#endif // RT2870 // #endif // RT2870 //
// TODO: ????? old RT2560 registers. to keep them or remove them?
//#define MCAST0 0x0178 // multicast filter register 0
//#define MCAST1 0x017c // multicast filter register 1
// ================================================================ // ================================================================
// Tx / Rx / Mgmt ring descriptor definition // Tx / Rx / Mgmt ring descriptor definition
// ================================================================ // ================================================================
...@@ -1047,18 +1026,7 @@ typedef struct _HW_WCID_ENTRY { // 8-byte per entry ...@@ -1047,18 +1026,7 @@ typedef struct _HW_WCID_ENTRY { // 8-byte per entry
#define PID_DATA_AMPDU 0x04 #define PID_DATA_AMPDU 0x04
#define PID_DATA_NO_ACK 0x08 #define PID_DATA_NO_ACK 0x08
#define PID_DATA_NOT_NORM_ACK 0x03 #define PID_DATA_NOT_NORM_ACK 0x03
#if 0
#define PTYPE_DATA_REQUIRE_ACK 0x00 // b7-6:00, b5-0: 0~59 is MAC table index (AID?), 60~63 is WDS index
#define PTYPE_NULL_AT_HIGH_RATE 0x04 // b7-6:01, b5-0: 0~59 is MAC table index (AID?), 60~63 is WDS index
#define PTYPE_RESERVED 0x08 // b7-6:10
#define PTYPE_SPECIAL 0x0c // b7-6:11
// when b3-2=11 (PTYPE_SPECIAL), b1-0 coube be ...
#define PSUBTYPE_DATA_NO_ACK 0x00
#define PSUBTYPE_MGMT 0x01
#define PSUBTYPE_OTHER_CNTL 0x02
#define PSUBTYPE_RTS 0x03
#endif
// value domain of pTxD->HostQId (4-bit: 0~15) // value domain of pTxD->HostQId (4-bit: 0~15)
#define QID_AC_BK 1 // meet ACI definition in 802.11e #define QID_AC_BK 1 // meet ACI definition in 802.11e
#define QID_AC_BE 0 // meet ACI definition in 802.11e #define QID_AC_BE 0 // meet ACI definition in 802.11e
...@@ -1167,11 +1135,6 @@ typedef struct _HW_WCID_ENTRY { // 8-byte per entry ...@@ -1167,11 +1135,6 @@ typedef struct _HW_WCID_ENTRY { // 8-byte per entry
#define BBPR94_DEFAULT 0x06 // Add 1 value will gain 1db #define BBPR94_DEFAULT 0x06 // Add 1 value will gain 1db
//#define PHY_TR_SWITCH_TIME 5 // usec
//#define BBP_R17_LOW_SENSIBILITY 0x50
//#define BBP_R17_MID_SENSIBILITY 0x41
//#define BBP_R17_DYNAMIC_UP_BOUND 0x40
#define RSSI_FOR_VERY_LOW_SENSIBILITY -35 #define RSSI_FOR_VERY_LOW_SENSIBILITY -35
#define RSSI_FOR_LOW_SENSIBILITY -58 #define RSSI_FOR_LOW_SENSIBILITY -58
#define RSSI_FOR_MID_LOW_SENSIBILITY -80 #define RSSI_FOR_MID_LOW_SENSIBILITY -80
...@@ -1211,12 +1174,6 @@ typedef struct _HW_WCID_ENTRY { // 8-byte per entry ...@@ -1211,12 +1174,6 @@ typedef struct _HW_WCID_ENTRY { // 8-byte per entry
#define EEPROM_TXPOWER_BYRATE_40MHZ_5G 0x10a // 40MHZ 5G tx power. #define EEPROM_TXPOWER_BYRATE_40MHZ_5G 0x10a // 40MHZ 5G tx power.
#define EEPROM_A_TX_PWR_OFFSET 0x78 #define EEPROM_A_TX_PWR_OFFSET 0x78
#define EEPROM_A_TX2_PWR_OFFSET 0xa6 #define EEPROM_A_TX2_PWR_OFFSET 0xa6
//#define EEPROM_Japan_TX_PWR_OFFSET 0x90 // 802.11j
//#define EEPROM_Japan_TX2_PWR_OFFSET 0xbe
//#define EEPROM_TSSI_REF_OFFSET 0x54
//#define EEPROM_TSSI_DELTA_OFFSET 0x24
//#define EEPROM_CCK_TX_PWR_OFFSET 0x62
//#define EEPROM_CALIBRATE_OFFSET 0x7c
#define EEPROM_VERSION_OFFSET 0x02 #define EEPROM_VERSION_OFFSET 0x02
#define EEPROM_FREQ_OFFSET 0x3a #define EEPROM_FREQ_OFFSET 0x3a
#define EEPROM_TXPOWER_BYRATE 0xde // 20MHZ power. #define EEPROM_TXPOWER_BYRATE 0xde // 20MHZ power.
...@@ -1320,7 +1277,6 @@ typedef struct PACKED _TXWI_STRUC { ...@@ -1320,7 +1277,6 @@ typedef struct PACKED _TXWI_STRUC {
UINT32 ShortGI:1; UINT32 ShortGI:1;
UINT32 STBC:2; // 1: STBC support MCS =0-7, 2,3 : RESERVE UINT32 STBC:2; // 1: STBC support MCS =0-7, 2,3 : RESERVE
UINT32 Ifs:1; // UINT32 Ifs:1; //
// UINT32 rsv2:2; //channel bandwidth 20MHz or 40 MHz
UINT32 rsv2:1; UINT32 rsv2:1;
UINT32 TxBF:1; // 3*3 UINT32 TxBF:1; // 3*3
UINT32 PHYMODE:2; UINT32 PHYMODE:2;
......
drivers/staging/rt2870/rt_linux.c
View file @ ac7e7d5a
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
ULONG RTDebugLevel = RT_DEBUG_ERROR; ULONG RTDebugLevel = RT_DEBUG_ERROR;
BUILD_TIMER_FUNCTION(MlmePeriodicExec); BUILD_TIMER_FUNCTION(MlmePeriodicExec);
//BUILD_TIMER_FUNCTION(MlmeRssiReportExec);
BUILD_TIMER_FUNCTION(AsicRxAntEvalTimeout); BUILD_TIMER_FUNCTION(AsicRxAntEvalTimeout);
BUILD_TIMER_FUNCTION(APSDPeriodicExec); BUILD_TIMER_FUNCTION(APSDPeriodicExec);
BUILD_TIMER_FUNCTION(AsicRfTuningExec); BUILD_TIMER_FUNCTION(AsicRfTuningExec);
...@@ -515,17 +514,6 @@ PNDIS_PACKET DuplicatePacket( ...@@ -515,17 +514,6 @@ PNDIS_PACKET DuplicatePacket(
pRetPacket = OSPKT_TO_RTPKT(skb); pRetPacket = OSPKT_TO_RTPKT(skb);
} }
#if 0
if ((skb = __dev_alloc_skb(DataSize + 2+32, MEM_ALLOC_FLAG)) != NULL)
{
skb_reserve(skb, 2+32);
NdisMoveMemory(skb->tail, pData, DataSize);
skb_put(skb, DataSize);
skb->dev = get_netdev_from_bssid(pAd, FromWhichBSSID);
pRetPacket = OSPKT_TO_RTPKT(skb);
}
#endif
return pRetPacket; return pRetPacket;
} }
...@@ -580,31 +568,6 @@ PNDIS_PACKET duplicate_pkt_with_TKIP_MIC( ...@@ -580,31 +568,6 @@ PNDIS_PACKET duplicate_pkt_with_TKIP_MIC(
} }
return OSPKT_TO_RTPKT(skb); return OSPKT_TO_RTPKT(skb);
#if 0
if ((data = skb_put(skb, TKIP_TX_MIC_SIZE)) != NULL)
{ // If we can extend it, well, copy it first.
NdisMoveMemory(data, pAd->PrivateInfo.Tx.MIC, TKIP_TX_MIC_SIZE);
}
else
{
// Otherwise, copy the packet.
newskb = skb_copy_expand(skb, skb_headroom(skb), TKIP_TX_MIC_SIZE, GFP_ATOMIC);
dev_kfree_skb_any(skb);
if (newskb == NULL)
{
DBGPRINT(RT_DEBUG_ERROR, ("Extend Tx.MIC to packet failed!, dropping packet\n"));
return NULL;
}
skb = newskb;
NdisMoveMemory(skb->tail, pAd->PrivateInfo.Tx.MIC, TKIP_TX_MIC_SIZE);
skb_put(skb, TKIP_TX_MIC_SIZE);
}
return OSPKT_TO_RTPKT(skb);
#endif
} }
...@@ -700,9 +663,6 @@ void announce_802_3_packet( ...@@ -700,9 +663,6 @@ void announce_802_3_packet(
#else #else
pRxPkt->protocol = eth_type_trans(pRxPkt, pRxPkt->dev); pRxPkt->protocol = eth_type_trans(pRxPkt, pRxPkt->dev);
//#ifdef CONFIG_5VT_ENHANCE
// *(int*)(pRxPkt->cb) = BRIDGE_TAG;
//#endif
netif_rx(pRxPkt); netif_rx(pRxPkt);
#endif // IKANOS_VX_1X0 // #endif // IKANOS_VX_1X0 //
} }
......
drivers/staging/rt2870/rt_linux.h
View file @ ac7e7d5a
...@@ -200,9 +200,6 @@ typedef char NDIS_PACKET; ...@@ -200,9 +200,6 @@ typedef char NDIS_PACKET;
typedef PNDIS_PACKET * PPNDIS_PACKET; typedef PNDIS_PACKET * PPNDIS_PACKET;
typedef dma_addr_t NDIS_PHYSICAL_ADDRESS; typedef dma_addr_t NDIS_PHYSICAL_ADDRESS;
typedef dma_addr_t * PNDIS_PHYSICAL_ADDRESS; typedef dma_addr_t * PNDIS_PHYSICAL_ADDRESS;
//typedef struct timer_list RALINK_TIMER_STRUCT;
//typedef struct timer_list * PRALINK_TIMER_STRUCT;
//typedef struct os_lock NDIS_SPIN_LOCK;
typedef spinlock_t NDIS_SPIN_LOCK; typedef spinlock_t NDIS_SPIN_LOCK;
typedef struct timer_list NDIS_MINIPORT_TIMER; typedef struct timer_list NDIS_MINIPORT_TIMER;
typedef void * NDIS_HANDLE; typedef void * NDIS_HANDLE;
...@@ -300,8 +297,6 @@ typedef struct _RT2870_TIMER_ENTRY_ ...@@ -300,8 +297,6 @@ typedef struct _RT2870_TIMER_ENTRY_
typedef struct _RT2870_TIMER_QUEUE_ typedef struct _RT2870_TIMER_QUEUE_
{ {
unsigned int status; unsigned int status;
//wait_queue_head_t timerWaitQ;
//atomic_t count;
UCHAR *pTimerQPoll; UCHAR *pTimerQPoll;
RT2870_TIMER_ENTRY *pQPollFreeList; RT2870_TIMER_ENTRY *pQPollFreeList;
RT2870_TIMER_ENTRY *pQHead; RT2870_TIMER_ENTRY *pQHead;
...@@ -373,20 +368,6 @@ extern ULONG RTDebugLevel; ...@@ -373,20 +368,6 @@ extern ULONG RTDebugLevel;
spin_unlock_bh((spinlock_t *)(__lock)); \ spin_unlock_bh((spinlock_t *)(__lock)); \
} }
#if 0 // sample, IRQ LOCK
#define RTMP_IRQ_LOCK(__lock, __irqflags) \
{ \
spin_lock_irqsave((spinlock_t *)__lock, __irqflags); \
pAd->irq_disabled |= 1; \
}
#define RTMP_IRQ_UNLOCK(__lock, __irqflag) \
{ \
pAd->irq_disabled &= 0; \
spin_unlock_irqrestore((spinlock_t *)(__lock), ((unsigned long)__irqflag)); \
}
#else
// sample, use semaphore lock to replace IRQ lock, 2007/11/15 // sample, use semaphore lock to replace IRQ lock, 2007/11/15
#define RTMP_IRQ_LOCK(__lock, __irqflags) \ #define RTMP_IRQ_LOCK(__lock, __irqflags) \
{ \ { \
...@@ -410,7 +391,6 @@ extern ULONG RTDebugLevel; ...@@ -410,7 +391,6 @@ extern ULONG RTDebugLevel;
{ \ { \
spin_unlock_irqrestore((spinlock_t *)(__lock), ((unsigned long)__irqflag)); \ spin_unlock_irqrestore((spinlock_t *)(__lock), ((unsigned long)__irqflag)); \
} }
#endif
...@@ -598,7 +578,6 @@ void RTMP_GetCurrentSystemTime(LARGE_INTEGER *time); ...@@ -598,7 +578,6 @@ void RTMP_GetCurrentSystemTime(LARGE_INTEGER *time);
// check DDK NDIS_PACKET data structure and find out only MiniportReservedEx[0..7] can be used by our driver without // check DDK NDIS_PACKET data structure and find out only MiniportReservedEx[0..7] can be used by our driver without
// ambiguity. Fields after pPacket->MiniportReservedEx[8] may be used by other wrapper layer thus crashes the driver // ambiguity. Fields after pPacket->MiniportReservedEx[8] may be used by other wrapper layer thus crashes the driver
// //
//#define RTMP_GET_PACKET_MR(_p) (RTPKT_TO_OSPKT(_p))
// User Priority // User Priority
#define RTMP_SET_PACKET_UP(_p, _prio) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+0] = _prio) #define RTMP_SET_PACKET_UP(_p, _prio) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+0] = _prio)
...@@ -640,16 +619,7 @@ void RTMP_GetCurrentSystemTime(LARGE_INTEGER *time); ...@@ -640,16 +619,7 @@ void RTMP_GetCurrentSystemTime(LARGE_INTEGER *time);
#define RTMP_SET_PACKET_MOREDATA(_p, _morebit) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+7] = _morebit) #define RTMP_SET_PACKET_MOREDATA(_p, _morebit) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+7] = _morebit)
#define RTMP_GET_PACKET_MOREDATA(_p) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+7]) #define RTMP_GET_PACKET_MOREDATA(_p) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+7])
//#define RTMP_SET_PACKET_NET_DEVICE_MBSSID(_p, _bss) (RTPKT_TO_OSPKT(_p)->cb[8] = _bss)
//#define RTMP_GET_PACKET_NET_DEVICE_MBSSID(_p) (RTPKT_TO_OSPKT(_p)->cb[8])
#if 0
//#define RTMP_SET_PACKET_DHCP(_p, _flg) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+11] = _flg)
//#define RTMP_GET_PACKET_DHCP(_p) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+11])
#else
// //
// Sepcific Pakcet Type definition // Sepcific Pakcet Type definition
// //
...@@ -729,8 +699,6 @@ void RTMP_GetCurrentSystemTime(LARGE_INTEGER *time); ...@@ -729,8 +699,6 @@ void RTMP_GetCurrentSystemTime(LARGE_INTEGER *time);
#define RTMP_GET_PACKET_IPV4(_p) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+11] & RTMP_PACKET_SPECIFIC_IPV4) #define RTMP_GET_PACKET_IPV4(_p) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+11] & RTMP_PACKET_SPECIFIC_IPV4)
#endif
// If this flag is set, it indicates that this EAPoL frame MUST be clear. // If this flag is set, it indicates that this EAPoL frame MUST be clear.
#define RTMP_SET_PACKET_CLEAR_EAP_FRAME(_p, _flg) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+12] = _flg) #define RTMP_SET_PACKET_CLEAR_EAP_FRAME(_p, _flg) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+12] = _flg)
......
drivers/staging/rt2870/rt_main_dev.c
View file @ ac7e7d5a
...@@ -68,7 +68,6 @@ static int rt28xx_init(IN struct net_device *net_dev); ...@@ -68,7 +68,6 @@ static int rt28xx_init(IN struct net_device *net_dev);
INT rt28xx_send_packets(IN struct sk_buff *skb_p, IN struct net_device *net_dev); INT rt28xx_send_packets(IN struct sk_buff *skb_p, IN struct net_device *net_dev);
static void CfgInitHook(PRTMP_ADAPTER pAd); static void CfgInitHook(PRTMP_ADAPTER pAd);
//static BOOLEAN RT28XXAvailRANameAssign(IN CHAR *name_p);
extern const struct iw_handler_def rt28xx_iw_handler_def; extern const struct iw_handler_def rt28xx_iw_handler_def;
...@@ -288,9 +287,6 @@ int rt28xx_close(IN PNET_DEV dev) ...@@ -288,9 +287,6 @@ int rt28xx_close(IN PNET_DEV dev)
remove_wait_queue (&unlink_wakeup, &wait); remove_wait_queue (&unlink_wakeup, &wait);
#endif // RT2870 // #endif // RT2870 //
//RTUSBCleanUpMLMEWaitQueue(pAd); /*not used in RT28xx*/
#ifdef RT2870 #ifdef RT2870
// We need clear timerQ related structure before exits of the timer thread. // We need clear timerQ related structure before exits of the timer thread.
RT2870_TimerQ_Exit(pAd); RT2870_TimerQ_Exit(pAd);
...@@ -400,9 +396,6 @@ static int rt28xx_init(IN struct net_device *net_dev) ...@@ -400,9 +396,6 @@ static int rt28xx_init(IN struct net_device *net_dev)
if (Status != NDIS_STATUS_SUCCESS) if (Status != NDIS_STATUS_SUCCESS)
goto err1; goto err1;
// COPY_MAC_ADDR(pAd->ApCfg.MBSSID[apidx].Bssid, netif->hwaddr);
// pAd->bForcePrintTX = TRUE;
CfgInitHook(pAd); CfgInitHook(pAd);
NdisAllocateSpinLock(&pAd->MacTabLock); NdisAllocateSpinLock(&pAd->MacTabLock);
...@@ -442,7 +435,6 @@ static int rt28xx_init(IN struct net_device *net_dev) ...@@ -442,7 +435,6 @@ static int rt28xx_init(IN struct net_device *net_dev)
//Init Ba Capability parameters. //Init Ba Capability parameters.
// RT28XX_BA_INIT(pAd);
pAd->CommonCfg.DesiredHtPhy.MpduDensity = (UCHAR)pAd->CommonCfg.BACapability.field.MpduDensity; pAd->CommonCfg.DesiredHtPhy.MpduDensity = (UCHAR)pAd->CommonCfg.BACapability.field.MpduDensity;
pAd->CommonCfg.DesiredHtPhy.AmsduEnable = (USHORT)pAd->CommonCfg.BACapability.field.AmsduEnable; pAd->CommonCfg.DesiredHtPhy.AmsduEnable = (USHORT)pAd->CommonCfg.BACapability.field.AmsduEnable;
pAd->CommonCfg.DesiredHtPhy.AmsduSize = (USHORT)pAd->CommonCfg.BACapability.field.AmsduSize; pAd->CommonCfg.DesiredHtPhy.AmsduSize = (USHORT)pAd->CommonCfg.BACapability.field.AmsduSize;
...@@ -452,13 +444,6 @@ static int rt28xx_init(IN struct net_device *net_dev) ...@@ -452,13 +444,6 @@ static int rt28xx_init(IN struct net_device *net_dev)
pAd->CommonCfg.HtCapability.HtCapInfo.AMsduSize = (USHORT)pAd->CommonCfg.BACapability.field.AmsduSize; pAd->CommonCfg.HtCapability.HtCapInfo.AMsduSize = (USHORT)pAd->CommonCfg.BACapability.field.AmsduSize;
pAd->CommonCfg.HtCapability.HtCapParm.MpduDensity = (UCHAR)pAd->CommonCfg.BACapability.field.MpduDensity; pAd->CommonCfg.HtCapability.HtCapParm.MpduDensity = (UCHAR)pAd->CommonCfg.BACapability.field.MpduDensity;
// after reading Registry, we now know if in AP mode or STA mode
// Load 8051 firmware; crash when FW image not existent
// Status = NICLoadFirmware(pAd);
// if (Status != NDIS_STATUS_SUCCESS)
// break;
printk("2. Phy Mode = %d\n", pAd->CommonCfg.PhyMode); printk("2. Phy Mode = %d\n", pAd->CommonCfg.PhyMode);
// We should read EEPROM for all cases. rt2860b // We should read EEPROM for all cases. rt2860b
...@@ -490,15 +475,6 @@ static int rt28xx_init(IN struct net_device *net_dev) ...@@ -490,15 +475,6 @@ static int rt28xx_init(IN struct net_device *net_dev)
NICInitRT30xxRFRegisters(pAd); NICInitRT30xxRFRegisters(pAd);
#endif // RT2870 // #endif // RT2870 //
#if 0
// Patch cardbus controller if EEPROM said so.
if (pAd->bTest1 == FALSE)
RTMPPatchCardBus(pAd);
#endif
// APInitialize(pAd);
#ifdef IKANOS_VX_1X0 #ifdef IKANOS_VX_1X0
VR_IKANOS_FP_Init(pAd->ApCfg.BssidNum, pAd->PermanentAddress); VR_IKANOS_FP_Init(pAd->ApCfg.BssidNum, pAd->PermanentAddress);
#endif // IKANOS_VX_1X0 // #endif // IKANOS_VX_1X0 //
...@@ -519,16 +495,13 @@ static int rt28xx_init(IN struct net_device *net_dev) ...@@ -519,16 +495,13 @@ static int rt28xx_init(IN struct net_device *net_dev)
// //
if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_INTERRUPT_IN_USE)) if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_INTERRUPT_IN_USE))
{ {
// NdisMDeregisterInterrupt(&pAd->Interrupt);
RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_INTERRUPT_IN_USE); RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_INTERRUPT_IN_USE);
} }
// RTMPFreeAdapter(pAd); // we will free it in disconnect()
} }
else if (pAd) else if (pAd)
{ {
// Microsoft HCT require driver send a disconnect event after driver initialization. // Microsoft HCT require driver send a disconnect event after driver initialization.
OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_MEDIA_STATE_CONNECTED); OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_MEDIA_STATE_CONNECTED);
// pAd->IndicateMediaState = NdisMediaStateDisconnected;
RTMP_SET_FLAG(pAd, fRTMP_ADAPTER_MEDIA_STATE_CHANGE); RTMP_SET_FLAG(pAd, fRTMP_ADAPTER_MEDIA_STATE_CHANGE);
DBGPRINT(RT_DEBUG_TRACE, ("NDIS_STATUS_MEDIA_DISCONNECT Event B!\n")); DBGPRINT(RT_DEBUG_TRACE, ("NDIS_STATUS_MEDIA_DISCONNECT Event B!\n"));
...@@ -561,7 +534,6 @@ static int rt28xx_init(IN struct net_device *net_dev) ...@@ -561,7 +534,6 @@ static int rt28xx_init(IN struct net_device *net_dev)
MlmeHalt(pAd); MlmeHalt(pAd);
err2: err2:
RTMPFreeTxRxRingMemory(pAd); RTMPFreeTxRxRingMemory(pAd);
// RTMPFreeAdapter(pAd);
err1: err1:
os_free_mem(pAd, pAd->mpdu_blk_pool.mem); // free BA pool os_free_mem(pAd, pAd->mpdu_blk_pool.mem); // free BA pool
RT28XX_IRQ_RELEASE(net_dev); RT28XX_IRQ_RELEASE(net_dev);
...@@ -647,34 +619,6 @@ int rt28xx_open(IN PNET_DEV dev) ...@@ -647,34 +619,6 @@ int rt28xx_open(IN PNET_DEV dev)
printk("0x1300 = %08x\n", reg); printk("0x1300 = %08x\n", reg);
} }
{
// u32 reg;
// u8 byte;
// u16 tmp;
// RTMP_IO_READ32(pAd, XIFS_TIME_CFG, &reg);
// tmp = 0x0805;
// reg = (reg & 0xffff0000) | tmp;
// RTMP_IO_WRITE32(pAd, XIFS_TIME_CFG, reg);
}
#if 0
/*
* debugging helper
* show the size of main table in Adapter structure
* MacTab -- 185K
* BATable -- 137K
* Total -- 385K !!!!! (5/26/2006)
*/
printk("sizeof(pAd->MacTab) = %ld\n", sizeof(pAd->MacTab));
printk("sizeof(pAd->AccessControlList) = %ld\n", sizeof(pAd->AccessControlList));
printk("sizeof(pAd->ApCfg) = %ld\n", sizeof(pAd->ApCfg));
printk("sizeof(pAd->BATable) = %ld\n", sizeof(pAd->BATable));
BUG();
#endif
return (retval); return (retval);
err: err:
...@@ -704,10 +648,6 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p ...@@ -704,10 +648,6 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p
CHAR slot_name[IFNAMSIZ]; CHAR slot_name[IFNAMSIZ];
struct net_device *device; struct net_device *device;
//ether_setup(dev);
// dev->set_multicast_list = ieee80211_set_multicast_list;
// dev->change_mtu = ieee80211_change_mtu;
#if WIRELESS_EXT >= 12 #if WIRELESS_EXT >= 12
if (pAd->OpMode == OPMODE_STA) if (pAd->OpMode == OPMODE_STA)
{ {
...@@ -718,8 +658,6 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p ...@@ -718,8 +658,6 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p
#if WIRELESS_EXT < 21 #if WIRELESS_EXT < 21
dev->get_wireless_stats = rt28xx_get_wireless_stats; dev->get_wireless_stats = rt28xx_get_wireless_stats;
#endif #endif
// dev->uninit = ieee80211_if_reinit;
// dev->destructor = ieee80211_if_free;
dev->priv_flags = INT_MAIN; dev->priv_flags = INT_MAIN;
dev->netdev_ops = &rt2870_netdev_ops; dev->netdev_ops = &rt2870_netdev_ops;
// find available device name // find available device name
...@@ -786,10 +724,6 @@ INT __devinit rt28xx_probe( ...@@ -786,10 +724,6 @@ INT __devinit rt28xx_probe(
DBGPRINT(RT_DEBUG_TRACE, ("STA Driver version-%s\n", STA_DRIVER_VERSION)); DBGPRINT(RT_DEBUG_TRACE, ("STA Driver version-%s\n", STA_DRIVER_VERSION));
// Check chipset vendor/product ID
// if (RT28XXChipsetCheck(_dev_p) == FALSE)
// goto err_out;
net_dev = alloc_etherdev(sizeof(PRTMP_ADAPTER)); net_dev = alloc_etherdev(sizeof(PRTMP_ADAPTER));
if (net_dev == NULL) if (net_dev == NULL)
{ {
...@@ -798,10 +732,6 @@ INT __devinit rt28xx_probe( ...@@ -798,10 +732,6 @@ INT __devinit rt28xx_probe(
goto err_out; goto err_out;
} }
// sample
// if (rt_ieee80211_if_setup(net_dev) != NDIS_STATUS_SUCCESS)
// goto err_out;
netif_stop_queue(net_dev); netif_stop_queue(net_dev);
/* for supporting Network Manager */ /* for supporting Network Manager */
...@@ -825,9 +755,6 @@ INT __devinit rt28xx_probe( ...@@ -825,9 +755,6 @@ INT __devinit rt28xx_probe(
pAd->StaCfg.OriDevType = net_dev->type; pAd->StaCfg.OriDevType = net_dev->type;
// Find and assign a free interface name, raxx
// RT28XXAvailRANameAssign(net_dev->name);
// Post config // Post config
if (RT28XXProbePostConfig(_dev_p, pAd, 0) == FALSE) if (RT28XXProbePostConfig(_dev_p, pAd, 0) == FALSE)
goto err_out_unmap; goto err_out_unmap;
...@@ -909,16 +836,7 @@ int rt28xx_packet_xmit(struct sk_buff *skb) ...@@ -909,16 +836,7 @@ int rt28xx_packet_xmit(struct sk_buff *skb)
goto done; goto done;
} }
#if 0
// if ((pkt->data[0] & 0x1) == 0)
{
//hex_dump(__func__, pkt->data, pkt->len);
printk("pPacket = %x\n", pPacket);
}
#endif
RTMP_SET_PACKET_5VT(pPacket, 0); RTMP_SET_PACKET_5VT(pPacket, 0);
// MiniportMMRequest(pAd, pkt->data, pkt->len);
#ifdef CONFIG_5VT_ENHANCE #ifdef CONFIG_5VT_ENHANCE
if (*(int*)(skb->cb) == BRIDGE_TAG) { if (*(int*)(skb->cb) == BRIDGE_TAG) {
RTMP_SET_PACKET_5VT(pPacket, 1); RTMP_SET_PACKET_5VT(pPacket, 1);
...@@ -976,56 +894,6 @@ void CfgInitHook(PRTMP_ADAPTER pAd) ...@@ -976,56 +894,6 @@ void CfgInitHook(PRTMP_ADAPTER pAd)
pAd->bBroadComHT = TRUE; pAd->bBroadComHT = TRUE;
} /* End of CfgInitHook */ } /* End of CfgInitHook */
#if 0 // Not used now, should keep it in our source tree??
/*
========================================================================
Routine Description:
Find and assign a free interface name (raxx).
Arguments:
*name_p the interface name pointer
Return Value:
TRUE OK
FALSE FAIL
Note:
========================================================================
*/
static BOOLEAN RT28XXAvailRANameAssign(
IN CHAR *name_p)
{
CHAR slot_name[IFNAMSIZ];
struct net_device *device;
UINT32 if_id;
for(if_id=0; if_id<8; if_id++)
{
sprintf(slot_name, "ra%d", if_id);
for(device=dev_base; device!=NULL; device=device->next)
{
if (strncmp(device->name, slot_name, 4) == 0)
break;
}
if (device == NULL)
break;
}
if (if_id == 8)
{
DBGPRINT(RT_DEBUG_ERROR, ("No available slot name\n"));
return FALSE;
}
sprintf(name_p, "ra%d", if_id);
return TRUE;
} /* End of RT28XXAvailRANameAssign */
#endif
#if WIRELESS_EXT >= 12 #if WIRELESS_EXT >= 12
// This function will be called when query /proc // This function will be called when query /proc
struct iw_statistics *rt28xx_get_wireless_stats( struct iw_statistics *rt28xx_get_wireless_stats(
......
drivers/staging/rt2870/rt_profile.c
View file @ ac7e7d5a
...@@ -1121,14 +1121,10 @@ NDIS_STATUS RTMPReadParametersHook( ...@@ -1121,14 +1121,10 @@ NDIS_STATUS RTMPReadParametersHook(
//TxBurst //TxBurst
if(RTMPGetKeyParameter("TxBurst", tmpbuf, 10, buffer)) if(RTMPGetKeyParameter("TxBurst", tmpbuf, 10, buffer))
{ {
//#ifdef WIFI_TEST
// pAd->CommonCfg.bEnableTxBurst = FALSE;
//#else
if(simple_strtol(tmpbuf, 0, 10) != 0) //Enable if(simple_strtol(tmpbuf, 0, 10) != 0) //Enable
pAd->CommonCfg.bEnableTxBurst = TRUE; pAd->CommonCfg.bEnableTxBurst = TRUE;
else //Disable else //Disable
pAd->CommonCfg.bEnableTxBurst = FALSE; pAd->CommonCfg.bEnableTxBurst = FALSE;
//#endif
DBGPRINT(RT_DEBUG_TRACE, ("TxBurst=%d\n", pAd->CommonCfg.bEnableTxBurst)); DBGPRINT(RT_DEBUG_TRACE, ("TxBurst=%d\n", pAd->CommonCfg.bEnableTxBurst));
} }
...@@ -1296,7 +1292,6 @@ NDIS_STATUS RTMPReadParametersHook( ...@@ -1296,7 +1292,6 @@ NDIS_STATUS RTMPReadParametersHook(
pAd->StaCfg.OrigWepStatus = pAd->StaCfg.WepStatus; pAd->StaCfg.OrigWepStatus = pAd->StaCfg.WepStatus;
pAd->StaCfg.bMixCipher = FALSE; pAd->StaCfg.bMixCipher = FALSE;
//RTMPMakeRSNIE(pAd, pAd->StaCfg.AuthMode, pAd->StaCfg.WepStatus, 0);
DBGPRINT(RT_DEBUG_TRACE, ("%s::(EncrypType=%d)\n", __func__, pAd->StaCfg.WepStatus)); DBGPRINT(RT_DEBUG_TRACE, ("%s::(EncrypType=%d)\n", __func__, pAd->StaCfg.WepStatus));
} }
} }
...@@ -1342,21 +1337,6 @@ NDIS_STATUS RTMPReadParametersHook( ...@@ -1342,21 +1337,6 @@ NDIS_STATUS RTMPReadParametersHook(
} }
else if (pAd->StaCfg.AuthMode == Ndis802_11AuthModeWPANone) else if (pAd->StaCfg.AuthMode == Ndis802_11AuthModeWPANone)
{ {
/*
NdisZeroMemory(&pAd->SharedKey[BSS0][0], sizeof(CIPHER_KEY));
pAd->SharedKey[BSS0][0].KeyLen = LEN_TKIP_EK;
NdisMoveMemory(pAd->SharedKey[BSS0][0].Key, pAd->StaCfg.PMK, LEN_TKIP_EK);
NdisMoveMemory(pAd->SharedKey[BSS0][0].RxMic, &pAd->StaCfg.PMK[16], LEN_TKIP_RXMICK);
NdisMoveMemory(pAd->SharedKey[BSS0][0].TxMic, &pAd->StaCfg.PMK[16], LEN_TKIP_TXMICK);
// Decide its ChiperAlg
if (pAd->StaCfg.PairCipher == Ndis802_11Encryption2Enabled)
pAd->SharedKey[BSS0][0].CipherAlg = CIPHER_TKIP;
else if (pAd->StaCfg.PairCipher == Ndis802_11Encryption3Enabled)
pAd->SharedKey[BSS0][0].CipherAlg = CIPHER_AES;
else
pAd->SharedKey[BSS0][0].CipherAlg = CIPHER_NONE;
*/
pAd->StaCfg.WpaState = SS_NOTUSE; pAd->StaCfg.WpaState = SS_NOTUSE;
} }
...@@ -1368,23 +1348,6 @@ NDIS_STATUS RTMPReadParametersHook( ...@@ -1368,23 +1348,6 @@ NDIS_STATUS RTMPReadParametersHook(
//DefaultKeyID, KeyType, KeyStr //DefaultKeyID, KeyType, KeyStr
rtmp_read_key_parms_from_file(pAd, tmpbuf, buffer); rtmp_read_key_parms_from_file(pAd, tmpbuf, buffer);
//HSCounter
/*if(RTMPGetKeyParameter("HSCounter", tmpbuf, 10, buffer))
{
switch (simple_strtol(tmpbuf, 0, 10))
{
case 1: //Enable
pAd->CommonCfg.bEnableHSCounter = TRUE;
break;
case 0: //Disable
default:
pAd->CommonCfg.bEnableHSCounter = FALSE;
break;
}
DBGPRINT(RT_DEBUG_TRACE, "HSCounter=%d\n", pAd->CommonCfg.bEnableHSCounter);
}*/
HTParametersHook(pAd, tmpbuf, buffer); HTParametersHook(pAd, tmpbuf, buffer);
{ {
...@@ -1489,10 +1452,6 @@ NDIS_STATUS RTMPReadParametersHook( ...@@ -1489,10 +1452,6 @@ NDIS_STATUS RTMPReadParametersHook(
} }
set_fs(orgfs); set_fs(orgfs);
#if 0
current->fsuid = orgfsuid;
current->fsgid = orgfsgid;
#endif
kfree(buffer); kfree(buffer);
kfree(tmpbuf); kfree(tmpbuf);
...@@ -1816,7 +1775,6 @@ static void HTParametersHook( ...@@ -1816,7 +1775,6 @@ static void HTParametersHook(
{ {
Value = simple_strtol(pValueStr, 0, 10); Value = simple_strtol(pValueStr, 0, 10);
// if ((Value >= 0 && Value <= 15) || (Value == 32))
if ((Value >= 0 && Value <= 23) || (Value == 32)) // 3*3 if ((Value >= 0 && Value <= 23) || (Value == 32)) // 3*3
{ {
pAd->StaCfg.DesiredTransmitSetting.field.MCS = Value; pAd->StaCfg.DesiredTransmitSetting.field.MCS = Value;
......
drivers/staging/rt2870/rtmp.h
View file @ ac7e7d5a
This diff is collapsed.
drivers/staging/rt2870/rtmp_def.h
View file @ ac7e7d5a
...@@ -54,8 +54,6 @@ ...@@ -54,8 +54,6 @@
#define NIC_TAG ((ULONG)'0682') #define NIC_TAG ((ULONG)'0682')
#define NIC_DBG_STRING ("**RT28xx**") #define NIC_DBG_STRING ("**RT28xx**")
//#define PACKED
#define RALINK_2883_VERSION ((UINT32)0x28830300) #define RALINK_2883_VERSION ((UINT32)0x28830300)
#define RALINK_2880E_VERSION ((UINT32)0x28720200) #define RALINK_2880E_VERSION ((UINT32)0x28720200)
#define RALINK_3070_VERSION ((UINT32)0x30700200) #define RALINK_3070_VERSION ((UINT32)0x30700200)
...@@ -179,16 +177,6 @@ ...@@ -179,16 +177,6 @@
#define fRTMP_ADAPTER_MEDIA_STATE_CHANGE 0x20000000 #define fRTMP_ADAPTER_MEDIA_STATE_CHANGE 0x20000000
#define fRTMP_ADAPTER_IDLE_RADIO_OFF 0x40000000 #define fRTMP_ADAPTER_IDLE_RADIO_OFF 0x40000000
// Lock bit for accessing different ring buffers
//#define fRTMP_ADAPTER_TX_RING_BUSY 0x80000000
//#define fRTMP_ADAPTER_MGMT_RING_BUSY 0x40000000
//#define fRTMP_ADAPTER_ATIM_RING_BUSY 0x20000000
//#define fRTMP_ADAPTER_RX_RING_BUSY 0x10000000
// Lock bit for accessing different queue
//#define fRTMP_ADAPTER_TX_QUEUE_BUSY 0x08000000
//#define fRTMP_ADAPTER_MGMT_QUEUE_BUSY 0x04000000
// //
// STA operation status flags // STA operation status flags
// //
...@@ -198,7 +186,6 @@ ...@@ -198,7 +186,6 @@
#define fOP_STATUS_SHORT_SLOT_INUSED 0x00000008 #define fOP_STATUS_SHORT_SLOT_INUSED 0x00000008
#define fOP_STATUS_SHORT_PREAMBLE_INUSED 0x00000010 #define fOP_STATUS_SHORT_PREAMBLE_INUSED 0x00000010
#define fOP_STATUS_RECEIVE_DTIM 0x00000020 #define fOP_STATUS_RECEIVE_DTIM 0x00000020
//#define fOP_STATUS_TX_RATE_SWITCH_ENABLED 0x00000040
#define fOP_STATUS_MEDIA_STATE_CONNECTED 0x00000080 #define fOP_STATUS_MEDIA_STATE_CONNECTED 0x00000080
#define fOP_STATUS_WMM_INUSED 0x00000100 #define fOP_STATUS_WMM_INUSED 0x00000100
#define fOP_STATUS_AGGREGATION_INUSED 0x00000200 #define fOP_STATUS_AGGREGATION_INUSED 0x00000200
...@@ -238,7 +225,6 @@ ...@@ -238,7 +225,6 @@
// //
// STA configuration flags // STA configuration flags
// //
//#define fSTA_CFG_ENABLE_TX_BURST 0x00000001
// 802.11n Operating Mode Definition. 0-3 also used in ASICUPdateProtect switch case // 802.11n Operating Mode Definition. 0-3 also used in ASICUPdateProtect switch case
#define HT_NO_PROTECT 0 #define HT_NO_PROTECT 0
...@@ -433,14 +419,10 @@ ...@@ -433,14 +419,10 @@
#define PWR_ACTIVE 0 #define PWR_ACTIVE 0
#define PWR_SAVE 1 #define PWR_SAVE 1
#define PWR_MMPS 2 //MIMO power save #define PWR_MMPS 2 //MIMO power save
//#define PWR_UNKNOWN 2
// Auth and Assoc mode related definitions // Auth and Assoc mode related definitions
#define AUTH_MODE_OPEN 0x00 #define AUTH_MODE_OPEN 0x00
#define AUTH_MODE_KEY 0x01 #define AUTH_MODE_KEY 0x01
//#define AUTH_MODE_AUTO_SWITCH 0x03
//#define AUTH_MODE_DEAUTH 0x04
//#define AUTH_MODE_UPLAYER 0x05 // reserved for 802.11i use
// BSS Type definitions // BSS Type definitions
#define BSS_ADHOC 0 // = Ndis802_11IBSS #define BSS_ADHOC 0 // = Ndis802_11IBSS
......
drivers/staging/rt2870/sta/connect.c
View file @ ac7e7d5a
...@@ -533,13 +533,6 @@ VOID CntlOidRTBssidProc( ...@@ -533,13 +533,6 @@ VOID CntlOidRTBssidProc(
pAd->MlmeAux.SsidBssTab.BssNr = 1; pAd->MlmeAux.SsidBssTab.BssNr = 1;
NdisMoveMemory(&pAd->MlmeAux.SsidBssTab.BssEntry[0], &pAd->ScanTab.BssEntry[BssIdx], sizeof(BSS_ENTRY)); NdisMoveMemory(&pAd->MlmeAux.SsidBssTab.BssEntry[0], &pAd->ScanTab.BssEntry[BssIdx], sizeof(BSS_ENTRY));
//pAd->MlmeAux.AutoReconnectSsidLen = pAd->ScanTab.BssEntry[BssIdx].SsidLen;
//NdisMoveMemory(pAd->MlmeAux.AutoReconnectSsid, pAd->ScanTab.BssEntry[BssIdx].Ssid, pAd->ScanTab.BssEntry[BssIdx].SsidLen);
// Add SSID into MlmeAux for site surey joining hidden SSID
//pAd->MlmeAux.SsidLen = pAd->ScanTab.BssEntry[BssIdx].SsidLen;
//NdisMoveMemory(pAd->MlmeAux.Ssid, pAd->ScanTab.BssEntry[BssIdx].Ssid, pAd->MlmeAux.SsidLen);
// 2002-11-26 skip the following checking. i.e. if user wants to re-connect to same AP // 2002-11-26 skip the following checking. i.e. if user wants to re-connect to same AP
// we just follow normal procedure. The reason of user doing this may because he/she changed // we just follow normal procedure. The reason of user doing this may because he/she changed
// AP to another channel, but we still received BEACON from it thus don't claim Link Down. // AP to another channel, but we still received BEACON from it thus don't claim Link Down.
...@@ -1917,9 +1910,6 @@ VOID LinkDown( ...@@ -1917,9 +1910,6 @@ VOID LinkDown(
// Update extra information to link is up // Update extra information to link is up
pAd->ExtraInfo = GENERAL_LINK_DOWN; pAd->ExtraInfo = GENERAL_LINK_DOWN;
//pAd->StaCfg.AdhocBOnlyJoined = FALSE;
//pAd->StaCfg.AdhocBGJoined = FALSE;
//pAd->StaCfg.Adhoc20NJoined = FALSE;
pAd->StaActive.SupportedPhyInfo.bHtEnable = FALSE; pAd->StaActive.SupportedPhyInfo.bHtEnable = FALSE;
// Reset the Current AP's IP address // Reset the Current AP's IP address
......
drivers/staging/rt2870/sta/rtmp_data.c
View file @ ac7e7d5a
...@@ -63,7 +63,6 @@ VOID STARxEAPOLFrameIndicate( ...@@ -63,7 +63,6 @@ VOID STARxEAPOLFrameIndicate(
int idx = 0; int idx = 0;
DBGPRINT_RAW(RT_DEBUG_TRACE, ("Receive EAP-SUCCESS Packet\n")); DBGPRINT_RAW(RT_DEBUG_TRACE, ("Receive EAP-SUCCESS Packet\n"));
//pAd->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
STA_PORT_SECURED(pAd); STA_PORT_SECURED(pAd);
if (pAd->StaCfg.IEEE8021x_required_keys == FALSE) if (pAd->StaCfg.IEEE8021x_required_keys == FALSE)
...@@ -864,7 +863,6 @@ NDIS_STATUS STASendPacket( ...@@ -864,7 +863,6 @@ NDIS_STATUS STASendPacket(
UINT SrcBufLen; UINT SrcBufLen;
UINT AllowFragSize; UINT AllowFragSize;
UCHAR NumberOfFrag; UCHAR NumberOfFrag;
// UCHAR RTSRequired;
UCHAR QueIdx, UserPriority; UCHAR QueIdx, UserPriority;
MAC_TABLE_ENTRY *pEntry = NULL; MAC_TABLE_ENTRY *pEntry = NULL;
unsigned int IrqFlags; unsigned int IrqFlags;
...@@ -1078,7 +1076,6 @@ NDIS_STATUS STASendPacket( ...@@ -1078,7 +1076,6 @@ NDIS_STATUS STASendPacket(
if ((pAd->CommonCfg.BACapability.field.AutoBA == TRUE)&& if ((pAd->CommonCfg.BACapability.field.AutoBA == TRUE)&&
IS_HT_STA(pEntry)) IS_HT_STA(pEntry))
{ {
//PMAC_TABLE_ENTRY pMacEntry = &pAd->MacTab.Content[BSSID_WCID];
if (((pEntry->TXBAbitmap & (1<<UserPriority)) == 0) && if (((pEntry->TXBAbitmap & (1<<UserPriority)) == 0) &&
((pEntry->BADeclineBitmap & (1<<UserPriority)) == 0) && ((pEntry->BADeclineBitmap & (1<<UserPriority)) == 0) &&
(pEntry->PortSecured == WPA_802_1X_PORT_SECURED) (pEntry->PortSecured == WPA_802_1X_PORT_SECURED)
...@@ -1133,7 +1130,6 @@ NDIS_STATUS RTMPFreeTXDRequest( ...@@ -1133,7 +1130,6 @@ NDIS_STATUS RTMPFreeTXDRequest(
IN UCHAR NumberRequired, IN UCHAR NumberRequired,
IN PUCHAR FreeNumberIs) IN PUCHAR FreeNumberIs)
{ {
//ULONG FreeNumber = 0;
NDIS_STATUS Status = NDIS_STATUS_FAILURE; NDIS_STATUS Status = NDIS_STATUS_FAILURE;
unsigned long IrqFlags; unsigned long IrqFlags;
HT_TX_CONTEXT *pHTTXContext; HT_TX_CONTEXT *pHTTXContext;
......
drivers/staging/rt2870/sta/sync.c
View file @ ac7e7d5a
...@@ -546,7 +546,6 @@ VOID PeerBeaconAtScanAction( ...@@ -546,7 +546,6 @@ VOID PeerBeaconAtScanAction(
UCHAR NewExtChannelOffset = 0xff; UCHAR NewExtChannelOffset = 0xff;
// NdisFillMemory(Ssid, MAX_LEN_OF_SSID, 0x00);
pFrame = (PFRAME_802_11) Elem->Msg; pFrame = (PFRAME_802_11) Elem->Msg;
// Init Variable IE structure // Init Variable IE structure
pVIE = (PNDIS_802_11_VARIABLE_IEs) VarIE; pVIE = (PNDIS_802_11_VARIABLE_IEs) VarIE;
......
drivers/staging/rt2870/sta/wpa.c
View file @ ac7e7d5a
...@@ -1214,7 +1214,6 @@ VOID Wpa2PairMsg3Action( ...@@ -1214,7 +1214,6 @@ VOID Wpa2PairMsg3Action(
RTMPToWirelessSta(pAd, Header802_3, LENGTH_802_3, (PUCHAR)&Packet, Packet.Body_Len[1] + 4, TRUE); RTMPToWirelessSta(pAd, Header802_3, LENGTH_802_3, (PUCHAR)&Packet, Packet.Body_Len[1] + 4, TRUE);
// set 802.1x port control // set 802.1x port control
//pAd->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
STA_PORT_SECURED(pAd); STA_PORT_SECURED(pAd);
// Indicate Connected for GUI // Indicate Connected for GUI
...@@ -1410,7 +1409,6 @@ VOID WpaGroupMsg1Action( ...@@ -1410,7 +1409,6 @@ VOID WpaGroupMsg1Action(
NULL); NULL);
// set 802.1x port control // set 802.1x port control
//pAd->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
STA_PORT_SECURED(pAd); STA_PORT_SECURED(pAd);
// Indicate Connected for GUI // Indicate Connected for GUI
...@@ -1897,17 +1895,6 @@ VOID RTMPReportMicError( ...@@ -1897,17 +1895,6 @@ VOID RTMPReportMicError(
pAd->StaCfg.LastMicErrorTime = Now; pAd->StaCfg.LastMicErrorTime = Now;
// Violate MIC error counts, MIC countermeasures kicks in // Violate MIC error counts, MIC countermeasures kicks in
pAd->StaCfg.MicErrCnt++; pAd->StaCfg.MicErrCnt++;
// We shall block all reception
// We shall clean all Tx ring and disassoicate from AP after next EAPOL frame
//
// No necessary to clean all Tx ring, on RTMPHardTransmit will stop sending non-802.1X EAPOL packets
// if pAd->StaCfg.MicErrCnt greater than 2.
//
// RTMPRingCleanUp(pAd, QID_AC_BK);
// RTMPRingCleanUp(pAd, QID_AC_BE);
// RTMPRingCleanUp(pAd, QID_AC_VI);
// RTMPRingCleanUp(pAd, QID_AC_VO);
// RTMPRingCleanUp(pAd, QID_HCCA);
} }
} }
else else
......
drivers/staging/rt2870/sta_ioctl.c
View file @ ac7e7d5a
...@@ -336,7 +336,6 @@ VOID RTMPAddKey( ...@@ -336,7 +336,6 @@ VOID RTMPAddKey(
if (pAd->StaCfg.AuthMode >= Ndis802_11AuthModeWPA2) if (pAd->StaCfg.AuthMode >= Ndis802_11AuthModeWPA2)
{ {
// set 802.1x port control // set 802.1x port control
//pAd->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
STA_PORT_SECURED(pAd); STA_PORT_SECURED(pAd);
// Indicate Connected for GUI // Indicate Connected for GUI
...@@ -386,7 +385,6 @@ VOID RTMPAddKey( ...@@ -386,7 +385,6 @@ VOID RTMPAddKey(
NULL); NULL);
// set 802.1x port control // set 802.1x port control
//pAd->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
STA_PORT_SECURED(pAd); STA_PORT_SECURED(pAd);
// Indicate Connected for GUI // Indicate Connected for GUI
...@@ -1608,7 +1606,6 @@ int rt_ioctl_siwencode(struct net_device *dev, ...@@ -1608,7 +1606,6 @@ int rt_ioctl_siwencode(struct net_device *dev,
else if ((erq->length == 0) && else if ((erq->length == 0) &&
(erq->flags & IW_ENCODE_RESTRICTED || erq->flags & IW_ENCODE_OPEN)) (erq->flags & IW_ENCODE_RESTRICTED || erq->flags & IW_ENCODE_OPEN))
{ {
//pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
STA_PORT_SECURED(pAdapter); STA_PORT_SECURED(pAdapter);
pAdapter->StaCfg.PairCipher = Ndis802_11WEPEnabled; pAdapter->StaCfg.PairCipher = Ndis802_11WEPEnabled;
pAdapter->StaCfg.GroupCipher = Ndis802_11WEPEnabled; pAdapter->StaCfg.GroupCipher = Ndis802_11WEPEnabled;
...@@ -2234,7 +2231,6 @@ int rt_ioctl_siwauth(struct net_device *dev, ...@@ -2234,7 +2231,6 @@ int rt_ioctl_siwauth(struct net_device *dev,
} }
else if (param->value == 0) else if (param->value == 0)
{ {
//pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
STA_PORT_SECURED(pAdapter); STA_PORT_SECURED(pAdapter);
} }
DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_KEY_MGMT - param->value = %d!\n", __func__, param->value)); DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_KEY_MGMT - param->value = %d!\n", __func__, param->value));
...@@ -2242,14 +2238,6 @@ int rt_ioctl_siwauth(struct net_device *dev, ...@@ -2242,14 +2238,6 @@ int rt_ioctl_siwauth(struct net_device *dev,
case IW_AUTH_RX_UNENCRYPTED_EAPOL: case IW_AUTH_RX_UNENCRYPTED_EAPOL:
break; break;
case IW_AUTH_PRIVACY_INVOKED: case IW_AUTH_PRIVACY_INVOKED:
/*if (param->value == 0)
{
pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeOpen;
pAdapter->StaCfg.WepStatus = Ndis802_11WEPDisabled;
pAdapter->StaCfg.OrigWepStatus = pAdapter->StaCfg.WepStatus;
pAdapter->StaCfg.PairCipher = Ndis802_11WEPDisabled;
pAdapter->StaCfg.GroupCipher = Ndis802_11WEPDisabled;
}*/
DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_PRIVACY_INVOKED - param->value = %d!\n", __func__, param->value)); DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_PRIVACY_INVOKED - param->value = %d!\n", __func__, param->value));
break; break;
case IW_AUTH_DROP_UNENCRYPTED: case IW_AUTH_DROP_UNENCRYPTED:
...@@ -2257,7 +2245,6 @@ int rt_ioctl_siwauth(struct net_device *dev, ...@@ -2257,7 +2245,6 @@ int rt_ioctl_siwauth(struct net_device *dev,
pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_NOT_SECURED; pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_NOT_SECURED;
else else
{ {
//pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
STA_PORT_SECURED(pAdapter); STA_PORT_SECURED(pAdapter);
} }
DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_VERSION - param->value = %d!\n", __func__, param->value)); DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_VERSION - param->value = %d!\n", __func__, param->value));
...@@ -2445,7 +2432,6 @@ int rt_ioctl_siwencodeext(struct net_device *dev, ...@@ -2445,7 +2432,6 @@ int rt_ioctl_siwencodeext(struct net_device *dev,
fnSetCipherKey(pAdapter, keyIdx, CIPHER_TKIP, FALSE, ext); fnSetCipherKey(pAdapter, keyIdx, CIPHER_TKIP, FALSE, ext);
if (pAdapter->StaCfg.AuthMode >= Ndis802_11AuthModeWPA2) if (pAdapter->StaCfg.AuthMode >= Ndis802_11AuthModeWPA2)
{ {
//pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
STA_PORT_SECURED(pAdapter); STA_PORT_SECURED(pAdapter);
} }
} }
...@@ -2454,7 +2440,6 @@ int rt_ioctl_siwencodeext(struct net_device *dev, ...@@ -2454,7 +2440,6 @@ int rt_ioctl_siwencodeext(struct net_device *dev,
fnSetCipherKey(pAdapter, keyIdx, CIPHER_TKIP, TRUE, ext); fnSetCipherKey(pAdapter, keyIdx, CIPHER_TKIP, TRUE, ext);
// set 802.1x port control // set 802.1x port control
//pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
STA_PORT_SECURED(pAdapter); STA_PORT_SECURED(pAdapter);
} }
} }
...@@ -2466,7 +2451,6 @@ int rt_ioctl_siwencodeext(struct net_device *dev, ...@@ -2466,7 +2451,6 @@ int rt_ioctl_siwencodeext(struct net_device *dev,
{ {
fnSetCipherKey(pAdapter, keyIdx, CIPHER_AES, FALSE, ext); fnSetCipherKey(pAdapter, keyIdx, CIPHER_AES, FALSE, ext);
if (pAdapter->StaCfg.AuthMode >= Ndis802_11AuthModeWPA2) if (pAdapter->StaCfg.AuthMode >= Ndis802_11AuthModeWPA2)
//pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
STA_PORT_SECURED(pAdapter); STA_PORT_SECURED(pAdapter);
} }
else if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) else if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY)
...@@ -2474,7 +2458,6 @@ int rt_ioctl_siwencodeext(struct net_device *dev, ...@@ -2474,7 +2458,6 @@ int rt_ioctl_siwencodeext(struct net_device *dev,
fnSetCipherKey(pAdapter, keyIdx, CIPHER_AES, TRUE, ext); fnSetCipherKey(pAdapter, keyIdx, CIPHER_AES, TRUE, ext);
// set 802.1x port control // set 802.1x port control
//pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
STA_PORT_SECURED(pAdapter); STA_PORT_SECURED(pAdapter);
} }
break; break;
...@@ -2723,7 +2706,6 @@ rt_private_ioctl_bbp(struct net_device *dev, struct iw_request_info *info, ...@@ -2723,7 +2706,6 @@ rt_private_ioctl_bbp(struct net_device *dev, struct iw_request_info *info,
CHAR *this_char; CHAR *this_char;
CHAR *value = NULL; CHAR *value = NULL;
UCHAR regBBP = 0; UCHAR regBBP = 0;
// CHAR arg[255]={0};
UINT32 bbpId; UINT32 bbpId;
UINT32 bbpValue; UINT32 bbpValue;
BOOLEAN bIsPrintAllBBP = FALSE; BOOLEAN bIsPrintAllBBP = FALSE;
...@@ -2918,7 +2900,6 @@ int rt_ioctl_giwrate(struct net_device *dev, ...@@ -2918,7 +2900,6 @@ int rt_ioctl_giwrate(struct net_device *dev,
if (ht_setting.field.MODE >= MODE_HTMIX) if (ht_setting.field.MODE >= MODE_HTMIX)
{ {
// rate_index = 12 + ((UCHAR)ht_setting.field.BW *16) + ((UCHAR)ht_setting.field.ShortGI *32) + ((UCHAR)ht_setting.field.MCS);
rate_index = 12 + ((UCHAR)ht_setting.field.BW *24) + ((UCHAR)ht_setting.field.ShortGI *48) + ((UCHAR)ht_setting.field.MCS); rate_index = 12 + ((UCHAR)ht_setting.field.BW *24) + ((UCHAR)ht_setting.field.ShortGI *48) + ((UCHAR)ht_setting.field.MCS);
} }
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7