Staging: rt3070: remove dead EXT_BUILD_CHANNEL_LIST code (6fabd4ea) · Commits · jan.koester / Linux

drivers/staging/rt3070/common/cmm_info.c

+1 −12

Original line number	Original line	Diff line number	Diff line
	@@ -259,10 +259,6 @@ INT Set_CountryRegion_Proc(

	region = simple_strtol(arg, 0, 10);		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		// Country can be set only when EEPROM not programmed
	if (pAd->CommonCfg.CountryRegion & 0x80)		if (pAd->CommonCfg.CountryRegion & 0x80)
	{		{
	@@ -309,10 +305,6 @@ INT Set_CountryRegionABand_Proc(

	region = simple_strtol(arg, 0, 10);		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		// Country can be set only when EEPROM not programmed
	if (pAd->CommonCfg.CountryRegionForABand & 0x80)		if (pAd->CommonCfg.CountryRegionForABand & 0x80)
	{		{
	@@ -1178,11 +1170,8 @@ VOID RTMPSetPhyMode(
	pAd->CommonCfg.PhyMode = (UCHAR)phymode;		pAd->CommonCfg.PhyMode = (UCHAR)phymode;

	DBGPRINT(RT_DEBUG_TRACE,("RTMPSetPhyMode : PhyMode=%d, channel=%d \n", pAd->CommonCfg.PhyMode, pAd->CommonCfg.Channel));		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);		BuildChannelList(pAd);
	#endif // EXT_BUILD_CHANNEL_LIST //

	// sanity check user setting		// sanity check user setting
	for (i = 0; i < pAd->ChannelListNum; i++)		for (i = 0; i < pAd->ChannelListNum; i++)

drivers/staging/rt3070/common/cmm_sanity.c

+1 −9

Original line number	Original line	Diff line number	Diff line
	@@ -749,15 +749,7 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
	*LengthVIE += (pEid->Len + 2);		*LengthVIE += (pEid->Len + 2);
	}		}
	break;		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:		default:
	break;		break;
	}		}

drivers/staging/rt3070/common/mlme.c

+2 −22

Original line number	Original line	Diff line number	Diff line
	@@ -3653,11 +3653,9 @@ VOID BssEntrySet(

	NdisZeroMemory(&pBss->WpaIE.IE[0], MAX_CUSTOM_LEN);		NdisZeroMemory(&pBss->WpaIE.IE[0], MAX_CUSTOM_LEN);
	NdisZeroMemory(&pBss->RsnIE.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;		pEid = (PEID_STRUCT) pVIE;

	while ((Length + 2 + (USHORT)pEid->Len) <= LengthVIE)		while ((Length + 2 + (USHORT)pEid->Len) <= LengthVIE)
	{		{
	switch(pEid->Eid)		switch(pEid->Eid)
	@@ -3686,12 +3684,6 @@ VOID BssEntrySet(
	NdisMoveMemory(pBss->RsnIE.IE, pEid, pBss->RsnIE.IELen);		NdisMoveMemory(pBss->RsnIE.IE, pEid, pBss->RsnIE.IELen);
	}		}
	break;		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]		Length = Length + 2 + (USHORT)pEid->Len; // Eid[1] + Len[1]+ content[Len]
	pEid = (PEID_STRUCT)((UCHAR*)pEid + 2 + pEid->Len);		pEid = (PEID_STRUCT)((UCHAR*)pEid + 2 + pEid->Len);
	@@ -3938,18 +3930,6 @@ VOID BssTableSsidSort(
	(SSID_EQUAL(Ssid, SsidLen, pInBss->Ssid, pInBss->SsidLen) \|\| bIsHiddenApIncluded))		(SSID_EQUAL(Ssid, SsidLen, pInBss->Ssid, pInBss->SsidLen) \|\| bIsHiddenApIncluded))
	{		{
	BSS_ENTRY *pOutBss = &OutTab->BssEntry[OutTab->BssNr];		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		#ifdef DOT11_N_SUPPORT
	// 2.4G/5G N only mode		// 2.4G/5G N only mode
	if ((pInBss->HtCapabilityLen == 0) &&		if ((pInBss->HtCapabilityLen == 0) &&

drivers/staging/rt3070/common/rtmp_init.c

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -3396,10 +3396,6 @@ VOID UserCfgInit(
	pAd->StaCfg.bAutoTxRateSwitch = TRUE;		pAd->StaCfg.bAutoTxRateSwitch = TRUE;
	pAd->StaCfg.DesiredTransmitSetting.field.MCS = MCS_AUTO;		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 //		#endif // CONFIG_STA_SUPPORT //

	// global variables mXXXX used in MAC protocol state machines		// global variables mXXXX used in MAC protocol state machines

drivers/staging/rt3070/mlme.h

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1179,10 +1179,6 @@ typedef struct {
	#ifdef CONFIG_STA_SUPPORT		#ifdef CONFIG_STA_SUPPORT
	WPA_IE_ WpaIE;		WPA_IE_ WpaIE;
	WPA_IE_ RsnIE;		WPA_IE_ RsnIE;
	#ifdef EXT_BUILD_CHANNEL_LIST
	UCHAR CountryString[3];
	BOOLEAN bHasCountryIE;
	#endif // EXT_BUILD_CHANNEL_LIST //
	#endif // CONFIG_STA_SUPPORT //		#endif // CONFIG_STA_SUPPORT //
	} BSS_ENTRY, *PBSS_ENTRY;		} BSS_ENTRY, *PBSS_ENTRY;