diff options
| -rw-r--r-- | drivers/staging/wlags49_h2/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/wlags49_h2/hcfcfg.h | 19 | ||||
| -rw-r--r-- | drivers/staging/wlags49_h25/Makefile | 1 |
3 files changed, 14 insertions, 7 deletions
diff --git a/drivers/staging/wlags49_h2/Makefile b/drivers/staging/wlags49_h2/Makefile index e604ebd5aeb5..c7220c610961 100644 --- a/drivers/staging/wlags49_h2/Makefile +++ b/drivers/staging/wlags49_h2/Makefile @@ -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 \ diff --git a/drivers/staging/wlags49_h2/hcfcfg.h b/drivers/staging/wlags49_h2/hcfcfg.h index 825550e1b9e8..7545bc554112 100644 --- a/drivers/staging/wlags49_h2/hcfcfg.h +++ b/drivers/staging/wlags49_h2/hcfcfg.h @@ -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 diff --git a/drivers/staging/wlags49_h25/Makefile b/drivers/staging/wlags49_h25/Makefile index 7d4b5632c94a..fe8292996108 100644 --- a/drivers/staging/wlags49_h25/Makefile +++ b/drivers/staging/wlags49_h25/Makefile @@ -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 \ |