staging: vt6656: removed Calcu_LinkQual definition

Removed an always defined macro, perhaps used to patch the driver

Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Andres More 2010-07-12 14:24:48 -03:00 committed by Greg Kroah-Hartman
parent 24fe608a2d
commit 8efe1ab3a9
7 changed files with 0 additions and 35 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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