Staging: rt2860: remove dead DOT11N_DRAFT3 code

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / staging / rt2860 / common / cmm_sync.c

diff --git a/drivers/staging/rt2860/common/cmm_sync.c b/drivers/staging/rt2860/common/cmm_sync.c
index 40e4109118e0fcb286caa00892414f2254370023..985036b0691d68be0d1331e23ef0ca76ada72bc3 100644 (file)
--- a/drivers/staging/rt2860/common/cmm_sync.c
+++ b/drivers/staging/rt2860/common/cmm_sync.c
@@ -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)
@@ -470,7 +464,7 @@ VOID ScanNextChannel(
                {
                // BBP and RF are not accessible in PS mode, we has to wake them up first
                if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE))
-                       AsicForceWakeup(pAd, TRUE);
+                               AsicForceWakeup(pAd, FROM_TX);
 
                        // leave PSM during scanning. otherwise we may lost ProbeRsp & BEACON
                        if (pAd->StaCfg.Psm == PWR_SAVE)
@@ -492,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)
@@ -646,21 +630,6 @@ VOID ScanNextChannel(
 #endif // RT_BIG_ENDIAN //
                                }
                                FrameLen += Tmp;
-
-#ifdef DOT11N_DRAFT3
-                               if (pAd->CommonCfg.BACapability.field.b2040CoexistScanSup == 1)
-                               {
-                                       ULONG           Tmp;
-                                       HtLen = 1;
-                                       MakeOutgoingFrame(pOutBuffer + FrameLen,            &Tmp,
-                                                                         1,                                    &ExtHtCapIe,
-                                                                         1,                                    &HtLen,
-                                                                         1,                            &pAd->CommonCfg.BSSCoexist2040.word,
-                                                                         END_OF_ARGS);
-
-                                       FrameLen += Tmp;
-                               }
-#endif // DOT11N_DRAFT3 //
                        }
 #endif // DOT11_N_SUPPORT //