Skip to content

L
linux
Commit 03a8127e authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files
Options

Staging: rt2870: remove dead EXT_BUILD_CHANNEL_LIST code 

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d439c378
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 130 deletions
drivers/staging/rt2870/common/cmm_info.c
View file @ 03a8127e
......@@ -259,10 +259,6 @@ INT Set_CountryRegion_Proc(
region = simple_strtol(arg, 0, 10);
#ifdef EXT_BUILD_CHANNEL_LIST
return -EOPNOTSUPP;
#endif // EXT_BUILD_CHANNEL_LIST //
// Country can be set only when EEPROM not programmed
if (pAd->CommonCfg.CountryRegion & 0x80)
{
......@@ -309,10 +305,6 @@ INT Set_CountryRegionABand_Proc(
region = simple_strtol(arg, 0, 10);
#ifdef EXT_BUILD_CHANNEL_LIST
return -EOPNOTSUPP;
#endif // EXT_BUILD_CHANNEL_LIST //
// Country can be set only when EEPROM not programmed
if (pAd->CommonCfg.CountryRegionForABand & 0x80)
{
......@@ -1490,11 +1482,8 @@ VOID RTMPSetPhyMode(
pAd->CommonCfg.PhyMode = (UCHAR)phymode;
DBGPRINT(RT_DEBUG_TRACE,("RTMPSetPhyMode : PhyMode=%d, channel=%d \n", pAd->CommonCfg.PhyMode, pAd->CommonCfg.Channel));
#ifdef EXT_BUILD_CHANNEL_LIST
BuildChannelListEx(pAd);
#else
BuildChannelList(pAd);
#endif // EXT_BUILD_CHANNEL_LIST //
// sanity check user setting
for (i = 0; i < pAd->ChannelListNum; i++)
......
drivers/staging/rt2870/common/cmm_sanity.c
View file @ 03a8127e
......@@ -743,15 +743,7 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
*LengthVIE += (pEid->Len + 2);
}
break;
#ifdef CONFIG_STA_SUPPORT
#ifdef EXT_BUILD_CHANNEL_LIST
case IE_COUNTRY:
Ptr = (PUCHAR) pVIE;
NdisMoveMemory(Ptr + *LengthVIE, &pEid->Eid, pEid->Len + 2);
*LengthVIE += (pEid->Len + 2);
break;
#endif // EXT_BUILD_CHANNEL_LIST //
#endif // CONFIG_STA_SUPPORT //
default:
break;
}
......
drivers/staging/rt2870/common/mlme.c
View file @ 03a8127e
......@@ -3629,11 +3629,9 @@ VOID BssEntrySet(
NdisZeroMemory(&pBss->WpaIE.IE[0], MAX_CUSTOM_LEN);
NdisZeroMemory(&pBss->RsnIE.IE[0], MAX_CUSTOM_LEN);
#ifdef EXT_BUILD_CHANNEL_LIST
NdisZeroMemory(&pBss->CountryString[0], 3);
pBss->bHasCountryIE = FALSE;
#endif // EXT_BUILD_CHANNEL_LIST //
pEid = (PEID_STRUCT) pVIE;
while ((Length + 2 + (USHORT)pEid->Len) <= LengthVIE)
{
switch(pEid->Eid)
......@@ -3662,12 +3660,6 @@ VOID BssEntrySet(
NdisMoveMemory(pBss->RsnIE.IE, pEid, pBss->RsnIE.IELen);
}
break;
#ifdef EXT_BUILD_CHANNEL_LIST
case IE_COUNTRY:
NdisMoveMemory(&pBss->CountryString[0], pEid->Octet, 3);
pBss->bHasCountryIE = TRUE;
break;
#endif // EXT_BUILD_CHANNEL_LIST //
}
Length = Length + 2 + (USHORT)pEid->Len; // Eid[1] + Len[1]+ content[Len]
pEid = (PEID_STRUCT)((UCHAR*)pEid + 2 + pEid->Len);
......@@ -3909,18 +3901,6 @@ VOID BssTableSsidSort(
(SSID_EQUAL(Ssid, SsidLen, pInBss->Ssid, pInBss->SsidLen) || bIsHiddenApIncluded))
{
BSS_ENTRY *pOutBss = &OutTab->BssEntry[OutTab->BssNr];
#ifdef EXT_BUILD_CHANNEL_LIST
// If no Country IE exists no Connection will be established when IEEE80211dClientMode is strict.
if ((pAd->StaCfg.IEEE80211dClientMode == Rt802_11_D_Strict) &&
(pInBss->bHasCountryIE == FALSE))
{
DBGPRINT(RT_DEBUG_TRACE,("StaCfg.IEEE80211dClientMode == Rt802_11_D_Strict, but this AP doesn't have country IE.\n"));
continue;
}
#endif // EXT_BUILD_CHANNEL_LIST //
#ifdef DOT11_N_SUPPORT
// 2.4G/5G N only mode
if ((pInBss->HtCapabilityLen == 0) &&
......
drivers/staging/rt2870/common/rtmp_init.c
View file @ 03a8127e
......@@ -3309,10 +3309,6 @@ VOID UserCfgInit(
pAd->StaCfg.bAutoTxRateSwitch = TRUE;
pAd->StaCfg.DesiredTransmitSetting.field.MCS = MCS_AUTO;
}
#ifdef EXT_BUILD_CHANNEL_LIST
pAd->StaCfg.IEEE80211dClientMode = Rt802_11_D_None;
#endif // EXT_BUILD_CHANNEL_LIST //
#endif // CONFIG_STA_SUPPORT //
// global variables mXXXX used in MAC protocol state machines
......
drivers/staging/rt2870/mlme.h
View file @ 03a8127e
......@@ -1185,10 +1185,6 @@ typedef struct {
#ifdef CONFIG_STA_SUPPORT
WPA_IE_ WpaIE;
WPA_IE_ RsnIE;
#ifdef EXT_BUILD_CHANNEL_LIST
UCHAR CountryString[3];
BOOLEAN bHasCountryIE;
#endif // EXT_BUILD_CHANNEL_LIST //
#endif // CONFIG_STA_SUPPORT //
} BSS_ENTRY, *PBSS_ENTRY;
......
drivers/staging/rt2870/rt_profile.c
View file @ 03a8127e
......@@ -950,12 +950,7 @@ NDIS_STATUS RTMPReadParametersHook(
if(RTMPGetKeyParameter("CountryCode", tmpbuf, 25, buffer))
{
NdisMoveMemory(pAd->CommonCfg.CountryCode, tmpbuf , 2);
#ifdef CONFIG_STA_SUPPORT
#ifdef EXT_BUILD_CHANNEL_LIST
IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
NdisMoveMemory(pAd->StaCfg.StaOriCountryCode, tmpbuf , 2);
#endif // EXT_BUILD_CHANNEL_LIST //
#endif // CONFIG_STA_SUPPORT //
if (strlen(pAd->CommonCfg.CountryCode) != 0)
{
pAd->CommonCfg.bCountryFlag = TRUE;
......@@ -971,12 +966,6 @@ NDIS_STATUS RTMPReadParametersHook(
pAd->CommonCfg.Geography = Geography;
pAd->CommonCfg.CountryCode[2] =
(pAd->CommonCfg.Geography == BOTH) ? ' ' : ((pAd->CommonCfg.Geography == IDOR) ? 'I' : 'O');
#ifdef CONFIG_STA_SUPPORT
#ifdef EXT_BUILD_CHANNEL_LIST
IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
pAd->StaCfg.StaOriGeography = pAd->CommonCfg.Geography;
#endif // EXT_BUILD_CHANNEL_LIST //
#endif // CONFIG_STA_SUPPORT //
DBGPRINT(RT_DEBUG_TRACE, ("ChannelGeography=%d\n", pAd->CommonCfg.Geography));
}
}
......
drivers/staging/rt2870/rtmp.h
View file @ 03a8127e
......@@ -2100,13 +2100,6 @@ typedef struct _STA_ADMIN_CONFIG {
DESIRED_TRANSMIT_SETTING DesiredTransmitSetting;
RT_HT_PHY_INFO DesiredHtPhyInfo;
BOOLEAN bAutoTxRateSwitch;
#ifdef EXT_BUILD_CHANNEL_LIST
UCHAR IEEE80211dClientMode;
UCHAR StaOriCountryCode[3];
UCHAR StaOriGeography;
#endif // EXT_BUILD_CHANNEL_LIST //
} STA_ADMIN_CONFIG, *PSTA_ADMIN_CONFIG;
// This data structure keep the current active BSS/IBSS's configuration that this STA
......
drivers/staging/rt2870/sta/connect.c
View file @ 03a8127e
......@@ -1939,17 +1939,6 @@ VOID LinkDown(
NdisMoveMemory(pAd->StaCfg.CCXAdjacentAPSsid, pAd->CommonCfg.Ssid, pAd->StaCfg.CCXAdjacentAPSsidLen);
COPY_MAC_ADDR(pAd->StaCfg.CCXAdjacentAPBssid, pAd->CommonCfg.Bssid);
}
#ifdef EXT_BUILD_CHANNEL_LIST
// Country IE of the AP will be evaluated and will be used.
if (pAd->StaCfg.IEEE80211dClientMode != Rt802_11_D_None)
{
NdisMoveMemory(&pAd->CommonCfg.CountryCode[0], &pAd->StaCfg.StaOriCountryCode[0], 2);
pAd->CommonCfg.Geography = pAd->StaCfg.StaOriGeography;
BuildChannelListEx(pAd);
}
#endif // EXT_BUILD_CHANNEL_LIST //
}
for (i=1; i<MAX_LEN_OF_MAC_TABLE; i++)
......
drivers/staging/rt2870/sta/sync.c
View file @ 03a8127e
......@@ -328,22 +328,6 @@ VOID MlmeJoinReqAction(
pAd->MlmeAux.Channel = pBss->Channel;
pAd->MlmeAux.CentralChannel = pBss->CentralChannel;
#ifdef EXT_BUILD_CHANNEL_LIST
// Country IE of the AP will be evaluated and will be used.
if ((pAd->StaCfg.IEEE80211dClientMode != Rt802_11_D_None) &&
(pBss->bHasCountryIE == TRUE))
{
NdisMoveMemory(&pAd->CommonCfg.CountryCode[0], &pBss->CountryString[0], 2);
if (pBss->CountryString[2] == 'I')
pAd->CommonCfg.Geography = IDOR;
else if (pBss->CountryString[2] == 'O')
pAd->CommonCfg.Geography = ODOR;
else
pAd->CommonCfg.Geography = BOTH;
BuildChannelListEx(pAd);
}
#endif // EXT_BUILD_CHANNEL_LIST //
// Let BBP register at 20MHz to do scan
RTMP_BBP_IO_READ8_BY_REG_ID(pAd, BBP_R4, &BBPValue);
BBPValue &= (~0x18);
......
drivers/staging/rt2870/sta_ioctl.c
View file @ 03a8127e
......@@ -206,12 +206,6 @@ INT Set_ShortRetryLimit_Proc(
IN PRTMP_ADAPTER pAdapter,
IN PUCHAR arg);
#ifdef EXT_BUILD_CHANNEL_LIST
INT Set_Ieee80211dClientMode_Proc(
IN PRTMP_ADAPTER pAdapter,
IN PUCHAR arg);
#endif // EXT_BUILD_CHANNEL_LIST //
INT Show_Adhoc_MacTable_Proc(
IN PRTMP_ADAPTER pAd,
IN PCHAR extra);
......@@ -284,9 +278,6 @@ static struct {
#endif // DOT11_N_SUPPORT //
{"LongRetry", Set_LongRetryLimit_Proc},
{"ShortRetry", Set_ShortRetryLimit_Proc},
#ifdef EXT_BUILD_CHANNEL_LIST
{"11dClientMode", Set_Ieee80211dClientMode_Proc},
#endif // EXT_BUILD_CHANNEL_LIST //
{NULL,}
};
......@@ -5150,13 +5141,8 @@ INT RTMPQueryInformation(
UCHAR value;
DBGPRINT(RT_DEBUG_TRACE, ("Query::OID_802_11_BUILD_CHANNEL_EX \n"));
wrq->u.data.length = sizeof(UCHAR);
#ifdef EXT_BUILD_CHANNEL_LIST
DBGPRINT(RT_DEBUG_TRACE, ("Support EXT_BUILD_CHANNEL_LIST.\n"));
value = 1;
#else
DBGPRINT(RT_DEBUG_TRACE, ("Doesn't support EXT_BUILD_CHANNEL_LIST.\n"));
value = 0;
#endif // EXT_BUILD_CHANNEL_LIST //
Status = copy_to_user(wrq->u.data.pointer, &value, 1);
DBGPRINT(RT_DEBUG_TRACE, ("Status=%d\n", Status));
}
......@@ -6708,25 +6694,6 @@ INT Set_ShortRetryLimit_Proc(
return TRUE;
}
#ifdef EXT_BUILD_CHANNEL_LIST
INT Set_Ieee80211dClientMode_Proc(
IN PRTMP_ADAPTER pAdapter,
IN PUCHAR arg)
{
if (simple_strtol(arg, 0, 10) == 0)
pAdapter->StaCfg.IEEE80211dClientMode = Rt802_11_D_None;
else if (simple_strtol(arg, 0, 10) == 1)
pAdapter->StaCfg.IEEE80211dClientMode = Rt802_11_D_Flexible;
else if (simple_strtol(arg, 0, 10) == 2)
pAdapter->StaCfg.IEEE80211dClientMode = Rt802_11_D_Strict;
else
return FALSE;
DBGPRINT(RT_DEBUG_TRACE, ("Set_Ieee802dMode_Proc::(IEEEE0211dMode=%d)\n", pAdapter->StaCfg.IEEE80211dClientMode));
return TRUE;
}
#endif // EXT_BUILD_CHANNEL_LIST //
INT Show_Adhoc_MacTable_Proc(
IN PRTMP_ADAPTER pAd,
IN PCHAR extra)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7