Staging: rt3070: 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/rt3070/common/cmm_data.c b/drivers/staging/rt3070/common/cmm_data.c
index b8b3e7860fb6991298992db15291cb60cc098ba1..a658ac17afa12e02536ba9d3edb00a609b7d6b38 100644 (file)
--- a/drivers/staging/rt3070/common/cmm_data.c
+++ b/drivers/staging/rt3070/common/cmm_data.c
@@ -317,8 +317,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;
@@ -334,8 +332,6 @@ NDIS_STATUS MlmeDataHardTransmit(
        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/rt3070/common/cmm_sync.c b/drivers/staging/rt3070/common/cmm_sync.c
index 60a8f021d83b98b7b4787c124f67d54d1aac1942..1d6954ef1213433d78ddba95b6943a58c458dfda 100644 (file)
--- a/drivers/staging/rt3070/common/cmm_sync.c
+++ b/drivers/staging/rt3070/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/rt3070/common/mlme.c b/drivers/staging/rt3070/common/mlme.c
index f5c386b500a76518226c2067c4cb433ee9a75f03..537b157bde3f5c26dae2a46a04f2696c0d80e0af 100644 (file)
--- a/drivers/staging/rt3070/common/mlme.c
+++ b/drivers/staging/rt3070/common/mlme.c
@@ -1218,14 +1218,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);
                                }
                        }
@@ -1760,14 +1752,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);
 
        //
@@ -3970,9 +3954,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/rt3070/rt_profile.c b/drivers/staging/rt3070/rt_profile.c
index 167bdb146ebcf1860b2e6677757e16e78e65887a..cea6b436ed4f4bd47ca521a9cadaefa4134207b2 100644 (file)
--- a/drivers/staging/rt3070/rt_profile.c
+++ b/drivers/staging/rt3070/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/rt3070/rtmp.h b/drivers/staging/rt3070/rtmp.h
index 4e3aa447e7b7ba2b4084ed49744cc57ddddb75a4..fcd46d26b439052e7755205635384de83771f5d2 100644 (file)
--- a/drivers/staging/rt3070/rtmp.h
+++ b/drivers/staging/rt3070/rtmp.h
@@ -1383,23 +1383,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,
@@ -1868,10 +1851,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/rt3070/sta/connect.c b/drivers/staging/rt3070/sta/connect.c
index 6b588edadaa2fee86c00995a31702e41e5b49928..f4aeee5ed1508b5cfdc4ec0af4eed698af3dc974 100644 (file)
--- a/drivers/staging/rt3070/sta/connect.c
+++ b/drivers/staging/rt3070/sta/connect.c
@@ -1336,12 +1336,6 @@ VOID LinkUp(
                }
 #endif // DOT11_N_SUPPORT //
 
-#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/rt3070/sta/sync.c b/drivers/staging/rt3070/sta/sync.c
index 12b50c533443c3d2367e779a9fcc347e2182b4c5..bf2891fa06e1ffc8dcf9d9f59bc28d97fedd0fe5 100644 (file)
--- a/drivers/staging/rt3070/sta/sync.c
+++ b/drivers/staging/rt3070/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/rt3070/sta_ioctl.c b/drivers/staging/rt3070/sta_ioctl.c
index 2bfa206c98baf3e7b1ebaa8b8230d39257245d42..ff085d7f7703dbe05090805ef94d5d70032bdcdc 100644 (file)
--- a/drivers/staging/rt3070/sta_ioctl.c
+++ b/drivers/staging/rt3070/sta_ioctl.c
@@ -223,12 +223,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);
@@ -304,9 +298,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 //
 //2008/09/11:KH add to support efuse<--
 #ifdef RT30xx
        {"efuseFreeNumber",                             set_eFuseGetFreeBlockCount_Proc},
@@ -7003,19 +6994,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 //
-