From d9cbe5ba7cfdbae0bb80c9b1524641fa0a1ac9d5 Mon Sep 17 00:00:00 2001 From: Andres More Date: Mon, 12 Jul 2010 14:24:48 -0300 Subject: [PATCH] --- yaml --- r: 205903 b: refs/heads/master c: 8efe1ab3a969cdaff4b9aefb9f67efda4e6e979d h: refs/heads/master i: 205901: 1bc04c42db3b67178c7c98fc257aeb174d6ded93 205899: 6c45e7fd6c1355e63f5e5732f58af5ba4e33bb84 205895: 743cb20e03d14685c4a5f2b1ca66843a5c2c79f3 205887: 3f3cfb4f336ce8ba2beb0e807286d943d8c431c7 v: v3 --- [refs] | 2 +- trunk/drivers/staging/vt6656/bssdb.c | 7 ------- trunk/drivers/staging/vt6656/dpc.c | 6 ------ trunk/drivers/staging/vt6656/iwctl.c | 8 -------- trunk/drivers/staging/vt6656/mib.c | 4 ---- trunk/drivers/staging/vt6656/mib.h | 2 -- trunk/drivers/staging/vt6656/ttype.h | 4 ---- trunk/drivers/staging/vt6656/usbpipe.c | 4 ---- 8 files changed, 1 insertion(+), 36 deletions(-) diff --git a/[refs] b/[refs] index 5babdeeb44a7..2b712df4fd75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24fe608a2d4d78cc1a5f5424a4db5c13e3a00983 +refs/heads/master: 8efe1ab3a969cdaff4b9aefb9f67efda4e6e979d diff --git a/trunk/drivers/staging/vt6656/bssdb.c b/trunk/drivers/staging/vt6656/bssdb.c index 830dd23b9279..4d51b8bc61ff 100644 --- a/trunk/drivers/staging/vt6656/bssdb.c +++ b/trunk/drivers/staging/vt6656/bssdb.c @@ -93,10 +93,7 @@ const WORD awHWRetry1[5][5] = { void s_vCheckSensitivity(void *hDeviceContext); void s_vCheckPreEDThreshold(void *hDeviceContext); - -#ifdef Calcu_LinkQual void s_uCalculateLinkQual(void *hDeviceContext); -#endif /*--------------------- Export Variables --------------------------*/ @@ -1015,9 +1012,7 @@ if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) && } pMgmt->eLastState = pMgmt->eCurrState ; -#ifdef Calcu_LinkQual s_uCalculateLinkQual((void *)pDevice); -#endif for (ii = 0; ii < (MAX_NODE_NUM + 1); ii++) { @@ -1573,7 +1568,6 @@ void s_vCheckSensitivity(void *hDeviceContext) } } -#ifdef Calcu_LinkQual void s_uCalculateLinkQual(void *hDeviceContext) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -1618,7 +1612,6 @@ else pDevice->scStatistic.TxRetryOkCount = 0; return; } -#endif void BSSvClearAnyBSSJoinRecord(void *hDeviceContext) { diff --git a/trunk/drivers/staging/vt6656/dpc.c b/trunk/drivers/staging/vt6656/dpc.c index 81ce46fe0520..68c13aa56819 100644 --- a/trunk/drivers/staging/vt6656/dpc.c +++ b/trunk/drivers/staging/vt6656/dpc.c @@ -342,9 +342,7 @@ RXbBulkInProcessData ( PBYTE pbyRxSts; PBYTE pbyRxRate; PBYTE pbySQ; -#ifdef Calcu_LinkQual PBYTE pby3SQ; -#endif unsigned int cbHeaderSize; PSKeyItem pKey = NULL; WORD wRxTSC15_0 = 0; @@ -415,7 +413,6 @@ RXbBulkInProcessData ( wPLCPwithPadding = ( (*pwPLCP_Length / 4) + ( (*pwPLCP_Length % 4) ? 1:0 ) ) *4; pqwTSFTime = (PQWORD) (pbyDAddress + 8 + wPLCPwithPadding); -#ifdef Calcu_LinkQual if(pDevice->byBBType == BB_TYPE_11G) { pby3SQ = pbyDAddress + 8 + wPLCPwithPadding + 12; pbySQ = pby3SQ; @@ -424,9 +421,6 @@ RXbBulkInProcessData ( pbySQ = pbyDAddress + 8 + wPLCPwithPadding + 8; pby3SQ = pbySQ; } -#else - pbySQ = pbyDAddress + 8 + wPLCPwithPadding + 8; -#endif pbyNewRsr = pbyDAddress + 8 + wPLCPwithPadding + 9; pbyRSSI = pbyDAddress + 8 + wPLCPwithPadding + 10; pbyRsr = pbyDAddress + 8 + wPLCPwithPadding + 11; diff --git a/trunk/drivers/staging/vt6656/iwctl.c b/trunk/drivers/staging/vt6656/iwctl.c index b4c405168d26..016b8e7766f3 100644 --- a/trunk/drivers/staging/vt6656/iwctl.c +++ b/trunk/drivers/staging/vt6656/iwctl.c @@ -83,13 +83,9 @@ struct iw_statistics *iwctl_get_wireless_stats(struct net_device *dev) long ldBm; pDevice->wstats.status = pDevice->eOPMode; - #ifdef Calcu_LinkQual if(pDevice->scStatistic.LinkQuality > 100) pDevice->scStatistic.LinkQuality = 100; pDevice->wstats.qual.qual =(BYTE) pDevice->scStatistic.LinkQuality; - #else - pDevice->wstats.qual.qual = pDevice->byCurrSQ; - #endif RFvRSSITodBm(pDevice, (BYTE)(pDevice->uCurrRSSI), &ldBm); pDevice->wstats.qual.level = ldBm; //pDevice->wstats.qual.level = 0x100 - pDevice->uCurrRSSI; @@ -583,11 +579,7 @@ int iwctl_giwrange(struct net_device *dev, } range->num_frequency = k; // Hum... Should put the right values there - #ifdef Calcu_LinkQual range->max_qual.qual = 100; - #else - range->max_qual.qual = 255; - #endif range->max_qual.level = 0; range->max_qual.noise = 0; range->sensitivity = 255; diff --git a/trunk/drivers/staging/vt6656/mib.c b/trunk/drivers/staging/vt6656/mib.c index b694fc86d740..f5a0647886ba 100644 --- a/trunk/drivers/staging/vt6656/mib.c +++ b/trunk/drivers/staging/vt6656/mib.c @@ -467,12 +467,10 @@ STAvUpdateTDStatCounter ( } if ( !(byTSR & (TSR_TMO | TSR_RETRYTMO))) { -#ifdef Calcu_LinkQual if (byRetyCnt < 2) pStatistic->TxNoRetryOkCount ++; else pStatistic->TxRetryOkCount ++; -#endif pStatistic->ullTsrOK++; pStatistic->CustomStat.ullTsrAllOK++; @@ -493,9 +491,7 @@ STAvUpdateTDStatCounter ( } else { -#ifdef Calcu_LinkQual pStatistic->TxFailCount ++; -#endif pStatistic->dwTsrErr++; if (byTSR & TSR_RETRYTMO) diff --git a/trunk/drivers/staging/vt6656/mib.h b/trunk/drivers/staging/vt6656/mib.h index 050dd9c05d5c..ee73fc6bf6c3 100644 --- a/trunk/drivers/staging/vt6656/mib.h +++ b/trunk/drivers/staging/vt6656/mib.h @@ -356,7 +356,6 @@ typedef struct tagSStatCounter { SCustomCounters CustomStat; - #ifdef Calcu_LinkQual //Tx count: unsigned long TxNoRetryOkCount; /* success tx no retry ! */ unsigned long TxRetryOkCount; /* success tx but retry ! */ @@ -367,7 +366,6 @@ typedef struct tagSStatCounter { //statistic unsigned long SignalStren; unsigned long LinkQuality; - #endif } SStatCounter, *PSStatCounter; diff --git a/trunk/drivers/staging/vt6656/ttype.h b/trunk/drivers/staging/vt6656/ttype.h index a7517a7c8041..9581c1468a83 100644 --- a/trunk/drivers/staging/vt6656/ttype.h +++ b/trunk/drivers/staging/vt6656/ttype.h @@ -40,10 +40,6 @@ typedef int BOOL; #define FALSE 0 #endif -#ifndef Calcu_LinkQual -#define Calcu_LinkQual -#endif - /****** Simple typedefs ***************************************************/ typedef unsigned char BYTE; // 8-bit diff --git a/trunk/drivers/staging/vt6656/usbpipe.c b/trunk/drivers/staging/vt6656/usbpipe.c index bb79ccf3953d..2bdce572d322 100644 --- a/trunk/drivers/staging/vt6656/usbpipe.c +++ b/trunk/drivers/staging/vt6656/usbpipe.c @@ -591,9 +591,7 @@ s_nsBulkInUsbIoCompleteRead( pDevice->ulBulkInError++; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BULK In failed %d\n", status); - #ifdef Calcu_LinkQual pDevice->scStatistic.RxFcsErrCnt ++; - #endif //todo...xxxxxx // if (status == USBD_STATUS_CRC) { // pDevice->ulBulkInContCRCError++; @@ -607,9 +605,7 @@ s_nsBulkInUsbIoCompleteRead( pDevice->ulBulkInContCRCError = 0; pDevice->ulBulkInBytesRead += bytesRead; - #ifdef Calcu_LinkQual pDevice->scStatistic.RxOkCnt ++; - #endif }