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

Commit 3ba73067 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rt3070: remove WPA_SUPPLICANT_SUPPORT ifdefs 



Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f3a9749f

drivers/staging/rt3070/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ EXTRA_CFLAGS += -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT 
EXTRA_CFLAGS += -DRT2870 -DRT30xx -DRT3070

EXTRA_CFLAGS += -DDBG

EXTRA_CFLAGS += -DDOT11_N_SUPPORT

EXTRA_CFLAGS += -DWPA_SUPPLICANT_SUPPORT



rt3070sta-objs :=		\

	common/md5.o		\

drivers/staging/rt3070/common/cmm_wpa.c

+0 −2
Original line number Diff line number Diff line
@@ -591,14 +591,12 @@ VOID RTMPMakeRSNIE( 
	{

		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

		{

#ifdef WPA_SUPPLICANT_SUPPORT

			if (pAd->StaCfg.WpaSupplicantUP != WPA_SUPPLICANT_DISABLE)

			{

				if (AuthMode < Ndis802_11AuthModeWPA)

					return;

			}

			else

#endif // WPA_SUPPLICANT_SUPPORT //

			{

				// Support WPAPSK or WPA2PSK in STA-Infra mode

				// Support WPANone in STA-Adhoc mode

drivers/staging/rt3070/common/mlme.c

+0 −2
Original line number Diff line number Diff line
@@ -951,9 +951,7 @@ VOID STAMlmePeriodicExec( 
	ULONG			    TxTotalCnt;

	int 	i;



#ifdef WPA_SUPPLICANT_SUPPORT

    if (pAd->StaCfg.WpaSupplicantUP == WPA_SUPPLICANT_DISABLE)

#endif // WPA_SUPPLICANT_SUPPORT //

    {

    	// WPA MIC error should block association attempt for 60 seconds

    	if (pAd->StaCfg.bBlockAssoc && (pAd->StaCfg.LastMicErrorTime + (60 * OS_HZ) < pAd->Mlme.Now32))

drivers/staging/rt3070/common/rtmp_init.c

+0 −3
Original line number Diff line number Diff line
@@ -3390,13 +3390,10 @@ VOID UserCfgInit( 
		NdisZeroMemory(pAd->nickname, IW_ESSID_MAX_SIZE+1);

		sprintf(pAd->nickname, "%s", STA_NIC_DEVICE_NAME);

		RTMPInitTimer(pAd, &pAd->StaCfg.WpaDisassocAndBlockAssocTimer, GET_TIMER_FUNCTION(WpaDisassocApAndBlockAssoc), pAd, FALSE);

#ifdef WPA_SUPPLICANT_SUPPORT

		pAd->StaCfg.IEEE8021X = FALSE;

		pAd->StaCfg.IEEE8021x_required_keys = FALSE;

		pAd->StaCfg.WpaSupplicantUP = WPA_SUPPLICANT_DISABLE;

		pAd->StaCfg.WpaSupplicantUP = WPA_SUPPLICANT_ENABLE;

#endif // WPA_SUPPLICANT_SUPPORT //



	}



	// Default for extra information is not valid

drivers/staging/rt3070/oid.h

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ 
#define	RT_OID_802_11_QUERY_LAST_RX_RATE			0x0613

#define	RT_OID_802_11_TX_POWER_LEVEL_1				0x0614

#define	RT_OID_802_11_QUERY_PIDVID					0x0615

//for WPA_SUPPLICANT_SUPPORT



#define OID_SET_COUNTERMEASURES                     0x0616

#define OID_802_11_SET_IEEE8021X                    0x0617

#define OID_802_11_SET_IEEE8021X_REQUIRE_KEY        0x0618