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

Commit add54e5c authored by David Kilroy's avatar David Kilroy Committed by Greg Kroah-Hartman
Browse files

staging: wlags49_h2: Enable WPA in the HCF 



WPA has been disabled in the HCF layer. The firmware does
support it (it is used on other platforms). Enable it so
we can work through the issues.

Note that we also enable this for the HERMES 2.5 non-WARP
firmware cards.

Signed-off-by: default avatarDavid Kilroy <kilroyd@googlemail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1ca61671

drivers/staging/wlags49_h2/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ INSTALLDIR := /lib/modules/$(shell uname -r)/kernel/drivers/net/wireless 
ccflags-y := -I$(KERNELDIR)/include

ccflags-y += -I$(src) \

		-DBUS_PCMCIA \

		-DUSE_WPA \

		-DUSE_WEXT \

		-DSTA_ONLY \

		-DWVLAN_49 \

drivers/staging/wlags49_h2/hcfcfg.h

+14 −5
Original line number Diff line number Diff line
@@ -316,16 +316,25 @@ typedef unsigned long hcf_32; 
//#define HCF_SLEEP (HCF_CDS | HCF_DDS )

#define HCF_SLEEP (HCF_CDS)



//#define HCF_TYPE    (HCF_TYPE_HII5|HCF_TYPE_STA|HCF_TYPE_AP)

/* Note: Non-WARP firmware all support WPA. However the original Agere

 * linux driver does not enable WPA. Enabling WPA here causes whatever

 * preliminary WPA logic to be included, some of which may be specific

 * to HERMESI.

 *

 * Various comment are clear that WARP and WPA are not compatible

 * (which may just mean WARP does WPA in a different fashion).

 */



/* #define HCF_TYPE    (HCF_TYPE_HII5|HCF_TYPE_STA|HCF_TYPE_AP) */

#ifdef HERMES25

#ifdef WARP

#define HCF_TYPE    ( HCF_TYPE_WARP | HCF_TYPE_HII5 )

#else

#define HCF_TYPE    HCF_TYPE_HII5

#endif // WARP

#define HCF_TYPE    (HCF_TYPE_HII5 | HCF_TYPE_WPA)

#endif /* WARP */

#else

#define HCF_TYPE    HCF_TYPE_NONE

#endif // HERMES25

#define HCF_TYPE    HCF_TYPE_WPA

#endif /* HERMES25 */



#ifdef ENABLE_DMA

#define HCF_DMA		1

drivers/staging/wlags49_h25/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ INSTALLDIR := /lib/modules/$(shell uname -r)/kernel/drivers/net/wireless 
ccflags-y := -I$(KERNELDIR)/include

ccflags-y += -I$(src) \

		-DBUS_PCMCIA \

		-DUSE_WPA \

		-DUSE_WEXT \

		-DSTA_ONLY \

		-DWVLAN_49 \