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

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

Staging: rt3070: remove NATIVE_WPA_SUPPLICANT_SUPPORT ifdefs 



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

drivers/staging/rt3070/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ EXTRA_CFLAGS += -DRT2870 -DRT30xx -DRT3070 
EXTRA_CFLAGS += -DDBG

EXTRA_CFLAGS += -DDOT11_N_SUPPORT

EXTRA_CFLAGS += -DWPA_SUPPLICANT_SUPPORT

EXTRA_CFLAGS += -DNATIVE_WPA_SUPPLICANT_SUPPORT



rt3070sta-objs :=		\

	common/md5.o		\

drivers/staging/rt3070/common/mlme.c

+0 −15
Original line number Diff line number Diff line
@@ -1037,26 +1037,11 @@ VOID STAMlmePeriodicExec( 
			// Lost AP, send disconnect & link down event

			LinkDown(pAd, FALSE);



#ifdef WPA_SUPPLICANT_SUPPORT

#ifndef NATIVE_WPA_SUPPLICANT_SUPPORT

            if (pAd->StaCfg.WpaSupplicantUP)

			{

                union iwreq_data    wrqu;

                //send disassociate event to wpa_supplicant

                memset(&wrqu, 0, sizeof(wrqu));

                wrqu.data.flags = RT_DISASSOC_EVENT_FLAG;

                wireless_send_event(pAd->net_dev, IWEVCUSTOM, &wrqu, NULL);

            }

#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //

#endif // WPA_SUPPLICANT_SUPPORT //



#ifdef NATIVE_WPA_SUPPLICANT_SUPPORT

            {

                union iwreq_data    wrqu;

                memset(wrqu.ap_addr.sa_data, 0, MAC_ADDR_LEN);

                wireless_send_event(pAd->net_dev, SIOCGIWAP, &wrqu, NULL);

            }

#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //



			// RTMPPatchMacBbpBug(pAd);

			MlmeAutoReconnectLastSSID(pAd);

drivers/staging/rt3070/common/rtmp_init.c

+0 −2
Original line number Diff line number Diff line
@@ -3394,9 +3394,7 @@ VOID UserCfgInit( 
		pAd->StaCfg.IEEE8021X = FALSE;

		pAd->StaCfg.IEEE8021x_required_keys = FALSE;

		pAd->StaCfg.WpaSupplicantUP = WPA_SUPPLICANT_DISABLE;

#ifdef NATIVE_WPA_SUPPLICANT_SUPPORT

		pAd->StaCfg.WpaSupplicantUP = WPA_SUPPLICANT_ENABLE;

#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //

#endif // WPA_SUPPLICANT_SUPPORT //



	}

drivers/staging/rt3070/oid.h

+0 −13
Original line number Diff line number Diff line
@@ -934,19 +934,6 @@ typedef struct _RT_LLTD_ASSOICATION_TABLE { 
} RT_LLTD_ASSOICATION_TABLE, *PRT_LLTD_ASSOICATION_TABLE;

#endif // LLTD_SUPPORT //



#ifdef WPA_SUPPLICANT_SUPPORT

#ifndef NATIVE_WPA_SUPPLICANT_SUPPORT

#define	RT_ASSOC_EVENT_FLAG                         0x0101

#define	RT_DISASSOC_EVENT_FLAG                      0x0102

#define	RT_REQIE_EVENT_FLAG                         0x0103

#define	RT_RESPIE_EVENT_FLAG                        0x0104

#define	RT_ASSOCINFO_EVENT_FLAG                     0x0105

#define RT_PMKIDCAND_FLAG                           0x0106

#define RT_INTERFACE_DOWN                           0x0107

#define RT_INTERFACE_UP                             0x0108

#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //

#endif // WPA_SUPPLICANT_SUPPORT //



#define MAX_CUSTOM_LEN 128



typedef enum _RT_802_11_D_CLIENT_MODE

drivers/staging/rt3070/rt_config.h

+1 −3
Original line number Diff line number Diff line
@@ -66,11 +66,9 @@ 
#include "igmp_snoop.h"

#endif // IGMP_SNOOP_SUPPORT //



#ifdef NATIVE_WPA_SUPPLICANT_SUPPORT

#ifndef WPA_SUPPLICANT_SUPPORT

#error "Build for being controlled by NetworkManager or wext, please set HAS_WPA_SUPPLICANT=y and HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=y"

#error "Build for being controlled by NetworkManager or wext, please set HAS_WPA_SUPPLICANT=y"

#endif // WPA_SUPPLICANT_SUPPORT //

#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //



#ifdef IKANOS_VX_1X0

#include	"vr_ikans.h"