Merge tag 'ktest-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[~andy/linux] / drivers / staging / vt6655 / mib.c

diff --git a/drivers/staging/vt6655/mib.c b/drivers/staging/vt6655/mib.c
index 830be1c4a68af19f6a5126e55222052d42e6a49b..6a59652052b652f1d558f88fad1f152967e7922e 100644 (file)
--- a/drivers/staging/vt6655/mib.c
+++ b/drivers/staging/vt6655/mib.c
@@ -56,8 +56,6 @@ static int msglevel = MSG_LEVEL_INFO;
 
 /*---------------------  Export Functions  --------------------------*/
 
-
-
 /*
  * Description: Clear All Statistic Counter
  *
@@ -76,7 +74,6 @@ void STAvClearAllCounter(PSStatCounter pStatistic)
        memset(pStatistic, 0, sizeof(SStatCounter));
 }
 
-
 /*
  * Description: Update Isr Statistic Counter
  *
@@ -139,27 +136,10 @@ void STAvUpdateIsrStatCounter(PSStatCounter pStatistic, unsigned long dwIsr)
        if (dwIsr & ISR_RXDMA1)               // ISR, bit12
                pStatistic->ISRStat.dwIsrRx1OK++;             // Rx1 successful
 
-//    if (dwIsr & ISR_ATIMTX)               // ISR, bit13
-//        pStatistic->ISRStat.dwIsrATIMTxOK++;          // ATIMTX successful
-
-//    if (dwIsr & ISR_SYNCTX)               // ISR, bit14
-//        pStatistic->ISRStat.dwIsrSYNCTxOK++;          // SYNCTX successful
-
-//    if (dwIsr & ISR_CFPEND)               // ISR, bit18
-//        pStatistic->ISRStat.dwIsrCFPEnd++;
-
-//    if (dwIsr & ISR_ATIMEND)              // ISR, bit19
-//        pStatistic->ISRStat.dwIsrATIMEnd++;
-
-//    if (dwIsr & ISR_SYNCFLUSHOK)          // ISR, bit20
-//        pStatistic->ISRStat.dwIsrSYNCFlushOK++;
-
        if (dwIsr & ISR_SOFTTIMER1)           // ISR, bit21
                pStatistic->ISRStat.dwIsrSTIMER1Int++;
-
 }
 
-
 /*
  * Description: Update Rx Statistic Counter
  *
@@ -308,7 +288,6 @@ void STAvUpdateRDStatCounter(PSStatCounter pStatistic,
        pStatistic->dwRsrRxPacket++;
        pStatistic->dwRsrRxOctet += cbFrameLength;
 
-
        if (IS_TYPE_DATA(pbyBuffer)) {
                pStatistic->dwRsrRxData++;
        } else if (IS_TYPE_MGMT(pbyBuffer)) {
@@ -344,11 +323,8 @@ void STAvUpdateRDStatCounter(PSStatCounter pStatistic,
        } else if (cbFrameLength > ETH_FRAME_LEN + 4) {
                pStatistic->dwRsrLong++;
        }
-
 }
 
-
-
 /*
  * Description: Update Rx Statistic Counter and copy Rx buffer
  *
@@ -391,7 +367,6 @@ STAvUpdateRDStatCounterEx(
        memcpy(pStatistic->abyCntRxPattern, (unsigned char *)pbyBuffer, 10);
 }
 
-
 /*
  * Description: Update Tx Statistic Counter
  *
@@ -423,8 +398,6 @@ STAvUpdateTDStatCounter(
        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]);
@@ -477,10 +450,8 @@ STAvUpdateTDStatCounter(
                pStatistic->dwTsrMulticast[uIdx]++;
        else
                pStatistic->dwTsrDirected[uIdx]++;
-
 }
 
-
 /*
  * Description: Update Tx Statistic Counter and copy Tx buffer
  *
@@ -512,7 +483,6 @@ STAvUpdateTDStatCounterEx(
        memcpy(pStatistic->abyCntTxPattern, pbyBuffer, 16);
 }
 
-
 /*
  * Description: Update 802.11 mib counter
  *