Commit 89b28e5d authored by Andres More's avatar Andres More Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: removed '#if 1'/'#if 0' definitions 



Removed code guarded by always false definitions.

Signed-off-by: default avatarAndres More <more.andres@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 73bce12e

drivers/staging/vt6656/datarate.c

+0 −61
Original line number Diff line number Diff line
@@ -309,7 +309,6 @@ RATEvTxRateFallBack( 
{

PSDevice        pDevice = (PSDevice) pDeviceHandler;

PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

#if 1  //mike fixed old: use packet lose ratio algorithm to control rate

WORD            wIdxDownRate = 0;

unsigned int            ii;

BOOL            bAutoRate[MAX_RATE]    = {TRUE,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE};
@@ -389,66 +388,6 @@ DWORD dwTxDiff = 0; 
    s_vResetCounter(psNodeDBTable);

    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Rate: %d, U:%d, D:%d\n", (int)psNodeDBTable->wTxDataRate, (int)wIdxUpRate, (int)wIdxDownRate);

    return;

#else  //mike fixed new: use differ-signal strength to control rate

WORD            wIdxUpRate = 0;

BOOL            bAutoRate[MAX_RATE]    = {TRUE,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE};

unsigned int            ii;

long  ldBm;



    if (pMgmt->eScanState != WMAC_NO_SCANNING) {

        // Don't do Fallback when scanning Channel

        return;

    }



    for (ii = 0; ii < MAX_RATE; ii++) {

        if (psNodeDBTable->wSuppRate & (0x0001<<ii)) {

            if (bAutoRate[ii] == TRUE) {

                wIdxUpRate = (WORD) ii;

            }

        } else {

            bAutoRate[ii] = FALSE;

        }

    }



         RFvRSSITodBm(pDevice, (BYTE)(pDevice->uCurrRSSI), &ldBm);



	if (ldBm > -55) {

		if ( psNodeDBTable->wSuppRate & (0x0001<<RATE_54M) )  //11a/g

      		{

	  		psNodeDBTable->wTxDataRate = RATE_54M;

		}

		else{ //11b

	  		psNodeDBTable->wTxDataRate = RATE_11M;

		}

	}



if (wIdxUpRate == RATE_54M ) {     //11a/g

		if (ldBm > -56 )

			psNodeDBTable->wTxDataRate = RATE_54M;

		else if (ldBm > -61 )

			psNodeDBTable->wTxDataRate = RATE_48M;

		else if (ldBm > -66 )

			psNodeDBTable->wTxDataRate = RATE_36M;

		else if (ldBm > -72 )

			psNodeDBTable->wTxDataRate = RATE_24M;

		else if (ldBm > -80 )

			psNodeDBTable->wTxDataRate = RATE_5M;

		else {

			psNodeDBTable->wTxDataRate = RATE_1M;

			//increasingVGA = TRUE;

		}

	}

	else {  //11b

		if (ldBm > -65 )

			psNodeDBTable->wTxDataRate = RATE_11M;

		else if (ldBm > -75 )

			psNodeDBTable->wTxDataRate = RATE_5M;

		else

			psNodeDBTable->wTxDataRate = RATE_1M;

	}



   return;

#endif

}



/*+

drivers/staging/vt6656/iwctl.c

+0 −18
Original line number Diff line number Diff line
@@ -84,24 +84,6 @@ struct iw_statistics *iwctl_get_wireless_stats(struct net_device *dev) 


	pDevice->wstats.status = pDevice->eOPMode;

	#ifdef Calcu_LinkQual

	 #if 0

	  if(pDevice->byBBType == BB_TYPE_11B) {

	     if(pDevice->byCurrSQ > 120)

                  pDevice->scStatistic.LinkQuality = 100;

	     else

		 pDevice->scStatistic.LinkQuality = pDevice->byCurrSQ*100/120;

	    }

	  else if(pDevice->byBBType == BB_TYPE_11G) {

                if(pDevice->byCurrSQ < 20)

		   pDevice->scStatistic.LinkQuality = 100;

	       else if(pDevice->byCurrSQ >96)

		   pDevice->scStatistic.LinkQuality  = 0;

	       else

		   pDevice->scStatistic.LinkQuality = (96-pDevice->byCurrSQ)*100/76;

	   }

	   if(pDevice->bLinkPass !=TRUE)

	       pDevice->scStatistic.LinkQuality = 0;

	  #endif

	   if(pDevice->scStatistic.LinkQuality > 100)

   	       pDevice->scStatistic.LinkQuality = 100;

               pDevice->wstats.qual.qual =(BYTE) pDevice->scStatistic.LinkQuality;

drivers/staging/vt6656/main_usb.c

+0 −2
Original line number Diff line number Diff line
@@ -1548,7 +1548,6 @@ static int Read_config_file(PSDevice pDevice) { 
 }

}



#if 1

//get other parameter

  {

	memset(tmpbuffer,0,sizeof(tmpbuffer));
@@ -1561,7 +1560,6 @@ static int Read_config_file(PSDevice pDevice) { 
	 pDevice->config_file.eEncryptionStatus= (int) simple_strtol(tmpbuffer, NULL, 10);

       }

  }

#endif



  kfree(buffer);

  return result;

drivers/staging/vt6656/wcmd.c

+0 −4
Original line number Diff line number Diff line
@@ -1291,12 +1291,8 @@ void BSSvSecondTxData(void *hDeviceContext) 


  spin_lock_irq(&pDevice->lock);

  //is wap_supplicant running successful OR only open && sharekey mode!

  #if 1

  if(((pDevice->bLinkPass ==TRUE)&&(pMgmt->eAuthenMode < WMAC_AUTH_WPA)) ||  //open && sharekey linking

      (pDevice->fWPA_Authened == TRUE)) {   //wpa linking

 #else

  if(pDevice->bLinkPass ==TRUE) {

 #endif

        //   printk("mike:%s-->InSleep Tx Data Procedure\n",__FUNCTION__);

	  pDevice->fTxDataInSleep = TRUE;

	  PSbSendNullPacket(pDevice);      //send null packet

drivers/staging/vt6656/wmgr.c

+0 −2
Original line number Diff line number Diff line
@@ -1053,7 +1053,6 @@ s_vMgrRxAssocResponse( 


    }



#if 1

#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT

//need clear flags related to Networkmanager

              pDevice->bwextstep0 = FALSE;
@@ -1062,7 +1061,6 @@ s_vMgrRxAssocResponse( 
              pDevice->bwextstep3 = FALSE;

              pDevice->bWPASuppWextEnabled = FALSE;

#endif

#endif



if(pMgmt->eCurrState == WMAC_STATE_ASSOC)

      timer_expire(pDevice->sTimerCommand, 0);