Commit 99db6000 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rt3070: remove dead RALINK_ATE code 



Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ae2d5411

drivers/staging/rt3070/common/2870_rtmp_init.c

+1 −18
Original line number Diff line number Diff line
@@ -503,10 +503,6 @@ NDIS_STATUS RTMPAllocTxRxRingMemory( 
			NdisAllocateSpinLock(&pAd->TxContextQueueLock[num]);

		}



#ifdef RALINK_ATE

		NdisAllocateSpinLock(&pAd->GenericLock);

#endif // RALINK_ATE //



//		NdisAllocateSpinLock(&pAd->MemLock);	// Not used in RT28XX



//		NdisAllocateSpinLock(&pAd->MacTabLock); // init it in UserCfgInit()
@@ -672,9 +668,7 @@ VOID RTMPFreeTxRxRingMemory( 
	NdisFreeSpinLock(&pAd->MLMEBulkOutLock);



	NdisFreeSpinLock(&pAd->CmdQLock);

#ifdef RALINK_ATE

	NdisFreeSpinLock(&pAd->GenericLock);

#endif // RALINK_ATE //



	// Clear all pending bulk-out request flags.

	RTUSB_CLEAR_BULK_FLAG(pAd, 0xffffffff);
@@ -1182,17 +1176,6 @@ static void rx_done_tasklet(unsigned long data) 


	ASSERT((pRxContext->InUse == pRxContext->IRPPending));



#ifdef RALINK_ATE

	if (ATE_ON(pAd))

    {

		// If the driver is in ATE mode and Rx frame is set into here.

		if (pAd->ContinBulkIn == TRUE)

		{

			RTUSBBulkReceive(pAd);

		}

	}

	else

#endif // RALINK_ATE //

	RTUSBBulkReceive(pAd);



	return;

drivers/staging/rt3070/common/action.c

+0 −5
Original line number Diff line number Diff line
@@ -881,11 +881,6 @@ VOID ORIBATimerTimeout( 
//	USHORT			Sequence;

	UCHAR			TID;



#ifdef RALINK_ATE

	if (ATE_ON(pAd))

		return;

#endif // RALINK_ATE //



	total = pAd->MacTab.Size * NUM_OF_TID;



	for (i = 1; ((i <MAX_LEN_OF_BA_ORI_TABLE) && (total > 0)) ; i++)

drivers/staging/rt3070/common/ba_action.c

+0 −6
Original line number Diff line number Diff line
@@ -1081,12 +1081,6 @@ VOID BAOriSessionSetupTimeout( 
	}

#endif // CONFIG_STA_SUPPORT //



#ifdef RALINK_ATE

	// Nothing to do in ATE mode.

	if (ATE_ON(pAd))

		return;

#endif // RALINK_ATE //



	pEntry = &pAd->MacTab.Content[pBAEntry->Wcid];



	if ((pBAEntry->ORI_BA_Status == Originator_WaitRes) && (pBAEntry->Token < ORI_SESSION_MAX_RETRY))

drivers/staging/rt3070/common/cmm_sync.c

+0 −6
Original line number Diff line number Diff line
@@ -397,12 +397,6 @@ VOID ScanNextChannel( 
	}

#endif // CONFIG_STA_SUPPORT //



#ifdef RALINK_ATE

	// Nothing to do in ATE mode.

	if (ATE_ON(pAd))

		return;

#endif // RALINK_ATE //



	if (pAd->MlmeAux.Channel == 0)

	{

		if ((pAd->CommonCfg.BBPCurrentBW == BW_40)

drivers/staging/rt3070/common/mlme.c

+0 −83
Original line number Diff line number Diff line
@@ -590,14 +590,6 @@ VOID MlmeHandler( 
			break;

		}



#ifdef RALINK_ATE

		if(ATE_ON(pAd))

		{

			DBGPRINT(RT_DEBUG_TRACE, ("The driver is in ATE mode now in MlmeHandler\n"));

			break;

		}

#endif // RALINK_ATE //



		//From message type, determine which state machine I should drive

		if (MlmeDequeue(&pAd->Mlme.Queue, &Elem))

		{
@@ -844,18 +836,6 @@ VOID MlmePeriodicExec( 


	RT28XX_MLME_PRE_SANITY_CHECK(pAd);



#ifdef RALINK_ATE

	/* Do not show RSSI until "Normal 1 second Mlme PeriodicExec". */

	if (ATE_ON(pAd))

	{

		if (pAd->Mlme.PeriodicRound % MLME_TASK_EXEC_MULTIPLE != (MLME_TASK_EXEC_MULTIPLE - 1))

	{

			pAd->Mlme.PeriodicRound ++;

			return;

		}

	}

#endif // RALINK_ATE //



#ifdef CONFIG_STA_SUPPORT

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	{
@@ -913,30 +893,6 @@ VOID MlmePeriodicExec( 
	{

                pAd->Mlme.OneSecPeriodicRound ++;



#ifdef RALINK_ATE

    	if (ATE_ON(pAd))

    	{

			/* request from Baron : move this routine from later to here */

			/* for showing Rx error count in ATE RXFRAME */

            NICUpdateRawCounters(pAd);

			if (pAd->ate.bRxFer == 1)

			{

				pAd->ate.RxTotalCnt += pAd->ate.RxCntPerSec;

			    ate_print(KERN_EMERG "MlmePeriodicExec: Rx packet cnt = %d/%d\n", pAd->ate.RxCntPerSec, pAd->ate.RxTotalCnt);

				pAd->ate.RxCntPerSec = 0;



				if (pAd->ate.RxAntennaSel == 0)

					ate_print(KERN_EMERG "MlmePeriodicExec: Rx AvgRssi0=%d, AvgRssi1=%d, AvgRssi2=%d\n\n",

						pAd->ate.AvgRssi0, pAd->ate.AvgRssi1, pAd->ate.AvgRssi2);

				else

					ate_print(KERN_EMERG "MlmePeriodicExec: Rx AvgRssi=%d\n\n", pAd->ate.AvgRssi0);

			}

			MlmeResetRalinkCounters(pAd);

			return;

    	}

#endif // RALINK_ATE //





		if (rx_Total)

		{
@@ -1052,17 +1008,6 @@ VOID STAMlmePeriodicExec( 
	ULONG			    TxTotalCnt;

	int 	i;



//

// We return here in ATE mode, because the statistics

// that ATE needs are not collected via this routine.

//

#ifdef RALINK_ATE

	// It is supposed that we will never reach here in ATE mode.

	ASSERT(!(ATE_ON(pAd)));

	if (ATE_ON(pAd))

		return;

#endif // RALINK_ATE //



#ifdef WPA_SUPPLICANT_SUPPORT

    if (pAd->StaCfg.WpaSupplicantUP == WPA_SUPPLICANT_DISABLE)

#endif // WPA_SUPPLICANT_SUPPORT //
@@ -2024,13 +1969,6 @@ VOID MlmeDynamicTxRateSwitching( 
	ULONG					TxRetransmit = 0, TxSuccess = 0, TxFailCount = 0;

	MAC_TABLE_ENTRY			*pEntry;



#ifdef RALINK_ATE

	if (ATE_ON(pAd))

	{

		return;

	}

#endif // RALINK_ATE //



	//

	// walk through MAC table, see if need to change AP's TX rate toward each entry

	//
@@ -4870,12 +4808,6 @@ BOOLEAN MlmeEnqueueForRecv( 
	INT		 MsgType;

	MLME_QUEUE	*Queue = (MLME_QUEUE *)&pAd->Mlme.Queue;



#ifdef RALINK_ATE

	/* Nothing to do in ATE mode */

	if(ATE_ON(pAd))

		return FALSE;

#endif // RALINK_ATE //



	// Do nothing if the driver is starting halt state.

	// This might happen when timer already been fired before cancel timer with mlmehalt

	if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_HALT_IN_PROGRESS | fRTMP_ADAPTER_NIC_NOT_EXIST))
@@ -5550,11 +5482,6 @@ VOID AsicUpdateProtect( 
	UCHAR			i;

	UINT32 MacReg = 0;



#ifdef RALINK_ATE

	if (ATE_ON(pAd))

		return;

#endif // RALINK_ATE //



#ifdef DOT11_N_SUPPORT

	if (!(pAd->CommonCfg.bHTProtect) && (OperationMode != 8))

	{
@@ -8411,11 +8338,6 @@ VOID AsicEvaluateRxAnt( 
{

	UCHAR	BBPR3 = 0;



#ifdef RALINK_ATE

	if (ATE_ON(pAd))

		return;

#endif // RALINK_ATE //



	if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RESET_IN_PROGRESS	|

							fRTMP_ADAPTER_HALT_IN_PROGRESS	|

							fRTMP_ADAPTER_RADIO_OFF			|
@@ -8530,11 +8452,6 @@ VOID AsicRxAntEvalTimeout( 
	CHAR			larger = -127, rssi0, rssi1, rssi2;

#endif // CONFIG_STA_SUPPORT //



#ifdef RALINK_ATE

	if (ATE_ON(pAd))

		return;

#endif // RALINK_ATE //



	if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RESET_IN_PROGRESS	|

							fRTMP_ADAPTER_HALT_IN_PROGRESS	|

							fRTMP_ADAPTER_RADIO_OFF			|