Staging: rt2860: 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/rt2860/common/cmm_sync.c b/drivers/staging/rt2860/common/cmm_sync.c
index 1e88d36f76183f872d24a8dd1d304b8ab09013eb..043eecf6b4fbec35ab98dc18d47657a2cac96f01 100644 (file)
--- a/drivers/staging/rt2860/common/cmm_sync.c
+++ b/drivers/staging/rt2860/common/cmm_sync.c
@@ -486,17 +486,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/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c
index e3ff74393d4cb6f1e9d47f6f821e4be99c284bf5..f6e794ddd69f99b13d6c8a6a74d1973d674a3729 100644 (file)
--- a/drivers/staging/rt2860/common/mlme.c
+++ b/drivers/staging/rt2860/common/mlme.c
@@ -1320,14 +1320,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);
                                }
                        }
@@ -1863,14 +1855,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);
 
        //
@@ -4014,9 +3998,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/rt2860/rt_profile.c b/drivers/staging/rt2860/rt_profile.c
index 62141f376972e13007bca08ef23d5368c74ba40e..cf48923c7d30487f0b60ef21200a752dff2884a7 100644 (file)
--- a/drivers/staging/rt2860/rt_profile.c
+++ b/drivers/staging/rt2860/rt_profile.c
@@ -1429,24 +1429,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/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h
index c42d94361c271bdd5c32b4cc406b5523b2c4ed88..16a0e2e7f2b306c123fb9871417c7ad8c15e834f 100644 (file)
--- a/drivers/staging/rt2860/rtmp.h
+++ b/drivers/staging/rt2860/rtmp.h
@@ -1388,23 +1388,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,
@@ -1841,10 +1824,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/rt2860/sta/connect.c b/drivers/staging/rt2860/sta/connect.c
index b7fb3a07c6accd5adc66079abefa9f160b190cf8..04be6c5027e0c20eaee3d37976daaec6106eaf38 100644 (file)
--- a/drivers/staging/rt2860/sta/connect.c
+++ b/drivers/staging/rt2860/sta/connect.c
@@ -1275,12 +1275,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 //
-
                DBGPRINT(RT_DEBUG_TRACE, ("!!!Adhoc LINK UP !!! \n" ));
        }
        else

diff --git a/drivers/staging/rt2860/sta/rtmp_data.c b/drivers/staging/rt2860/sta/rtmp_data.c
index f2fcd21ae6741a8ec505fe4377b6ae5f963b3e71..68cc99651d6c7f7e0b45aaa3b5f62c5c3d006dee 100644 (file)
--- a/drivers/staging/rt2860/sta/rtmp_data.c
+++ b/drivers/staging/rt2860/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/rt2860/sta/sync.c b/drivers/staging/rt2860/sta/sync.c
index 3b710c89e711bd8f3b856025d2a02cfea2a8b730..91f7846a36b3d29f993e6b82f15dcabf91adbe7d 100644 (file)
--- a/drivers/staging/rt2860/sta/sync.c
+++ b/drivers/staging/rt2860/sta/sync.c
@@ -407,9 +407,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/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c
index 2719ef7bd223ef83038276e1192a0b14299a9d6c..d95b3257aff85bcc6ab31a02091cec17fc735c91 100644 (file)
--- a/drivers/staging/rt2860/sta_ioctl.c
+++ b/drivers/staging/rt2860/sta_ioctl.c
@@ -213,12 +213,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 //
-
 static struct {
        CHAR *name;
        INT (*set_proc)(PRTMP_ADAPTER pAdapter, PUCHAR arg);
@@ -294,10 +288,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,}
 };
 
@@ -6826,19 +6816,3 @@ INT Set_Ieee80211dClientMode_Proc(
     return TRUE;
 }
 #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 //
-