|
@@ -45,7 +45,7 @@
|
|
|
#include "baseband.h"
|
|
|
|
|
|
/*--------------------- Static Definitions -------------------------*/
|
|
|
-static int msglevel =MSG_LEVEL_INFO;
|
|
|
+static int msglevel = MSG_LEVEL_INFO;
|
|
|
/*--------------------- Static Classes ----------------------------*/
|
|
|
|
|
|
/*--------------------- Static Variables --------------------------*/
|
|
@@ -70,9 +70,9 @@ static int msglevel =MSG_LEVEL_INFO;
|
|
|
* Return Value: none
|
|
|
*
|
|
|
*/
|
|
|
-void STAvClearAllCounter (PSStatCounter pStatistic)
|
|
|
+void STAvClearAllCounter(PSStatCounter pStatistic)
|
|
|
{
|
|
|
- // set memory to zero
|
|
|
+ // set memory to zero
|
|
|
memset(pStatistic, 0, sizeof(SStatCounter));
|
|
|
}
|
|
|
|
|
@@ -90,54 +90,54 @@ void STAvClearAllCounter (PSStatCounter pStatistic)
|
|
|
* Return Value: none
|
|
|
*
|
|
|
*/
|
|
|
-void STAvUpdateIsrStatCounter (PSStatCounter pStatistic, unsigned long dwIsr)
|
|
|
+void STAvUpdateIsrStatCounter(PSStatCounter pStatistic, unsigned long dwIsr)
|
|
|
{
|
|
|
- /**********************/
|
|
|
- /* ABNORMAL interrupt */
|
|
|
- /**********************/
|
|
|
- // not any IMR bit invoke irq
|
|
|
+ /**********************/
|
|
|
+ /* ABNORMAL interrupt */
|
|
|
+ /**********************/
|
|
|
+ // not any IMR bit invoke irq
|
|
|
|
|
|
- if (dwIsr == 0) {
|
|
|
- pStatistic->ISRStat.dwIsrUnknown++;
|
|
|
- return;
|
|
|
- }
|
|
|
+ if (dwIsr == 0) {
|
|
|
+ pStatistic->ISRStat.dwIsrUnknown++;
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
//Added by Kyle
|
|
|
- if (dwIsr & ISR_TXDMA0) // ISR, bit0
|
|
|
- pStatistic->ISRStat.dwIsrTx0OK++; // TXDMA0 successful
|
|
|
+ if (dwIsr & ISR_TXDMA0) // ISR, bit0
|
|
|
+ pStatistic->ISRStat.dwIsrTx0OK++; // TXDMA0 successful
|
|
|
|
|
|
- if (dwIsr & ISR_AC0DMA) // ISR, bit1
|
|
|
- pStatistic->ISRStat.dwIsrAC0TxOK++; // AC0DMA successful
|
|
|
+ if (dwIsr & ISR_AC0DMA) // ISR, bit1
|
|
|
+ pStatistic->ISRStat.dwIsrAC0TxOK++; // AC0DMA successful
|
|
|
|
|
|
- if (dwIsr & ISR_BNTX) // ISR, bit2
|
|
|
- pStatistic->ISRStat.dwIsrBeaconTxOK++; // BeaconTx successful
|
|
|
+ if (dwIsr & ISR_BNTX) // ISR, bit2
|
|
|
+ pStatistic->ISRStat.dwIsrBeaconTxOK++; // BeaconTx successful
|
|
|
|
|
|
- if (dwIsr & ISR_RXDMA0) // ISR, bit3
|
|
|
- pStatistic->ISRStat.dwIsrRx0OK++; // Rx0 successful
|
|
|
+ if (dwIsr & ISR_RXDMA0) // ISR, bit3
|
|
|
+ pStatistic->ISRStat.dwIsrRx0OK++; // Rx0 successful
|
|
|
|
|
|
- if (dwIsr & ISR_TBTT) // ISR, bit4
|
|
|
- pStatistic->ISRStat.dwIsrTBTTInt++; // TBTT successful
|
|
|
+ if (dwIsr & ISR_TBTT) // ISR, bit4
|
|
|
+ pStatistic->ISRStat.dwIsrTBTTInt++; // TBTT successful
|
|
|
|
|
|
- if (dwIsr & ISR_SOFTTIMER) // ISR, bit6
|
|
|
- pStatistic->ISRStat.dwIsrSTIMERInt++;
|
|
|
+ if (dwIsr & ISR_SOFTTIMER) // ISR, bit6
|
|
|
+ pStatistic->ISRStat.dwIsrSTIMERInt++;
|
|
|
|
|
|
- if (dwIsr & ISR_WATCHDOG) // ISR, bit7
|
|
|
- pStatistic->ISRStat.dwIsrWatchDog++;
|
|
|
+ if (dwIsr & ISR_WATCHDOG) // ISR, bit7
|
|
|
+ pStatistic->ISRStat.dwIsrWatchDog++;
|
|
|
|
|
|
- if (dwIsr & ISR_FETALERR) // ISR, bit8
|
|
|
- pStatistic->ISRStat.dwIsrUnrecoverableError++;
|
|
|
+ if (dwIsr & ISR_FETALERR) // ISR, bit8
|
|
|
+ pStatistic->ISRStat.dwIsrUnrecoverableError++;
|
|
|
|
|
|
- if (dwIsr & ISR_SOFTINT) // ISR, bit9
|
|
|
- pStatistic->ISRStat.dwIsrSoftInterrupt++; // software interrupt
|
|
|
+ if (dwIsr & ISR_SOFTINT) // ISR, bit9
|
|
|
+ pStatistic->ISRStat.dwIsrSoftInterrupt++; // software interrupt
|
|
|
|
|
|
- if (dwIsr & ISR_MIBNEARFULL) // ISR, bit10
|
|
|
- pStatistic->ISRStat.dwIsrMIBNearfull++;
|
|
|
+ if (dwIsr & ISR_MIBNEARFULL) // ISR, bit10
|
|
|
+ pStatistic->ISRStat.dwIsrMIBNearfull++;
|
|
|
|
|
|
- if (dwIsr & ISR_RXNOBUF) // ISR, bit11
|
|
|
- pStatistic->ISRStat.dwIsrRxNoBuf++; // Rx No Buff
|
|
|
+ if (dwIsr & ISR_RXNOBUF) // ISR, bit11
|
|
|
+ pStatistic->ISRStat.dwIsrRxNoBuf++; // Rx No Buff
|
|
|
|
|
|
- if (dwIsr & ISR_RXDMA1) // ISR, bit12
|
|
|
- pStatistic->ISRStat.dwIsrRx1OK++; // Rx1 successful
|
|
|
+ if (dwIsr & ISR_RXDMA1) // ISR, bit12
|
|
|
+ pStatistic->ISRStat.dwIsrRx1OK++; // Rx1 successful
|
|
|
|
|
|
// if (dwIsr & ISR_ATIMTX) // ISR, bit13
|
|
|
// pStatistic->ISRStat.dwIsrATIMTxOK++; // ATIMTX successful
|
|
@@ -154,8 +154,8 @@ void STAvUpdateIsrStatCounter (PSStatCounter pStatistic, unsigned long dwIsr)
|
|
|
// if (dwIsr & ISR_SYNCFLUSHOK) // ISR, bit20
|
|
|
// pStatistic->ISRStat.dwIsrSYNCFlushOK++;
|
|
|
|
|
|
- if (dwIsr & ISR_SOFTTIMER1) // ISR, bit21
|
|
|
- pStatistic->ISRStat.dwIsrSTIMER1Int++;
|
|
|
+ if (dwIsr & ISR_SOFTTIMER1) // ISR, bit21
|
|
|
+ pStatistic->ISRStat.dwIsrSTIMER1Int++;
|
|
|
|
|
|
}
|
|
|
|
|
@@ -176,194 +176,194 @@ void STAvUpdateIsrStatCounter (PSStatCounter pStatistic, unsigned long dwIsr)
|
|
|
* Return Value: none
|
|
|
*
|
|
|
*/
|
|
|
-void STAvUpdateRDStatCounter (PSStatCounter pStatistic,
|
|
|
- unsigned char byRSR, unsigned char byNewRSR, unsigned char byRxRate,
|
|
|
- unsigned char *pbyBuffer, unsigned int cbFrameLength)
|
|
|
+void STAvUpdateRDStatCounter(PSStatCounter pStatistic,
|
|
|
+ unsigned char byRSR, unsigned char byNewRSR, unsigned char byRxRate,
|
|
|
+ unsigned char *pbyBuffer, unsigned int cbFrameLength)
|
|
|
{
|
|
|
- //need change
|
|
|
- PS802_11Header pHeader = (PS802_11Header)pbyBuffer;
|
|
|
-
|
|
|
- if (byRSR & RSR_ADDROK)
|
|
|
- pStatistic->dwRsrADDROk++;
|
|
|
- if (byRSR & RSR_CRCOK) {
|
|
|
- pStatistic->dwRsrCRCOk++;
|
|
|
-
|
|
|
- pStatistic->ullRsrOK++;
|
|
|
-
|
|
|
- if (cbFrameLength >= ETH_ALEN) {
|
|
|
- // update counters in case of successful transmit
|
|
|
- if (byRSR & RSR_ADDRBROAD) {
|
|
|
- pStatistic->ullRxBroadcastFrames++;
|
|
|
- pStatistic->ullRxBroadcastBytes += (unsigned long long) cbFrameLength;
|
|
|
- }
|
|
|
- else if (byRSR & RSR_ADDRMULTI) {
|
|
|
- pStatistic->ullRxMulticastFrames++;
|
|
|
- pStatistic->ullRxMulticastBytes += (unsigned long long) cbFrameLength;
|
|
|
- }
|
|
|
- else {
|
|
|
- pStatistic->ullRxDirectedFrames++;
|
|
|
- pStatistic->ullRxDirectedBytes += (unsigned long long) cbFrameLength;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- if(byRxRate==22) {
|
|
|
- pStatistic->CustomStat.ullRsr11M++;
|
|
|
- if(byRSR & RSR_CRCOK) {
|
|
|
- pStatistic->CustomStat.ullRsr11MCRCOk++;
|
|
|
- }
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"11M: ALL[%d], OK[%d]:[%02x]\n", (int)pStatistic->CustomStat.ullRsr11M, (int)pStatistic->CustomStat.ullRsr11MCRCOk, byRSR);
|
|
|
- }
|
|
|
- else if(byRxRate==11) {
|
|
|
- pStatistic->CustomStat.ullRsr5M++;
|
|
|
- if(byRSR & RSR_CRCOK) {
|
|
|
- pStatistic->CustomStat.ullRsr5MCRCOk++;
|
|
|
- }
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 5M: ALL[%d], OK[%d]:[%02x]\n", (int)pStatistic->CustomStat.ullRsr5M, (int)pStatistic->CustomStat.ullRsr5MCRCOk, byRSR);
|
|
|
- }
|
|
|
- else if(byRxRate==4) {
|
|
|
- pStatistic->CustomStat.ullRsr2M++;
|
|
|
- if(byRSR & RSR_CRCOK) {
|
|
|
- pStatistic->CustomStat.ullRsr2MCRCOk++;
|
|
|
- }
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 2M: ALL[%d], OK[%d]:[%02x]\n", (int)pStatistic->CustomStat.ullRsr2M, (int)pStatistic->CustomStat.ullRsr2MCRCOk, byRSR);
|
|
|
- }
|
|
|
- else if(byRxRate==2){
|
|
|
- pStatistic->CustomStat.ullRsr1M++;
|
|
|
- if(byRSR & RSR_CRCOK) {
|
|
|
- pStatistic->CustomStat.ullRsr1MCRCOk++;
|
|
|
- }
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 1M: ALL[%d], OK[%d]:[%02x]\n", (int)pStatistic->CustomStat.ullRsr1M, (int)pStatistic->CustomStat.ullRsr1MCRCOk, byRSR);
|
|
|
- }
|
|
|
- else if(byRxRate==12){
|
|
|
- pStatistic->CustomStat.ullRsr6M++;
|
|
|
- if(byRSR & RSR_CRCOK) {
|
|
|
- pStatistic->CustomStat.ullRsr6MCRCOk++;
|
|
|
- }
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 6M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr6M, (int)pStatistic->CustomStat.ullRsr6MCRCOk);
|
|
|
- }
|
|
|
- else if(byRxRate==18){
|
|
|
- pStatistic->CustomStat.ullRsr9M++;
|
|
|
- if(byRSR & RSR_CRCOK) {
|
|
|
- pStatistic->CustomStat.ullRsr9MCRCOk++;
|
|
|
- }
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 9M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr9M, (int)pStatistic->CustomStat.ullRsr9MCRCOk);
|
|
|
- }
|
|
|
- else if(byRxRate==24){
|
|
|
- pStatistic->CustomStat.ullRsr12M++;
|
|
|
- if(byRSR & RSR_CRCOK) {
|
|
|
- pStatistic->CustomStat.ullRsr12MCRCOk++;
|
|
|
- }
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"12M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr12M, (int)pStatistic->CustomStat.ullRsr12MCRCOk);
|
|
|
- }
|
|
|
- else if(byRxRate==36){
|
|
|
- pStatistic->CustomStat.ullRsr18M++;
|
|
|
- if(byRSR & RSR_CRCOK) {
|
|
|
- pStatistic->CustomStat.ullRsr18MCRCOk++;
|
|
|
- }
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"18M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr18M, (int)pStatistic->CustomStat.ullRsr18MCRCOk);
|
|
|
- }
|
|
|
- else if(byRxRate==48){
|
|
|
- pStatistic->CustomStat.ullRsr24M++;
|
|
|
- if(byRSR & RSR_CRCOK) {
|
|
|
- pStatistic->CustomStat.ullRsr24MCRCOk++;
|
|
|
- }
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"24M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr24M, (int)pStatistic->CustomStat.ullRsr24MCRCOk);
|
|
|
- }
|
|
|
- else if(byRxRate==72){
|
|
|
- pStatistic->CustomStat.ullRsr36M++;
|
|
|
- if(byRSR & RSR_CRCOK) {
|
|
|
- pStatistic->CustomStat.ullRsr36MCRCOk++;
|
|
|
- }
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"36M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr36M, (int)pStatistic->CustomStat.ullRsr36MCRCOk);
|
|
|
- }
|
|
|
- else if(byRxRate==96){
|
|
|
- pStatistic->CustomStat.ullRsr48M++;
|
|
|
- if(byRSR & RSR_CRCOK) {
|
|
|
- pStatistic->CustomStat.ullRsr48MCRCOk++;
|
|
|
- }
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"48M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr48M, (int)pStatistic->CustomStat.ullRsr48MCRCOk);
|
|
|
- }
|
|
|
- else if(byRxRate==108){
|
|
|
- pStatistic->CustomStat.ullRsr54M++;
|
|
|
- if(byRSR & RSR_CRCOK) {
|
|
|
- pStatistic->CustomStat.ullRsr54MCRCOk++;
|
|
|
- }
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"54M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr54M, (int)pStatistic->CustomStat.ullRsr54MCRCOk);
|
|
|
- }
|
|
|
- else {
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Unknown: Total[%d], CRCOK[%d]\n", (int)pStatistic->dwRsrRxPacket+1, (int)pStatistic->dwRsrCRCOk);
|
|
|
- }
|
|
|
-
|
|
|
- if (byRSR & RSR_BSSIDOK)
|
|
|
- pStatistic->dwRsrBSSIDOk++;
|
|
|
-
|
|
|
- if (byRSR & RSR_BCNSSIDOK)
|
|
|
- pStatistic->dwRsrBCNSSIDOk++;
|
|
|
- if (byRSR & RSR_IVLDLEN) //invalid len (> 2312 byte)
|
|
|
- pStatistic->dwRsrLENErr++;
|
|
|
- if (byRSR & RSR_IVLDTYP) //invalid packet type
|
|
|
- pStatistic->dwRsrTYPErr++;
|
|
|
- if (byRSR & (RSR_IVLDTYP | RSR_IVLDLEN))
|
|
|
- pStatistic->dwRsrErr++;
|
|
|
-
|
|
|
- if (byNewRSR & NEWRSR_DECRYPTOK)
|
|
|
- pStatistic->dwNewRsrDECRYPTOK++;
|
|
|
- if (byNewRSR & NEWRSR_CFPIND)
|
|
|
- pStatistic->dwNewRsrCFP++;
|
|
|
- if (byNewRSR & NEWRSR_HWUTSF)
|
|
|
- pStatistic->dwNewRsrUTSF++;
|
|
|
- if (byNewRSR & NEWRSR_BCNHITAID)
|
|
|
- pStatistic->dwNewRsrHITAID++;
|
|
|
- if (byNewRSR & NEWRSR_BCNHITAID0)
|
|
|
- pStatistic->dwNewRsrHITAID0++;
|
|
|
-
|
|
|
- // increase rx packet count
|
|
|
- pStatistic->dwRsrRxPacket++;
|
|
|
- pStatistic->dwRsrRxOctet += cbFrameLength;
|
|
|
-
|
|
|
-
|
|
|
- if (IS_TYPE_DATA(pbyBuffer)) {
|
|
|
- pStatistic->dwRsrRxData++;
|
|
|
- } else if (IS_TYPE_MGMT(pbyBuffer)){
|
|
|
- pStatistic->dwRsrRxManage++;
|
|
|
- } else if (IS_TYPE_CONTROL(pbyBuffer)){
|
|
|
- pStatistic->dwRsrRxControl++;
|
|
|
- }
|
|
|
-
|
|
|
- if (byRSR & RSR_ADDRBROAD)
|
|
|
- pStatistic->dwRsrBroadcast++;
|
|
|
- else if (byRSR & RSR_ADDRMULTI)
|
|
|
- pStatistic->dwRsrMulticast++;
|
|
|
- else
|
|
|
- pStatistic->dwRsrDirected++;
|
|
|
-
|
|
|
- if (WLAN_GET_FC_MOREFRAG(pHeader->wFrameCtl))
|
|
|
- pStatistic->dwRsrRxFragment++;
|
|
|
-
|
|
|
- if (cbFrameLength < ETH_ZLEN + 4) {
|
|
|
- pStatistic->dwRsrRunt++;
|
|
|
- }
|
|
|
- else if (cbFrameLength == ETH_ZLEN + 4) {
|
|
|
- pStatistic->dwRsrRxFrmLen64++;
|
|
|
- }
|
|
|
- else if ((65 <= cbFrameLength) && (cbFrameLength <= 127)) {
|
|
|
- pStatistic->dwRsrRxFrmLen65_127++;
|
|
|
- }
|
|
|
- else if ((128 <= cbFrameLength) && (cbFrameLength <= 255)) {
|
|
|
- pStatistic->dwRsrRxFrmLen128_255++;
|
|
|
- }
|
|
|
- else if ((256 <= cbFrameLength) && (cbFrameLength <= 511)) {
|
|
|
- pStatistic->dwRsrRxFrmLen256_511++;
|
|
|
- }
|
|
|
- else if ((512 <= cbFrameLength) && (cbFrameLength <= 1023)) {
|
|
|
- pStatistic->dwRsrRxFrmLen512_1023++;
|
|
|
- }
|
|
|
- else if ((1024 <= cbFrameLength) && (cbFrameLength <= ETH_FRAME_LEN + 4)) {
|
|
|
- pStatistic->dwRsrRxFrmLen1024_1518++;
|
|
|
- } else if (cbFrameLength > ETH_FRAME_LEN + 4) {
|
|
|
- pStatistic->dwRsrLong++;
|
|
|
- }
|
|
|
+ //need change
|
|
|
+ PS802_11Header pHeader = (PS802_11Header)pbyBuffer;
|
|
|
+
|
|
|
+ if (byRSR & RSR_ADDROK)
|
|
|
+ pStatistic->dwRsrADDROk++;
|
|
|
+ if (byRSR & RSR_CRCOK) {
|
|
|
+ pStatistic->dwRsrCRCOk++;
|
|
|
+
|
|
|
+ pStatistic->ullRsrOK++;
|
|
|
+
|
|
|
+ if (cbFrameLength >= ETH_ALEN) {
|
|
|
+ // update counters in case of successful transmit
|
|
|
+ if (byRSR & RSR_ADDRBROAD) {
|
|
|
+ pStatistic->ullRxBroadcastFrames++;
|
|
|
+ pStatistic->ullRxBroadcastBytes += (unsigned long long) cbFrameLength;
|
|
|
+ }
|
|
|
+ else if (byRSR & RSR_ADDRMULTI) {
|
|
|
+ pStatistic->ullRxMulticastFrames++;
|
|
|
+ pStatistic->ullRxMulticastBytes += (unsigned long long) cbFrameLength;
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ pStatistic->ullRxDirectedFrames++;
|
|
|
+ pStatistic->ullRxDirectedBytes += (unsigned long long) cbFrameLength;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (byRxRate == 22) {
|
|
|
+ pStatistic->CustomStat.ullRsr11M++;
|
|
|
+ if (byRSR & RSR_CRCOK) {
|
|
|
+ pStatistic->CustomStat.ullRsr11MCRCOk++;
|
|
|
+ }
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "11M: ALL[%d], OK[%d]:[%02x]\n", (int)pStatistic->CustomStat.ullRsr11M, (int)pStatistic->CustomStat.ullRsr11MCRCOk, byRSR);
|
|
|
+ }
|
|
|
+ else if (byRxRate == 11) {
|
|
|
+ pStatistic->CustomStat.ullRsr5M++;
|
|
|
+ if (byRSR & RSR_CRCOK) {
|
|
|
+ pStatistic->CustomStat.ullRsr5MCRCOk++;
|
|
|
+ }
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " 5M: ALL[%d], OK[%d]:[%02x]\n", (int)pStatistic->CustomStat.ullRsr5M, (int)pStatistic->CustomStat.ullRsr5MCRCOk, byRSR);
|
|
|
+ }
|
|
|
+ else if (byRxRate == 4) {
|
|
|
+ pStatistic->CustomStat.ullRsr2M++;
|
|
|
+ if (byRSR & RSR_CRCOK) {
|
|
|
+ pStatistic->CustomStat.ullRsr2MCRCOk++;
|
|
|
+ }
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " 2M: ALL[%d], OK[%d]:[%02x]\n", (int)pStatistic->CustomStat.ullRsr2M, (int)pStatistic->CustomStat.ullRsr2MCRCOk, byRSR);
|
|
|
+ }
|
|
|
+ else if (byRxRate == 2) {
|
|
|
+ pStatistic->CustomStat.ullRsr1M++;
|
|
|
+ if (byRSR & RSR_CRCOK) {
|
|
|
+ pStatistic->CustomStat.ullRsr1MCRCOk++;
|
|
|
+ }
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " 1M: ALL[%d], OK[%d]:[%02x]\n", (int)pStatistic->CustomStat.ullRsr1M, (int)pStatistic->CustomStat.ullRsr1MCRCOk, byRSR);
|
|
|
+ }
|
|
|
+ else if (byRxRate == 12) {
|
|
|
+ pStatistic->CustomStat.ullRsr6M++;
|
|
|
+ if (byRSR & RSR_CRCOK) {
|
|
|
+ pStatistic->CustomStat.ullRsr6MCRCOk++;
|
|
|
+ }
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " 6M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr6M, (int)pStatistic->CustomStat.ullRsr6MCRCOk);
|
|
|
+ }
|
|
|
+ else if (byRxRate == 18) {
|
|
|
+ pStatistic->CustomStat.ullRsr9M++;
|
|
|
+ if (byRSR & RSR_CRCOK) {
|
|
|
+ pStatistic->CustomStat.ullRsr9MCRCOk++;
|
|
|
+ }
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " 9M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr9M, (int)pStatistic->CustomStat.ullRsr9MCRCOk);
|
|
|
+ }
|
|
|
+ else if (byRxRate == 24) {
|
|
|
+ pStatistic->CustomStat.ullRsr12M++;
|
|
|
+ if (byRSR & RSR_CRCOK) {
|
|
|
+ pStatistic->CustomStat.ullRsr12MCRCOk++;
|
|
|
+ }
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "12M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr12M, (int)pStatistic->CustomStat.ullRsr12MCRCOk);
|
|
|
+ }
|
|
|
+ else if (byRxRate == 36) {
|
|
|
+ pStatistic->CustomStat.ullRsr18M++;
|
|
|
+ if (byRSR & RSR_CRCOK) {
|
|
|
+ pStatistic->CustomStat.ullRsr18MCRCOk++;
|
|
|
+ }
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "18M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr18M, (int)pStatistic->CustomStat.ullRsr18MCRCOk);
|
|
|
+ }
|
|
|
+ else if (byRxRate == 48) {
|
|
|
+ pStatistic->CustomStat.ullRsr24M++;
|
|
|
+ if (byRSR & RSR_CRCOK) {
|
|
|
+ pStatistic->CustomStat.ullRsr24MCRCOk++;
|
|
|
+ }
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "24M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr24M, (int)pStatistic->CustomStat.ullRsr24MCRCOk);
|
|
|
+ }
|
|
|
+ else if (byRxRate == 72) {
|
|
|
+ pStatistic->CustomStat.ullRsr36M++;
|
|
|
+ if (byRSR & RSR_CRCOK) {
|
|
|
+ pStatistic->CustomStat.ullRsr36MCRCOk++;
|
|
|
+ }
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "36M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr36M, (int)pStatistic->CustomStat.ullRsr36MCRCOk);
|
|
|
+ }
|
|
|
+ else if (byRxRate == 96) {
|
|
|
+ pStatistic->CustomStat.ullRsr48M++;
|
|
|
+ if (byRSR & RSR_CRCOK) {
|
|
|
+ pStatistic->CustomStat.ullRsr48MCRCOk++;
|
|
|
+ }
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "48M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr48M, (int)pStatistic->CustomStat.ullRsr48MCRCOk);
|
|
|
+ }
|
|
|
+ else if (byRxRate == 108) {
|
|
|
+ pStatistic->CustomStat.ullRsr54M++;
|
|
|
+ if (byRSR & RSR_CRCOK) {
|
|
|
+ pStatistic->CustomStat.ullRsr54MCRCOk++;
|
|
|
+ }
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "54M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr54M, (int)pStatistic->CustomStat.ullRsr54MCRCOk);
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Unknown: Total[%d], CRCOK[%d]\n", (int)pStatistic->dwRsrRxPacket+1, (int)pStatistic->dwRsrCRCOk);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (byRSR & RSR_BSSIDOK)
|
|
|
+ pStatistic->dwRsrBSSIDOk++;
|
|
|
+
|
|
|
+ if (byRSR & RSR_BCNSSIDOK)
|
|
|
+ pStatistic->dwRsrBCNSSIDOk++;
|
|
|
+ if (byRSR & RSR_IVLDLEN) //invalid len (> 2312 byte)
|
|
|
+ pStatistic->dwRsrLENErr++;
|
|
|
+ if (byRSR & RSR_IVLDTYP) //invalid packet type
|
|
|
+ pStatistic->dwRsrTYPErr++;
|
|
|
+ if (byRSR & (RSR_IVLDTYP | RSR_IVLDLEN))
|
|
|
+ pStatistic->dwRsrErr++;
|
|
|
+
|
|
|
+ if (byNewRSR & NEWRSR_DECRYPTOK)
|
|
|
+ pStatistic->dwNewRsrDECRYPTOK++;
|
|
|
+ if (byNewRSR & NEWRSR_CFPIND)
|
|
|
+ pStatistic->dwNewRsrCFP++;
|
|
|
+ if (byNewRSR & NEWRSR_HWUTSF)
|
|
|
+ pStatistic->dwNewRsrUTSF++;
|
|
|
+ if (byNewRSR & NEWRSR_BCNHITAID)
|
|
|
+ pStatistic->dwNewRsrHITAID++;
|
|
|
+ if (byNewRSR & NEWRSR_BCNHITAID0)
|
|
|
+ pStatistic->dwNewRsrHITAID0++;
|
|
|
+
|
|
|
+ // increase rx packet count
|
|
|
+ pStatistic->dwRsrRxPacket++;
|
|
|
+ pStatistic->dwRsrRxOctet += cbFrameLength;
|
|
|
+
|
|
|
+
|
|
|
+ if (IS_TYPE_DATA(pbyBuffer)) {
|
|
|
+ pStatistic->dwRsrRxData++;
|
|
|
+ } else if (IS_TYPE_MGMT(pbyBuffer)) {
|
|
|
+ pStatistic->dwRsrRxManage++;
|
|
|
+ } else if (IS_TYPE_CONTROL(pbyBuffer)) {
|
|
|
+ pStatistic->dwRsrRxControl++;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (byRSR & RSR_ADDRBROAD)
|
|
|
+ pStatistic->dwRsrBroadcast++;
|
|
|
+ else if (byRSR & RSR_ADDRMULTI)
|
|
|
+ pStatistic->dwRsrMulticast++;
|
|
|
+ else
|
|
|
+ pStatistic->dwRsrDirected++;
|
|
|
+
|
|
|
+ if (WLAN_GET_FC_MOREFRAG(pHeader->wFrameCtl))
|
|
|
+ pStatistic->dwRsrRxFragment++;
|
|
|
+
|
|
|
+ if (cbFrameLength < ETH_ZLEN + 4) {
|
|
|
+ pStatistic->dwRsrRunt++;
|
|
|
+ }
|
|
|
+ else if (cbFrameLength == ETH_ZLEN + 4) {
|
|
|
+ pStatistic->dwRsrRxFrmLen64++;
|
|
|
+ }
|
|
|
+ else if ((65 <= cbFrameLength) && (cbFrameLength <= 127)) {
|
|
|
+ pStatistic->dwRsrRxFrmLen65_127++;
|
|
|
+ }
|
|
|
+ else if ((128 <= cbFrameLength) && (cbFrameLength <= 255)) {
|
|
|
+ pStatistic->dwRsrRxFrmLen128_255++;
|
|
|
+ }
|
|
|
+ else if ((256 <= cbFrameLength) && (cbFrameLength <= 511)) {
|
|
|
+ pStatistic->dwRsrRxFrmLen256_511++;
|
|
|
+ }
|
|
|
+ else if ((512 <= cbFrameLength) && (cbFrameLength <= 1023)) {
|
|
|
+ pStatistic->dwRsrRxFrmLen512_1023++;
|
|
|
+ }
|
|
|
+ else if ((1024 <= cbFrameLength) && (cbFrameLength <= ETH_FRAME_LEN + 4)) {
|
|
|
+ pStatistic->dwRsrRxFrmLen1024_1518++;
|
|
|
+ } else if (cbFrameLength > ETH_FRAME_LEN + 4) {
|
|
|
+ pStatistic->dwRsrLong++;
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
|
|
@@ -387,28 +387,28 @@ void STAvUpdateRDStatCounter (PSStatCounter pStatistic,
|
|
|
*/
|
|
|
|
|
|
void
|
|
|
-STAvUpdateRDStatCounterEx (
|
|
|
- PSStatCounter pStatistic,
|
|
|
- unsigned char byRSR,
|
|
|
- unsigned char byNewRSR,
|
|
|
- unsigned char byRxRate,
|
|
|
- unsigned char *pbyBuffer,
|
|
|
- unsigned int cbFrameLength
|
|
|
- )
|
|
|
+STAvUpdateRDStatCounterEx(
|
|
|
+ PSStatCounter pStatistic,
|
|
|
+ unsigned char byRSR,
|
|
|
+ unsigned char byNewRSR,
|
|
|
+ unsigned char byRxRate,
|
|
|
+ unsigned char *pbyBuffer,
|
|
|
+ unsigned int cbFrameLength
|
|
|
+)
|
|
|
{
|
|
|
- STAvUpdateRDStatCounter(
|
|
|
- pStatistic,
|
|
|
- byRSR,
|
|
|
- byNewRSR,
|
|
|
- byRxRate,
|
|
|
- pbyBuffer,
|
|
|
- cbFrameLength
|
|
|
- );
|
|
|
-
|
|
|
- // rx length
|
|
|
- pStatistic->dwCntRxFrmLength = cbFrameLength;
|
|
|
- // rx pattern, we just see 10 bytes for sample
|
|
|
- memcpy(pStatistic->abyCntRxPattern, (unsigned char *)pbyBuffer, 10);
|
|
|
+ STAvUpdateRDStatCounter(
|
|
|
+ pStatistic,
|
|
|
+ byRSR,
|
|
|
+ byNewRSR,
|
|
|
+ byRxRate,
|
|
|
+ pbyBuffer,
|
|
|
+ cbFrameLength
|
|
|
+);
|
|
|
+
|
|
|
+ // rx length
|
|
|
+ pStatistic->dwCntRxFrmLength = cbFrameLength;
|
|
|
+ // rx pattern, we just see 10 bytes for sample
|
|
|
+ memcpy(pStatistic->abyCntRxPattern, (unsigned char *)pbyBuffer, 10);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -430,77 +430,77 @@ STAvUpdateRDStatCounterEx (
|
|
|
*
|
|
|
*/
|
|
|
void
|
|
|
-STAvUpdateTDStatCounter (
|
|
|
- PSStatCounter pStatistic,
|
|
|
- unsigned char byTSR0,
|
|
|
- unsigned char byTSR1,
|
|
|
- unsigned char *pbyBuffer,
|
|
|
- unsigned int cbFrameLength,
|
|
|
- unsigned int uIdx
|
|
|
- )
|
|
|
+STAvUpdateTDStatCounter(
|
|
|
+ PSStatCounter pStatistic,
|
|
|
+ unsigned char byTSR0,
|
|
|
+ unsigned char byTSR1,
|
|
|
+ unsigned char *pbyBuffer,
|
|
|
+ unsigned int cbFrameLength,
|
|
|
+ unsigned int uIdx
|
|
|
+)
|
|
|
{
|
|
|
- PWLAN_80211HDR_A4 pHeader;
|
|
|
- unsigned char *pbyDestAddr;
|
|
|
- unsigned char byTSR0_NCR = byTSR0 & TSR0_NCR;
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- pHeader = (PWLAN_80211HDR_A4) pbyBuffer;
|
|
|
- if (WLAN_GET_FC_TODS(pHeader->wFrameCtl) == 0) {
|
|
|
- pbyDestAddr = &(pHeader->abyAddr1[0]);
|
|
|
- }
|
|
|
- else {
|
|
|
- pbyDestAddr = &(pHeader->abyAddr3[0]);
|
|
|
- }
|
|
|
- // increase tx packet count
|
|
|
- pStatistic->dwTsrTxPacket[uIdx]++;
|
|
|
- pStatistic->dwTsrTxOctet[uIdx] += cbFrameLength;
|
|
|
-
|
|
|
- if (byTSR0_NCR != 0) {
|
|
|
- pStatistic->dwTsrRetry[uIdx]++;
|
|
|
- pStatistic->dwTsrTotalRetry[uIdx] += byTSR0_NCR;
|
|
|
-
|
|
|
- if (byTSR0_NCR == 1)
|
|
|
- pStatistic->dwTsrOnceRetry[uIdx]++;
|
|
|
- else
|
|
|
- pStatistic->dwTsrMoreThanOnceRetry[uIdx]++;
|
|
|
- }
|
|
|
-
|
|
|
- if ((byTSR1&(TSR1_TERR|TSR1_RETRYTMO|TSR1_TMO|ACK_DATA)) == 0) {
|
|
|
- pStatistic->ullTsrOK[uIdx]++;
|
|
|
- pStatistic->CustomStat.ullTsrAllOK =
|
|
|
- (pStatistic->ullTsrOK[TYPE_AC0DMA] + pStatistic->ullTsrOK[TYPE_TXDMA0]);
|
|
|
- // update counters in case that successful transmit
|
|
|
- if (is_broadcast_ether_addr(pbyDestAddr)) {
|
|
|
- pStatistic->ullTxBroadcastFrames[uIdx]++;
|
|
|
- pStatistic->ullTxBroadcastBytes[uIdx] += (unsigned long long) cbFrameLength;
|
|
|
- }
|
|
|
- else if (is_multicast_ether_addr(pbyDestAddr)) {
|
|
|
- pStatistic->ullTxMulticastFrames[uIdx]++;
|
|
|
- pStatistic->ullTxMulticastBytes[uIdx] += (unsigned long long) cbFrameLength;
|
|
|
- }
|
|
|
- else {
|
|
|
- pStatistic->ullTxDirectedFrames[uIdx]++;
|
|
|
- pStatistic->ullTxDirectedBytes[uIdx] += (unsigned long long) cbFrameLength;
|
|
|
- }
|
|
|
- }
|
|
|
- else {
|
|
|
- if (byTSR1 & TSR1_TERR)
|
|
|
- pStatistic->dwTsrErr[uIdx]++;
|
|
|
- if (byTSR1 & TSR1_RETRYTMO)
|
|
|
- pStatistic->dwTsrRetryTimeout[uIdx]++;
|
|
|
- if (byTSR1 & TSR1_TMO)
|
|
|
- pStatistic->dwTsrTransmitTimeout[uIdx]++;
|
|
|
- if (byTSR1 & ACK_DATA)
|
|
|
- pStatistic->dwTsrACKData[uIdx]++;
|
|
|
- }
|
|
|
-
|
|
|
- if (is_broadcast_ether_addr(pbyDestAddr))
|
|
|
- pStatistic->dwTsrBroadcast[uIdx]++;
|
|
|
- else if (is_multicast_ether_addr(pbyDestAddr))
|
|
|
- pStatistic->dwTsrMulticast[uIdx]++;
|
|
|
- else
|
|
|
- pStatistic->dwTsrDirected[uIdx]++;
|
|
|
+ PWLAN_80211HDR_A4 pHeader;
|
|
|
+ unsigned char *pbyDestAddr;
|
|
|
+ unsigned char byTSR0_NCR = byTSR0 & TSR0_NCR;
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ pHeader = (PWLAN_80211HDR_A4) pbyBuffer;
|
|
|
+ if (WLAN_GET_FC_TODS(pHeader->wFrameCtl) == 0) {
|
|
|
+ pbyDestAddr = &(pHeader->abyAddr1[0]);
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ pbyDestAddr = &(pHeader->abyAddr3[0]);
|
|
|
+ }
|
|
|
+ // increase tx packet count
|
|
|
+ pStatistic->dwTsrTxPacket[uIdx]++;
|
|
|
+ pStatistic->dwTsrTxOctet[uIdx] += cbFrameLength;
|
|
|
+
|
|
|
+ if (byTSR0_NCR != 0) {
|
|
|
+ pStatistic->dwTsrRetry[uIdx]++;
|
|
|
+ pStatistic->dwTsrTotalRetry[uIdx] += byTSR0_NCR;
|
|
|
+
|
|
|
+ if (byTSR0_NCR == 1)
|
|
|
+ pStatistic->dwTsrOnceRetry[uIdx]++;
|
|
|
+ else
|
|
|
+ pStatistic->dwTsrMoreThanOnceRetry[uIdx]++;
|
|
|
+ }
|
|
|
+
|
|
|
+ if ((byTSR1&(TSR1_TERR|TSR1_RETRYTMO|TSR1_TMO|ACK_DATA)) == 0) {
|
|
|
+ pStatistic->ullTsrOK[uIdx]++;
|
|
|
+ pStatistic->CustomStat.ullTsrAllOK =
|
|
|
+ (pStatistic->ullTsrOK[TYPE_AC0DMA] + pStatistic->ullTsrOK[TYPE_TXDMA0]);
|
|
|
+ // update counters in case that successful transmit
|
|
|
+ if (is_broadcast_ether_addr(pbyDestAddr)) {
|
|
|
+ pStatistic->ullTxBroadcastFrames[uIdx]++;
|
|
|
+ pStatistic->ullTxBroadcastBytes[uIdx] += (unsigned long long) cbFrameLength;
|
|
|
+ }
|
|
|
+ else if (is_multicast_ether_addr(pbyDestAddr)) {
|
|
|
+ pStatistic->ullTxMulticastFrames[uIdx]++;
|
|
|
+ pStatistic->ullTxMulticastBytes[uIdx] += (unsigned long long) cbFrameLength;
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ pStatistic->ullTxDirectedFrames[uIdx]++;
|
|
|
+ pStatistic->ullTxDirectedBytes[uIdx] += (unsigned long long) cbFrameLength;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ if (byTSR1 & TSR1_TERR)
|
|
|
+ pStatistic->dwTsrErr[uIdx]++;
|
|
|
+ if (byTSR1 & TSR1_RETRYTMO)
|
|
|
+ pStatistic->dwTsrRetryTimeout[uIdx]++;
|
|
|
+ if (byTSR1 & TSR1_TMO)
|
|
|
+ pStatistic->dwTsrTransmitTimeout[uIdx]++;
|
|
|
+ if (byTSR1 & ACK_DATA)
|
|
|
+ pStatistic->dwTsrACKData[uIdx]++;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (is_broadcast_ether_addr(pbyDestAddr))
|
|
|
+ pStatistic->dwTsrBroadcast[uIdx]++;
|
|
|
+ else if (is_multicast_ether_addr(pbyDestAddr))
|
|
|
+ pStatistic->dwTsrMulticast[uIdx]++;
|
|
|
+ else
|
|
|
+ pStatistic->dwTsrDirected[uIdx]++;
|
|
|
|
|
|
}
|
|
|
|
|
@@ -520,20 +520,20 @@ STAvUpdateTDStatCounter (
|
|
|
*
|
|
|
*/
|
|
|
void
|
|
|
-STAvUpdateTDStatCounterEx (
|
|
|
- PSStatCounter pStatistic,
|
|
|
- unsigned char *pbyBuffer,
|
|
|
- unsigned long cbFrameLength
|
|
|
- )
|
|
|
+STAvUpdateTDStatCounterEx(
|
|
|
+ PSStatCounter pStatistic,
|
|
|
+ unsigned char *pbyBuffer,
|
|
|
+ unsigned long cbFrameLength
|
|
|
+)
|
|
|
{
|
|
|
- unsigned int uPktLength;
|
|
|
+ unsigned int uPktLength;
|
|
|
|
|
|
- uPktLength = (unsigned int)cbFrameLength;
|
|
|
+ uPktLength = (unsigned int)cbFrameLength;
|
|
|
|
|
|
- // tx length
|
|
|
- pStatistic->dwCntTxBufLength = uPktLength;
|
|
|
- // tx pattern, we just see 16 bytes for sample
|
|
|
- memcpy(pStatistic->abyCntTxPattern, pbyBuffer, 16);
|
|
|
+ // tx length
|
|
|
+ pStatistic->dwCntTxBufLength = uPktLength;
|
|
|
+ // tx pattern, we just see 16 bytes for sample
|
|
|
+ memcpy(pStatistic->abyCntTxPattern, pbyBuffer, 16);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -553,28 +553,28 @@ STAvUpdateTDStatCounterEx (
|
|
|
*/
|
|
|
void
|
|
|
STAvUpdate802_11Counter(
|
|
|
- PSDot11Counters p802_11Counter,
|
|
|
- PSStatCounter pStatistic,
|
|
|
- unsigned long dwCounter
|
|
|
- )
|
|
|
+ PSDot11Counters p802_11Counter,
|
|
|
+ PSStatCounter pStatistic,
|
|
|
+ unsigned long dwCounter
|
|
|
+)
|
|
|
{
|
|
|
- //p802_11Counter->TransmittedFragmentCount
|
|
|
- p802_11Counter->MulticastTransmittedFrameCount = (unsigned long long) (pStatistic->dwTsrBroadcast[TYPE_AC0DMA] +
|
|
|
- pStatistic->dwTsrBroadcast[TYPE_TXDMA0] +
|
|
|
- pStatistic->dwTsrMulticast[TYPE_AC0DMA] +
|
|
|
- pStatistic->dwTsrMulticast[TYPE_TXDMA0]);
|
|
|
- p802_11Counter->FailedCount = (unsigned long long) (pStatistic->dwTsrErr[TYPE_AC0DMA] + pStatistic->dwTsrErr[TYPE_TXDMA0]);
|
|
|
- p802_11Counter->RetryCount = (unsigned long long) (pStatistic->dwTsrRetry[TYPE_AC0DMA] + pStatistic->dwTsrRetry[TYPE_TXDMA0]);
|
|
|
- p802_11Counter->MultipleRetryCount = (unsigned long long) (pStatistic->dwTsrMoreThanOnceRetry[TYPE_AC0DMA] +
|
|
|
- pStatistic->dwTsrMoreThanOnceRetry[TYPE_TXDMA0]);
|
|
|
- //p802_11Counter->FrameDuplicateCount
|
|
|
- p802_11Counter->RTSSuccessCount += (unsigned long long) (dwCounter & 0x000000ff);
|
|
|
- p802_11Counter->RTSFailureCount += (unsigned long long) ((dwCounter & 0x0000ff00) >> 8);
|
|
|
- p802_11Counter->ACKFailureCount += (unsigned long long) ((dwCounter & 0x00ff0000) >> 16);
|
|
|
- p802_11Counter->FCSErrorCount += (unsigned long long) ((dwCounter & 0xff000000) >> 24);
|
|
|
- //p802_11Counter->ReceivedFragmentCount
|
|
|
- p802_11Counter->MulticastReceivedFrameCount = (unsigned long long) (pStatistic->dwRsrBroadcast +
|
|
|
- pStatistic->dwRsrMulticast);
|
|
|
+ //p802_11Counter->TransmittedFragmentCount
|
|
|
+ p802_11Counter->MulticastTransmittedFrameCount = (unsigned long long) (pStatistic->dwTsrBroadcast[TYPE_AC0DMA] +
|
|
|
+ pStatistic->dwTsrBroadcast[TYPE_TXDMA0] +
|
|
|
+ pStatistic->dwTsrMulticast[TYPE_AC0DMA] +
|
|
|
+ pStatistic->dwTsrMulticast[TYPE_TXDMA0]);
|
|
|
+ p802_11Counter->FailedCount = (unsigned long long) (pStatistic->dwTsrErr[TYPE_AC0DMA] + pStatistic->dwTsrErr[TYPE_TXDMA0]);
|
|
|
+ p802_11Counter->RetryCount = (unsigned long long) (pStatistic->dwTsrRetry[TYPE_AC0DMA] + pStatistic->dwTsrRetry[TYPE_TXDMA0]);
|
|
|
+ p802_11Counter->MultipleRetryCount = (unsigned long long) (pStatistic->dwTsrMoreThanOnceRetry[TYPE_AC0DMA] +
|
|
|
+ pStatistic->dwTsrMoreThanOnceRetry[TYPE_TXDMA0]);
|
|
|
+ //p802_11Counter->FrameDuplicateCount
|
|
|
+ p802_11Counter->RTSSuccessCount += (unsigned long long) (dwCounter & 0x000000ff);
|
|
|
+ p802_11Counter->RTSFailureCount += (unsigned long long) ((dwCounter & 0x0000ff00) >> 8);
|
|
|
+ p802_11Counter->ACKFailureCount += (unsigned long long) ((dwCounter & 0x00ff0000) >> 16);
|
|
|
+ p802_11Counter->FCSErrorCount += (unsigned long long) ((dwCounter & 0xff000000) >> 24);
|
|
|
+ //p802_11Counter->ReceivedFragmentCount
|
|
|
+ p802_11Counter->MulticastReceivedFrameCount = (unsigned long long) (pStatistic->dwRsrBroadcast +
|
|
|
+ pStatistic->dwRsrMulticast);
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -592,6 +592,6 @@ STAvUpdate802_11Counter(
|
|
|
void
|
|
|
STAvClear802_11Counter(PSDot11Counters p802_11Counter)
|
|
|
{
|
|
|
- // set memory to zero
|
|
|
+ // set memory to zero
|
|
|
memset(p802_11Counter, 0, sizeof(SDot11Counters));
|
|
|
}
|