Staging: rt2870: remove dead CARRIER_DETECTION_SUPPORT code

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rt2870/common/cmm_data.c b/drivers/staging/rt2870/common/cmm_data.c
index 55e0e9c..560d340 100644 (file)
--- a/drivers/staging/rt2870/common/cmm_data.c
+++ b/drivers/staging/rt2870/common/cmm_data.c
@@ -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;

diff --git a/drivers/staging/rt2870/common/cmm_sync.c b/drivers/staging/rt2870/common/cmm_sync.c
index 60a8f02..1d6954e 100644 (file)
--- a/drivers/staging/rt2870/common/cmm_sync.c
+++ b/drivers/staging/rt2870/common/cmm_sync.c
@@ -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)

diff --git a/drivers/staging/rt2870/common/mlme.c b/drivers/staging/rt2870/common/mlme.c
index 1427f83..a446ddd 100644 (file)
--- a/drivers/staging/rt2870/common/mlme.c
+++ b/drivers/staging/rt2870/common/mlme.c
@@ -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)

diff --git a/drivers/staging/rt2870/rt_profile.c b/drivers/staging/rt2870/rt_profile.c
index 467fea3..14d2ee2 100644 (file)
--- a/drivers/staging/rt2870/rt_profile.c
+++ b/drivers/staging/rt2870/rt_profile.c
@@ -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)
                                        {

diff --git a/drivers/staging/rt2870/rtmp.h b/drivers/staging/rt2870/rtmp.h
index eaf958a..5bc83d0 100644 (file)
--- a/drivers/staging/rt2870/rtmp.h
+++ b/drivers/staging/rt2870/rtmp.h
@@ -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

diff --git a/drivers/staging/rt2870/sta/connect.c b/drivers/staging/rt2870/sta/connect.c
index 96114f6..35a61bc 100644 (file)
--- a/drivers/staging/rt2870/sta/connect.c
+++ b/drivers/staging/rt2870/sta/connect.c
@@ -1320,12 +1320,6 @@ VOID LinkUp(
                OPSTATUS_SET_FLAG(pAd, fOP_STATUS_ADHOC_ON);
                OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_INFRA_ON);
 
-#ifdef CARRIER_DETECTION_SUPPORT // Roger sync Carrier
-               // No carrier detection when adhoc
-               // CarrierDetectionStop(pAd);
-               pAd->CommonCfg.CarrierDetect.CD_State = CD_NORMAL;
-#endif // CARRIER_DETECTION_SUPPORT //
-
 #ifdef DOT11_N_SUPPORT
                if (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED)
                        AdhocTurnOnQos(pAd);

diff --git a/drivers/staging/rt2870/sta/rtmp_data.c b/drivers/staging/rt2870/sta/rtmp_data.c
index b10f3a1..5171070 100644 (file)
--- a/drivers/staging/rt2870/sta/rtmp_data.c
+++ b/drivers/staging/rt2870/sta/rtmp_data.c
@@ -2486,15 +2486,6 @@ NDIS_STATUS STAHardTransmit(
 
        pPacket = QUEUE_ENTRY_TO_PACKET(pTxBlk->TxPacketList.Head);
 
-#if 0 //def CARRIER_DETECTION_SUPPORT // Roger sync Carrier
-               if ((pAd->CommonCfg.CarrierDetect.Enable == TRUE) && (isCarrierDetectExist(pAd) == TRUE))
-       {
-               DBGPRINT(RT_DEBUG_INFO,("STAHardTransmit --> radar detect not in normal mode !!!\n"));
-               RELEASE_NDIS_PACKET(pAd, pPacket, NDIS_STATUS_FAILURE);
-               return (NDIS_STATUS_FAILURE);
-       }
-#endif // CARRIER_DETECTION_SUPPORT //
-
        // ------------------------------------------------------------------
        // STEP 1. WAKE UP PHY
        //              outgoing frame always wakeup PHY to prevent frame lost and

diff --git a/drivers/staging/rt2870/sta/sync.c b/drivers/staging/rt2870/sta/sync.c
index 784be31..7689188 100644 (file)
--- a/drivers/staging/rt2870/sta/sync.c
+++ b/drivers/staging/rt2870/sta/sync.c
@@ -360,9 +360,6 @@ VOID MlmeJoinReqAction(
                if (((pAd->CommonCfg.bIEEE80211H == 1) &&
             (pAd->MlmeAux.Channel > 14) &&
              RadarChannelCheck(pAd, pAd->MlmeAux.Channel))
-#ifdef CARRIER_DETECTION_SUPPORT // Roger sync Carrier
-             || (pAd->CommonCfg.CarrierDetect.Enable == TRUE)
-#endif // CARRIER_DETECTION_SUPPORT //
             )
                {
                        //

diff --git a/drivers/staging/rt2870/sta_ioctl.c b/drivers/staging/rt2870/sta_ioctl.c
index 404ee1c..1a074dd 100644 (file)
--- a/drivers/staging/rt2870/sta_ioctl.c
+++ b/drivers/staging/rt2870/sta_ioctl.c
@@ -216,12 +216,6 @@ INT Set_Ieee80211dClientMode_Proc(
     IN  PUCHAR          arg);
 #endif // EXT_BUILD_CHANNEL_LIST //
 
-#ifdef CARRIER_DETECTION_SUPPORT
-INT Set_CarrierDetect_Proc(
-    IN  PRTMP_ADAPTER   pAd,
-    IN  PUCHAR          arg);
-#endif // CARRIER_DETECTION_SUPPORT //
-
 INT    Show_Adhoc_MacTable_Proc(
        IN      PRTMP_ADAPTER   pAd,
        IN      PCHAR                   extra);
@@ -301,10 +295,6 @@ static struct {
 #ifdef EXT_BUILD_CHANNEL_LIST
        {"11dClientMode",                               Set_Ieee80211dClientMode_Proc},
 #endif // EXT_BUILD_CHANNEL_LIST //
-#ifdef CARRIER_DETECTION_SUPPORT
-       {"CarrierDetect",                               Set_CarrierDetect_Proc},
-#endif // CARRIER_DETECTION_SUPPORT //
-
        {NULL,}
 };
 
@@ -6842,22 +6832,6 @@ INT Set_Ieee80211dClientMode_Proc(
 }
 #endif // EXT_BUILD_CHANNEL_LIST //
 
-#ifdef CARRIER_DETECTION_SUPPORT
-INT Set_CarrierDetect_Proc(
-    IN  PRTMP_ADAPTER   pAd,
-    IN  PUCHAR          arg)
-{
-    if (simple_strtol(arg, 0, 10) == 0)
-        pAd->CommonCfg.CarrierDetect.Enable = FALSE;
-    else
-        pAd->CommonCfg.CarrierDetect.Enable = TRUE;
-
-    DBGPRINT(RT_DEBUG_TRACE, ("IF Set_CarrierDetect_Proc::(CarrierDetect.Enable=%d)\n", pAd->CommonCfg.CarrierDetect.Enable));
-       return TRUE;
-}
-#endif // CARRIER_DETECTION_SUPPORT //
-
-
 INT    Show_Adhoc_MacTable_Proc(
        IN      PRTMP_ADAPTER   pAd,
        IN      PCHAR                   extra)