Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e08bae5a authored Apr 26, 2009 by Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman Jun 19, 2009

Staging: rt2860: remove WPA_SUPPLICANT_SUPPORT ifdefs



Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent d7738afe

drivers/staging/rt2860/Makefile

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4,7 +4,6 @@ obj-$(CONFIG_RT2860) += rt2860sta.o
	EXTRA_CFLAGS += -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT		EXTRA_CFLAGS += -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT
	EXTRA_CFLAGS += -DDBG		EXTRA_CFLAGS += -DDBG
	EXTRA_CFLAGS += -DDOT11_N_SUPPORT		EXTRA_CFLAGS += -DDOT11_N_SUPPORT
	EXTRA_CFLAGS += -DWPA_SUPPLICANT_SUPPORT

	rt2860sta-objs := \		rt2860sta-objs := \
	common/md5.o \		common/md5.o \

drivers/staging/rt2860/common/cmm_data_2860.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -481,12 +481,11 @@ NDIS_STATUS RTMPCheckRxError(
	if (pRxD->CipherErr == 2)		if (pRxD->CipherErr == 2)
	{		{
	pWpaKey = &pAd->SharedKey[BSS0][pRxWI->KeyIndex];		pWpaKey = &pAd->SharedKey[BSS0][pRxWI->KeyIndex];
	#ifdef WPA_SUPPLICANT_SUPPORT
	if (pAd->StaCfg.WpaSupplicantUP)		if (pAd->StaCfg.WpaSupplicantUP)
	WpaSendMicFailureToWpaSupplicant(pAd,		WpaSendMicFailureToWpaSupplicant(pAd,
	(pWpaKey->Type == PAIRWISEKEY) ? TRUE:FALSE);		(pWpaKey->Type == PAIRWISEKEY) ? TRUE:FALSE);
	else		else
	#endif // WPA_SUPPLICANT_SUPPORT //
	RTMPReportMicError(pAd, pWpaKey);		RTMPReportMicError(pAd, pWpaKey);

	if (((pRxD->CipherErr & 2) == 2) && pAd->CommonCfg.bWirelessEvent && INFRA_ON(pAd))		if (((pRxD->CipherErr & 2) == 2) && pAd->CommonCfg.bWirelessEvent && INFRA_ON(pAd))

drivers/staging/rt2860/common/cmm_wpa.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -625,14 +625,12 @@ VOID RTMPMakeRSNIE(
	{		{
	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
	{		{
	#ifdef WPA_SUPPLICANT_SUPPORT
	if (pAd->StaCfg.WpaSupplicantUP != WPA_SUPPLICANT_DISABLE)		if (pAd->StaCfg.WpaSupplicantUP != WPA_SUPPLICANT_DISABLE)
	{		{
	if (AuthMode < Ndis802_11AuthModeWPA)		if (AuthMode < Ndis802_11AuthModeWPA)
	return;		return;
	}		}
	else		else
	#endif // WPA_SUPPLICANT_SUPPORT //
	{		{
	// Support WPAPSK or WPA2PSK in STA-Infra mode		// Support WPAPSK or WPA2PSK in STA-Infra mode
	// Support WPANone in STA-Adhoc mode		// Support WPANone in STA-Adhoc mode

drivers/staging/rt2860/common/mlme.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1004,9 +1004,7 @@ VOID STAMlmePeriodicExec(
	{		{
	ULONG TxTotalCnt;		ULONG TxTotalCnt;

	#ifdef WPA_SUPPLICANT_SUPPORT
	if (pAd->StaCfg.WpaSupplicantUP == WPA_SUPPLICANT_DISABLE)		if (pAd->StaCfg.WpaSupplicantUP == WPA_SUPPLICANT_DISABLE)
	#endif // WPA_SUPPLICANT_SUPPORT //
	{		{
	// WPA MIC error should block association attempt for 60 seconds		// WPA MIC error should block association attempt for 60 seconds
	if (pAd->StaCfg.bBlockAssoc && (pAd->StaCfg.LastMicErrorTime + (60 * OS_HZ) < pAd->Mlme.Now32))		if (pAd->StaCfg.bBlockAssoc && (pAd->StaCfg.LastMicErrorTime + (60 * OS_HZ) < pAd->Mlme.Now32))

drivers/staging/rt2860/common/rtmp_init.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -3067,13 +3067,10 @@ VOID UserCfgInit(
	NdisZeroMemory(pAd->nickname, IW_ESSID_MAX_SIZE+1);		NdisZeroMemory(pAd->nickname, IW_ESSID_MAX_SIZE+1);
	sprintf(pAd->nickname, "%s", STA_NIC_DEVICE_NAME);		sprintf(pAd->nickname, "%s", STA_NIC_DEVICE_NAME);
	RTMPInitTimer(pAd, &pAd->StaCfg.WpaDisassocAndBlockAssocTimer, GET_TIMER_FUNCTION(WpaDisassocApAndBlockAssoc), pAd, FALSE);		RTMPInitTimer(pAd, &pAd->StaCfg.WpaDisassocAndBlockAssocTimer, GET_TIMER_FUNCTION(WpaDisassocApAndBlockAssoc), pAd, FALSE);
	#ifdef WPA_SUPPLICANT_SUPPORT
	pAd->StaCfg.IEEE8021X = FALSE;		pAd->StaCfg.IEEE8021X = FALSE;
	pAd->StaCfg.IEEE8021x_required_keys = FALSE;		pAd->StaCfg.IEEE8021x_required_keys = FALSE;
	pAd->StaCfg.WpaSupplicantUP = WPA_SUPPLICANT_DISABLE;		pAd->StaCfg.WpaSupplicantUP = WPA_SUPPLICANT_DISABLE;
	pAd->StaCfg.WpaSupplicantUP = WPA_SUPPLICANT_ENABLE;		pAd->StaCfg.WpaSupplicantUP = WPA_SUPPLICANT_ENABLE;
	#endif // WPA_SUPPLICANT_SUPPORT //

	}		}

	// Default for extra information is not valid		// Default for extra information is not valid