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

Staging: rt2870: remove dead CARRIER_DETECTION_SUPPORT code 



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

drivers/staging/rt2870/common/cmm_data.c

+0 −2
Original line number Diff line number Diff line
@@ -206,8 +206,6 @@ NDIS_STATUS MlmeHardTransmit( 
	IN	PNDIS_PACKET	pPacket)

{

	if ((pAd->CommonCfg.RadarDetect.RDMode != RD_NORMAL_MODE)

#ifdef CARRIER_DETECTION_SUPPORT

#endif // CARRIER_DETECTION_SUPPORT //

		)

	{

		return NDIS_STATUS_FAILURE;

drivers/staging/rt2870/common/cmm_sync.c

+0 −10
Original line number Diff line number Diff line
@@ -495,17 +495,7 @@ VOID ScanNextChannel( 
					ScanTimeIn5gChannel = MIN_CHANNEL_TIME;

				}

			}



#ifdef CARRIER_DETECTION_SUPPORT // Roger sync Carrier

			// carrier detection

			if (pAd->CommonCfg.CarrierDetect.Enable == TRUE)

			{

				ScanType = SCAN_PASSIVE;

				ScanTimeIn5gChannel = MIN_CHANNEL_TIME;

			}

#endif // CARRIER_DETECTION_SUPPORT //

		}



#endif // CONFIG_STA_SUPPORT //



		//Global country domain(ch1-11:active scan, ch12-14 passive scan)

drivers/staging/rt2870/common/mlme.c

+0 −19
Original line number Diff line number Diff line
@@ -1198,14 +1198,6 @@ VOID STAMlmePeriodicExec( 
				}

				else

				{

#ifdef CARRIER_DETECTION_SUPPORT // Roger sync Carrier

					if (pAd->CommonCfg.CarrierDetect.Enable == TRUE)

					{

						if ((pAd->Mlme.OneSecPeriodicRound % 5) == 1)

							MlmeAutoReconnectLastSSID(pAd);

					}

					else

#endif // CARRIER_DETECTION_SUPPORT //

						MlmeAutoReconnectLastSSID(pAd);

				}

			}
@@ -1739,14 +1731,6 @@ VOID MlmeCalculateChannelQuality( 
	CHAR  MaxRssi;

	ULONG BeaconLostTime = BEACON_LOST_TIME;



#ifdef CARRIER_DETECTION_SUPPORT // Roger sync Carrier

	// longer beacon lost time when carrier detection enabled

	if (pAd->CommonCfg.CarrierDetect.Enable == TRUE)

	{

		BeaconLostTime = BEACON_LOST_TIME + BEACON_LOST_TIME/2;

	}

#endif // CARRIER_DETECTION_SUPPORT //



	MaxRssi = RTMPMaxRssi(pAd, pAd->StaCfg.RssiSample.LastRssi0, pAd->StaCfg.RssiSample.LastRssi1, pAd->StaCfg.RssiSample.LastRssi2);



	//
@@ -3941,9 +3925,6 @@ VOID BssTableSsidSort( 
		if (((pAd->CommonCfg.bIEEE80211H == 1) &&

            (pAd->MlmeAux.Channel > 14) &&

             RadarChannelCheck(pAd, pInBss->Channel))

#ifdef CARRIER_DETECTION_SUPPORT // Roger sync Carrier

             || (pAd->CommonCfg.CarrierDetect.Enable == TRUE)

#endif // CARRIER_DETECTION_SUPPORT //

            )

		{

			if (pInBss->Hidden)

drivers/staging/rt2870/rt_profile.c

+0 −18
Original line number Diff line number Diff line
@@ -1466,24 +1466,6 @@ NDIS_STATUS RTMPReadParametersHook( 
					HTParametersHook(pAd, tmpbuf, buffer);

#endif // DOT11_N_SUPPORT //





#ifdef CARRIER_DETECTION_SUPPORT

						//CarrierDetect

						if(RTMPGetKeyParameter("CarrierDetect", tmpbuf, 128, buffer))

						{

							if ((strncmp(tmpbuf, "0", 1) == 0))

								pAd->CommonCfg.CarrierDetect.Enable = FALSE;

							else if ((strncmp(tmpbuf, "1", 1) == 0))

								pAd->CommonCfg.CarrierDetect.Enable = TRUE;

							else

								pAd->CommonCfg.CarrierDetect.Enable = FALSE;



							DBGPRINT(RT_DEBUG_TRACE, ("CarrierDetect.Enable=%d\n", pAd->CommonCfg.CarrierDetect.Enable));

						}

						else

							pAd->CommonCfg.CarrierDetect.Enable = FALSE;

#endif // CARRIER_DETECTION_SUPPORT //



#ifdef CONFIG_STA_SUPPORT

					IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

					{

drivers/staging/rt2870/rtmp.h

+0 −21
Original line number Diff line number Diff line
@@ -1320,23 +1320,6 @@ typedef struct _RADAR_DETECT_STRUCT { 
	UINT8		LongPulseRadarTh;

} RADAR_DETECT_STRUCT, *PRADAR_DETECT_STRUCT;



#ifdef CARRIER_DETECTION_SUPPORT

typedef enum CD_STATE_n

{

	CD_NORMAL,

	CD_SILENCE,

	CD_MAX_STATE

} CD_STATE;



typedef struct CARRIER_DETECTION_s

{

	BOOLEAN					Enable;

	UINT8					CDSessionTime;

	UINT8					CDPeriod;

	CD_STATE				CD_State;

} CARRIER_DETECTION, *PCARRIER_DETECTION;

#endif // CARRIER_DETECTION_SUPPORT //



typedef enum _REC_BLOCKACK_STATUS

{

    Recipient_NONE=0,
@@ -1821,10 +1804,6 @@ typedef struct _COMMON_CONFIG { 
	// IEEE802.11H--DFS.

	RADAR_DETECT_STRUCT	RadarDetect;



#ifdef CARRIER_DETECTION_SUPPORT

	CARRIER_DETECTION		CarrierDetect;

#endif // CARRIER_DETECTION_SUPPORT //



#ifdef DOT11_N_SUPPORT

	// HT

	UCHAR			BASize;		// USer desired BAWindowSize. Should not exceed our max capability