mirror of https://gitee.com/openkylin/linux.git
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>
This commit is contained in:
parent
c44f7d45fb
commit
715cb0a4d0
|
@ -486,17 +486,7 @@ VOID ScanNextChannel(
|
||||||
ScanTimeIn5gChannel = MIN_CHANNEL_TIME;
|
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 //
|
#endif // CONFIG_STA_SUPPORT //
|
||||||
|
|
||||||
//Global country domain(ch1-11:active scan, ch12-14 passive scan)
|
//Global country domain(ch1-11:active scan, ch12-14 passive scan)
|
||||||
|
|
|
@ -1320,14 +1320,6 @@ VOID STAMlmePeriodicExec(
|
||||||
}
|
}
|
||||||
else
|
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);
|
MlmeAutoReconnectLastSSID(pAd);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1863,14 +1855,6 @@ VOID MlmeCalculateChannelQuality(
|
||||||
CHAR MaxRssi;
|
CHAR MaxRssi;
|
||||||
ULONG BeaconLostTime = BEACON_LOST_TIME;
|
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);
|
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) &&
|
if (((pAd->CommonCfg.bIEEE80211H == 1) &&
|
||||||
(pAd->MlmeAux.Channel > 14) &&
|
(pAd->MlmeAux.Channel > 14) &&
|
||||||
RadarChannelCheck(pAd, pInBss->Channel))
|
RadarChannelCheck(pAd, pInBss->Channel))
|
||||||
#ifdef CARRIER_DETECTION_SUPPORT // Roger sync Carrier
|
|
||||||
|| (pAd->CommonCfg.CarrierDetect.Enable == TRUE)
|
|
||||||
#endif // CARRIER_DETECTION_SUPPORT //
|
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
if (pInBss->Hidden)
|
if (pInBss->Hidden)
|
||||||
|
|
|
@ -1429,24 +1429,6 @@ NDIS_STATUS RTMPReadParametersHook(
|
||||||
HTParametersHook(pAd, tmpbuf, buffer);
|
HTParametersHook(pAd, tmpbuf, buffer);
|
||||||
#endif // DOT11_N_SUPPORT //
|
#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
|
#ifdef CONFIG_STA_SUPPORT
|
||||||
IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
|
IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1388,23 +1388,6 @@ typedef struct _RADAR_DETECT_STRUCT {
|
||||||
UINT8 LongPulseRadarTh;
|
UINT8 LongPulseRadarTh;
|
||||||
} RADAR_DETECT_STRUCT, *PRADAR_DETECT_STRUCT;
|
} 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
|
typedef enum _REC_BLOCKACK_STATUS
|
||||||
{
|
{
|
||||||
Recipient_NONE=0,
|
Recipient_NONE=0,
|
||||||
|
@ -1841,10 +1824,6 @@ typedef struct _COMMON_CONFIG {
|
||||||
// IEEE802.11H--DFS.
|
// IEEE802.11H--DFS.
|
||||||
RADAR_DETECT_STRUCT RadarDetect;
|
RADAR_DETECT_STRUCT RadarDetect;
|
||||||
|
|
||||||
#ifdef CARRIER_DETECTION_SUPPORT
|
|
||||||
CARRIER_DETECTION CarrierDetect;
|
|
||||||
#endif // CARRIER_DETECTION_SUPPORT //
|
|
||||||
|
|
||||||
#ifdef DOT11_N_SUPPORT
|
#ifdef DOT11_N_SUPPORT
|
||||||
// HT
|
// HT
|
||||||
UCHAR BASize; // USer desired BAWindowSize. Should not exceed our max capability
|
UCHAR BASize; // USer desired BAWindowSize. Should not exceed our max capability
|
||||||
|
|
|
@ -1275,12 +1275,6 @@ VOID LinkUp(
|
||||||
OPSTATUS_SET_FLAG(pAd, fOP_STATUS_ADHOC_ON);
|
OPSTATUS_SET_FLAG(pAd, fOP_STATUS_ADHOC_ON);
|
||||||
OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_INFRA_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" ));
|
DBGPRINT(RT_DEBUG_TRACE, ("!!!Adhoc LINK UP !!! \n" ));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -2486,15 +2486,6 @@ NDIS_STATUS STAHardTransmit(
|
||||||
|
|
||||||
pPacket = QUEUE_ENTRY_TO_PACKET(pTxBlk->TxPacketList.Head);
|
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
|
// STEP 1. WAKE UP PHY
|
||||||
// outgoing frame always wakeup PHY to prevent frame lost and
|
// outgoing frame always wakeup PHY to prevent frame lost and
|
||||||
|
|
|
@ -407,9 +407,6 @@ VOID MlmeJoinReqAction(
|
||||||
if (((pAd->CommonCfg.bIEEE80211H == 1) &&
|
if (((pAd->CommonCfg.bIEEE80211H == 1) &&
|
||||||
(pAd->MlmeAux.Channel > 14) &&
|
(pAd->MlmeAux.Channel > 14) &&
|
||||||
RadarChannelCheck(pAd, pAd->MlmeAux.Channel))
|
RadarChannelCheck(pAd, pAd->MlmeAux.Channel))
|
||||||
#ifdef CARRIER_DETECTION_SUPPORT // Roger sync Carrier
|
|
||||||
|| (pAd->CommonCfg.CarrierDetect.Enable == TRUE)
|
|
||||||
#endif // CARRIER_DETECTION_SUPPORT //
|
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
|
|
|
@ -213,12 +213,6 @@ INT Set_Ieee80211dClientMode_Proc(
|
||||||
IN PUCHAR arg);
|
IN PUCHAR arg);
|
||||||
#endif // EXT_BUILD_CHANNEL_LIST //
|
#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 {
|
static struct {
|
||||||
CHAR *name;
|
CHAR *name;
|
||||||
INT (*set_proc)(PRTMP_ADAPTER pAdapter, PUCHAR arg);
|
INT (*set_proc)(PRTMP_ADAPTER pAdapter, PUCHAR arg);
|
||||||
|
@ -294,10 +288,6 @@ static struct {
|
||||||
#ifdef EXT_BUILD_CHANNEL_LIST
|
#ifdef EXT_BUILD_CHANNEL_LIST
|
||||||
{"11dClientMode", Set_Ieee80211dClientMode_Proc},
|
{"11dClientMode", Set_Ieee80211dClientMode_Proc},
|
||||||
#endif // EXT_BUILD_CHANNEL_LIST //
|
#endif // EXT_BUILD_CHANNEL_LIST //
|
||||||
#ifdef CARRIER_DETECTION_SUPPORT
|
|
||||||
{"CarrierDetect", Set_CarrierDetect_Proc},
|
|
||||||
#endif // CARRIER_DETECTION_SUPPORT //
|
|
||||||
|
|
||||||
{NULL,}
|
{NULL,}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -6826,19 +6816,3 @@ INT Set_Ieee80211dClientMode_Proc(
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
#endif // EXT_BUILD_CHANNEL_LIST //
|
#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 //
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue