Commit a7307538 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: Remove commented out if()s 



Commented out code is just noise.  Remove them.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a4ef27ad

drivers/staging/vt6655/bssdb.c

+0 −12
Original line number Diff line number Diff line
@@ -338,8 +338,6 @@ BSSpAddrIsInBSSList( 
		pBSSList = &(pMgmt->sBSSList[ii]);

		if (pBSSList->bActive) {

			if (!compare_ether_addr(pBSSList->abyBSSID, abyBSSID)) {

//                if (pSSID == NULL)

//                    return pBSSList;

				if (pSSID->len == ((PWLAN_IE_SSID)pBSSList->abySSID)->len) {

					if (memcmp(pSSID->abySSID,

						   ((PWLAN_IE_SSID)pBSSList->abySSID)->abySSID,
@@ -1088,7 +1086,6 @@ BSSvSecondCallBack( 
			printk("Re-association timeout!!!\n");

			pDevice->byReAssocCount = 0;

#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT

			// if (pDevice->bWPASuppWextEnabled == true)

			{

				union iwreq_data  wrqu;

				memset(&wrqu, 0, sizeof(wrqu));
@@ -1246,11 +1243,6 @@ BSSvSecondCallBack( 
	    (pMgmt->eCurrMode == WMAC_MODE_ESS_STA)) {



		if (pMgmt->sNodeDBTable[0].bActive) { // Assoc with BSS

			// DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Callback inactive Count = [%d]\n", pMgmt->sNodeDBTable[0].uInActiveCount);

			//if (pDevice->bUpdateBBVGA) {

			//  s_vCheckSensitivity((void *) pDevice);

			//}



			if (pDevice->bUpdateBBVGA) {

				// s_vCheckSensitivity((void *) pDevice);

				s_vCheckPreEDThreshold((void *)pDevice);
@@ -1285,7 +1277,6 @@ BSSvSecondCallBack( 
					pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);

				}

#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT

				// if (pDevice->bWPASuppWextEnabled == true)

				{

					union iwreq_data  wrqu;

					memset(&wrqu, 0, sizeof(wrqu));
@@ -1394,8 +1385,6 @@ BSSvUpdateNodeTxCounter( 
//	unsigned int txRetryTemp;

//PLICE_DEBUG->

	//txRetryTemp = byTxRetry;

	//if (txRetryTemp== 8)

	//txRetryTemp -=3;

//PLICE_DEBUG <-

	pTxBufHead = (PSTxBufHead) pbyBuffer;

	if (pTxBufHead->wFIFOCtl & FIFOCTL_AUTO_FB_0) {
@@ -1421,7 +1410,6 @@ BSSvUpdateNodeTxCounter( 
				} else if (byFallBack == AUTO_FB_0) {

//PLICE_DEBUG

					if (byTxRetry < 5)

						//if (txRetryTemp < 5)

						wFallBackRate = awHWRetry0[wRate-RATE_18M][byTxRetry];

					//wFallBackRate = awHWRetry0[wRate-RATE_12M][byTxRetry];

					//wFallBackRate = awHWRetry0[wRate-RATE_18M][txRetryTemp] +1;

drivers/staging/vt6655/device_main.c

+0 −9
Original line number Diff line number Diff line
@@ -593,7 +593,6 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType) 
				pDevice->byRxAntennaMode = ANT_B;

			// chester for antenna

			byValue1 = SROMbyReadEmbedded(pDevice->PortOffset, EEP_OFS_ANTENNA);

			//  if (pDevice->bDiversityRegCtlON)

			if ((byValue1 & 0x08) == 0)

				pDevice->bDiversityEnable = false;//SROMbyReadEmbedded(pDevice->PortOffset, 0x50);

			else
@@ -1885,8 +1884,6 @@ static int device_open(struct net_device *dev) { 






	// if ((SROMbyReadEmbedded(pDevice->PortOffset, EEP_OFS_RADIOCTL)&0x06)==0x04)

	//    return -ENOMEM;

	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "call device_init_registers\n");

	device_init_registers(pDevice, DEVICE_INIT_COLD);

	MACvReadEtherAddress(pDevice->PortOffset, pDevice->abyCurrentNetAddr);
@@ -2468,12 +2465,6 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) { 
	}





#ifdef	PLICE_DEBUG

	//if (skb->len == 98)

	//{

	//	printk("ping:len is %d\n");

	//}

#endif

	vGenerateFIFOHeader(pDevice, byPktType, pDevice->pbyTmpBuff, bNeedEncryption,

			    cbFrameBodySize, TYPE_AC0DMA, pHeadTD,

			    &pDevice->sTxEthHeader, (unsigned char *)skb->data, pTransmitKey, uNodeIndex,

drivers/staging/vt6655/dpc.c

+0 −1
Original line number Diff line number Diff line
@@ -815,7 +815,6 @@ device_receive_frame( 
				//2008-0409-07, <Add> by Einsn Liu

#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT

				//send event to wpa_supplicant

				//if (pDevice->bWPADevEnable == true)

				{

					union iwreq_data wrqu;

					struct iw_michaelmicfailure ev;

drivers/staging/vt6655/iwctl.c

+0 −3
Original line number Diff line number Diff line
@@ -812,10 +812,7 @@ int iwctl_siwessid(struct net_device *dev, 
		memset(pMgmt->abyDesireBSSID, 0xFF, 6);

		PRINT_K("set essid to 'any' \n");

#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT

		//Unknown desired AP,so here need not associate??

		//if (pDevice->bWPASuppWextEnabled == true)  {

		return 0;

		// }

#endif

	} else {

		// Set the SSID

drivers/staging/vt6655/mac.c

+0 −10
Original line number Diff line number Diff line
@@ -1042,16 +1042,6 @@ void MACvInitialize(unsigned long dwIoBase) 
	// do reset

	MACbSoftwareReset(dwIoBase);



	// issue AUTOLD in EECSR to reload eeprom

	//MACvRegBitsOn(dwIoBase, MAC_REG_I2MCSR, I2MCSR_AUTOLD);

	// wait until EEPROM loading complete

	//while (true) {

	//    u8 u8Data;

	//    VNSvInPortB(dwIoBase + MAC_REG_I2MCSR, &u8Data);

	//    if (!(u8Data & I2MCSR_AUTOLD))

	//        break;

	//}



	// reset TSF counter

	VNSvOutPortB(dwIoBase + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST);

	// enable TSF counter