diff options
Diffstat (limited to 'drivers/staging/vt6655/mib.c')
| -rw-r--r-- | drivers/staging/vt6655/mib.c | 81 | 
1 files changed, 38 insertions, 43 deletions
diff --git a/drivers/staging/vt6655/mib.c b/drivers/staging/vt6655/mib.c index 6a59652052b..36895970a89 100644 --- a/drivers/staging/vt6655/mib.c +++ b/drivers/staging/vt6655/mib.c @@ -187,75 +187,75 @@ void STAvUpdateRDStatCounter(PSStatCounter pStatistic,  	if (byRxRate == 22) {  		pStatistic->CustomStat.ullRsr11M++; -		if (byRSR & RSR_CRCOK) { +		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) { +		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) { +		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) { +		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) { +		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) { +		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) { +		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) { +		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) { +		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) { +		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) { +		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) { +		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); @@ -288,13 +288,12 @@ void STAvUpdateRDStatCounter(PSStatCounter pStatistic,  	pStatistic->dwRsrRxPacket++;  	pStatistic->dwRsrRxOctet += cbFrameLength; -	if (IS_TYPE_DATA(pbyBuffer)) { +	if (IS_TYPE_DATA(pbyBuffer))  		pStatistic->dwRsrRxData++; -	} else if (IS_TYPE_MGMT(pbyBuffer)) { +	else if (IS_TYPE_MGMT(pbyBuffer))  		pStatistic->dwRsrRxManage++; -	} else if (IS_TYPE_CONTROL(pbyBuffer)) { +	else if (IS_TYPE_CONTROL(pbyBuffer))  		pStatistic->dwRsrRxControl++; -	}  	if (byRSR & RSR_ADDRBROAD)  		pStatistic->dwRsrBroadcast++; @@ -306,23 +305,22 @@ void STAvUpdateRDStatCounter(PSStatCounter pStatistic,  	if (WLAN_GET_FC_MOREFRAG(pHeader->wFrameCtl))  		pStatistic->dwRsrRxFragment++; -	if (cbFrameLength < ETH_ZLEN + 4) { +	if (cbFrameLength < ETH_ZLEN + 4)  		pStatistic->dwRsrRunt++; -	} else if (cbFrameLength == ETH_ZLEN + 4) { +	else if (cbFrameLength == ETH_ZLEN + 4)  		pStatistic->dwRsrRxFrmLen64++; -	} else if ((65 <= cbFrameLength) && (cbFrameLength <= 127)) { +	else if ((65 <= cbFrameLength) && (cbFrameLength <= 127))  		pStatistic->dwRsrRxFrmLen65_127++; -	} else if ((128 <= cbFrameLength) && (cbFrameLength <= 255)) { +	else if ((128 <= cbFrameLength) && (cbFrameLength <= 255))  		pStatistic->dwRsrRxFrmLen128_255++; -	} else if ((256 <= cbFrameLength) && (cbFrameLength <= 511)) { +	else if ((256 <= cbFrameLength) && (cbFrameLength <= 511))  		pStatistic->dwRsrRxFrmLen256_511++; -	} else if ((512 <= cbFrameLength) && (cbFrameLength <= 1023)) { +	else if ((512 <= cbFrameLength) && (cbFrameLength <= 1023))  		pStatistic->dwRsrRxFrmLen512_1023++; -	} else if ((1024 <= cbFrameLength) && (cbFrameLength <= ETH_FRAME_LEN + 4)) { +	else if ((1024 <= cbFrameLength) && (cbFrameLength <= ETH_FRAME_LEN + 4))  		pStatistic->dwRsrRxFrmLen1024_1518++; -	} else if (cbFrameLength > ETH_FRAME_LEN + 4) { +	else if (cbFrameLength > ETH_FRAME_LEN + 4)  		pStatistic->dwRsrLong++; -	}  }  /* @@ -399,11 +397,11 @@ STAvUpdateTDStatCounter(  	unsigned char byTSR0_NCR = byTSR0 & TSR0_NCR;  	pHeader = (PWLAN_80211HDR_A4) pbyBuffer; -	if (WLAN_GET_FC_TODS(pHeader->wFrameCtl) == 0) { +	if (WLAN_GET_FC_TODS(pHeader->wFrameCtl) == 0)  		pbyDestAddr = &(pHeader->abyAddr1[0]); -	} else { +	else  		pbyDestAddr = &(pHeader->abyAddr3[0]); -	} +  	// increase tx packet count  	pStatistic->dwTsrTxPacket[uIdx]++;  	pStatistic->dwTsrTxOctet[uIdx] += cbFrameLength; @@ -504,7 +502,6 @@ STAvUpdate802_11Counter(  	unsigned long dwCounter  )  { -	//p802_11Counter->TransmittedFragmentCount  	p802_11Counter->MulticastTransmittedFrameCount = (unsigned long long) (pStatistic->dwTsrBroadcast[TYPE_AC0DMA] +  									       pStatistic->dwTsrBroadcast[TYPE_TXDMA0] +  									       pStatistic->dwTsrMulticast[TYPE_AC0DMA] + @@ -513,12 +510,10 @@ STAvUpdate802_11Counter(  	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);  }  | 
