Staging: vt665x: remove tbit.h (8a3d91b0) · Commits · jan.koester / Linux

drivers/staging/vt6656/baseband.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@
		*/

		#include "tmacro.h"
		#include "tbit.h"
		#include "tether.h"
		#include "mac.h"
		#include "baseband.h"

drivers/staging/vt6656/bssdb.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -55,7 +55,6 @@
		#include "card.h"
		#include "mac.h"
		#include "wpa2.h"
		#include "tbit.h"
		#include "control.h"
		#include "rndis.h"
		#include "iowpa.h"
		@@ -1437,7 +1436,7 @@ BSSvUpdateNodeTxCounter(
		//DBG_PRN_GRP21(("Device %08X, wRate %04X, byTSR %02X\n", hDeviceContext, wRate, byTSR));
		if (pMgmt->eCurrMode == WMAC_MODE_ESS_STA) {
		pMgmt->sNodeDBTable[0].uTxAttempts += 1;
		if (BITbIsAllBitsOff(byTSR, (TSR_TMO \| TSR_RETRYTMO))) {
		if ( !(byTSR & (TSR_TMO \| TSR_RETRYTMO))) {
		// transmit success, TxAttempts at least plus one
		pMgmt->sNodeDBTable[0].uTxOk[MAX_RATE]++;
		if ( (byFallBack == AUTO_FB_NONE) \|\|
		@@ -1489,7 +1488,7 @@ BSSvUpdateNodeTxCounter(

		if (BSSbIsSTAInNodeDB((HANDLE)pDevice, pbyDestAddr, &uNodeIndex)){
		pMgmt->sNodeDBTable[uNodeIndex].uTxAttempts += 1;
		if (BITbIsAllBitsOff(byTSR, (TSR_TMO \| TSR_RETRYTMO))) {
		if ( !(byTSR & (TSR_TMO \| TSR_RETRYTMO))) {
		// transmit success, TxAttempts at least plus one
		pMgmt->sNodeDBTable[uNodeIndex].uTxOk[MAX_RATE]++;
		if ( (byFallBack == AUTO_FB_NONE) \|\|

drivers/staging/vt6656/card.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,6 @@

		#include "tmacro.h"
		#include "card.h"
		#include "tbit.h"
		#include "baseband.h"
		#include "mac.h"
		#include "desc.h"

drivers/staging/vt6656/dpc.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -49,7 +49,6 @@
		#include "tkip.h"
		#include "tcrc.h"
		#include "wctl.h"
		#include "tbit.h"
		#include "hostap.h"
		#include "rf.h"
		#include "iowpa.h"
		@@ -568,7 +567,7 @@ RXbBulkInProcessData (
		//remove the CRC length
		FrameSize -= U_CRC_LEN;

		if ((BITbIsAllBitsOff(*pbyRsr, (RSR_ADDRBROAD \| RSR_ADDRMULTI))) && // unicast address
		if ( !(*pbyRsr & (RSR_ADDRBROAD \| RSR_ADDRMULTI)) && // unicast address
		(IS_FRAGMENT_PKT((pbyFrame)))
		) {
		// defragment
		@@ -663,7 +662,7 @@ RXbBulkInProcessData (
		else {
		if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {
		//In AP mode, hw only check addr1(BSSID or RA) if equal to local MAC.
		if (BITbIsBitOff(*pbyRsr, RSR_BSSIDOK)) {
		if ( !(*pbyRsr & RSR_BSSIDOK)) {
		if (bDeFragRx) {
		if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) {
		DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n",
		@@ -676,7 +675,7 @@ RXbBulkInProcessData (
		else {
		// discard DATA packet while not associate \|\| BSSID error
		if ((pDevice->bLinkPass == FALSE) \|\|
		BITbIsBitOff(*pbyRsr, RSR_BSSIDOK)) {
		!(*pbyRsr & RSR_BSSIDOK)) {
		if (bDeFragRx) {
		if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) {
		DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n",
		@@ -724,7 +723,7 @@ RXbBulkInProcessData (

		if (pDevice->bEnablePSMode) {
		if (IS_FC_MOREDATA((pbyFrame))) {
		if (BITbIsBitOn(*pbyRsr, RSR_ADDROK)) {
		if (*pbyRsr & RSR_ADDROK) {
		//PSbSendPSPOLL((PSDevice)pDevice);
		}
		}

drivers/staging/vt6656/int.c

+7 −8

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@

		#include "int.h"
		#include "mib.h"
		#include "tbit.h"
		#include "tmacro.h"
		#include "mac.h"
		#include "power.h"
		@@ -112,28 +111,28 @@ INTnsProcessData(
		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->s_nsInterruptProcessData\n");

		pINTData = (PSINTData) pDevice->intBuf.pDataBuf;
		if (BITbIsBitOn(pINTData->byTSR0, TSR_VALID)) {
		if (pINTData->byTSR0 & TSR_VALID) {
		STAvUpdateTDStatCounter (&(pDevice->scStatistic), (BYTE) (pINTData->byPkt0 & 0x0F), (BYTE) (pINTData->byPkt0>>4), pINTData->byTSR0);
		BSSvUpdateNodeTxCounter (pDevice, &(pDevice->scStatistic), pINTData->byTSR0, pINTData->byPkt0);
		//DBG_PRN_GRP01(("TSR0 %02x\n", pINTData->byTSR0));
		}
		if (BITbIsBitOn(pINTData->byTSR1, TSR_VALID)) {
		if (pINTData->byTSR1 & TSR_VALID) {
		STAvUpdateTDStatCounter (&(pDevice->scStatistic), (BYTE) (pINTData->byPkt1 & 0x0F), (BYTE) (pINTData->byPkt1>>4), pINTData->byTSR1);
		BSSvUpdateNodeTxCounter (pDevice, &(pDevice->scStatistic), pINTData->byTSR1, pINTData->byPkt1);
		//DBG_PRN_GRP01(("TSR1 %02x\n", pINTData->byTSR1));
		}
		if (BITbIsBitOn(pINTData->byTSR2, TSR_VALID)) {
		if (pINTData->byTSR2 & TSR_VALID) {
		STAvUpdateTDStatCounter (&(pDevice->scStatistic), (BYTE) (pINTData->byPkt2 & 0x0F), (BYTE) (pINTData->byPkt2>>4), pINTData->byTSR2);
		BSSvUpdateNodeTxCounter (pDevice, &(pDevice->scStatistic), pINTData->byTSR2, pINTData->byPkt2);
		//DBG_PRN_GRP01(("TSR2 %02x\n", pINTData->byTSR2));
		}
		if (BITbIsBitOn(pINTData->byTSR3, TSR_VALID)) {
		if (pINTData->byTSR3 & TSR_VALID) {
		STAvUpdateTDStatCounter (&(pDevice->scStatistic), (BYTE) (pINTData->byPkt3 & 0x0F), (BYTE) (pINTData->byPkt3>>4), pINTData->byTSR3);
		BSSvUpdateNodeTxCounter (pDevice, &(pDevice->scStatistic), pINTData->byTSR3, pINTData->byPkt3);
		//DBG_PRN_GRP01(("TSR3 %02x\n", pINTData->byTSR3));
		}
		if ( pINTData->byISR0 != 0 ) {
		if ( BITbIsBitOn(pINTData->byISR0, ISR_BNTX) ) {
		if (pINTData->byISR0 & ISR_BNTX) {

		if (pDevice->eOPMode == OP_MODE_AP) {
		if(pMgmt->byDTIMCount > 0) {
		@@ -154,7 +153,7 @@ INTnsProcessData(
		} else {
		pDevice->bBeaconSent = FALSE;
		}
		if ( BITbIsBitOn(pINTData->byISR0, ISR_TBTT) ) {
		if (pINTData->byISR0 & ISR_TBTT) {
		if ( pDevice->bEnablePSMode ) {
		bScheduleCommand((HANDLE) pDevice, WLAN_CMD_TBTT_WAKEUP, NULL);
		}
		@@ -176,7 +175,7 @@ INTnsProcessData(
		}

		if ( pINTData->byISR1 != 0 ) {
		if ( BITbIsBitOn(pINTData->byISR1, ISR_GPIO3) ) {
		if (pINTData->byISR1 & ISR_GPIO3) {
		bScheduleCommand((HANDLE) pDevice, WLAN_CMD_RADIO, NULL);
		}
		}