Message ID | 1336566287-9700-1-git-send-email-andrew.bordunov@gmail.com |
---|---|
State | Changes Requested |
Headers | show |
Hm, message is empty here, but my CC is ok. I'm sorry. Updated patch: http://w1.fi/bugz/show_bug.cgi?id=438
On Wed, May 09, 2012 at 03:24:47PM +0300, Andrii Bordunov wrote: > * Include following options to defconfig: > * Remove following options from defconfig (are not supported anymore): > * Remove OBJS_wpa var from Android makefile: there is no target using it. Thanks! Couple of comments below on areas that I don't think should be included in the patch or well, at least should go into a separate patch since they are blocking the less controversial parts from going int. > diff --git a/hostapd/defconfig b/hostapd/defconfig > +# Enable WPS NFC (Near Field Communication) method > +#CONFIG_WPS_NFC=y > + > +# Enable WPS NFC support for NXP PN531 device > +#CONFIG_WPS_NFC_PN531=y > + > +# Enable support for WPS USBA out-of-band mechanism > +# with USB Flash Drives (UFD) > +#CONFIG_WPS_UFD=y These are undocumented on purpose since they are way too difficult to get working. > +# Enable validating WPS attributes in management frames > +# and WSC messages (WPS 2.0) > +#CONFIG_WPS_STRICT=y > + > +# Enable WPS testing operations > +#CONFIG_WPS_TESTING=y These are undocumented since they are for very specific testbed purpose and not meant for normal use. > diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk > diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile > +ifdef CONFIG_VALGRIND > +CFLAGS += -DCONFIG_VALGRIND > +endif I don't think the WPA_MEM_DEFINED() macro is used anywhere in hostap.git at the moment, so it does not look useful to define this either. > diff --git a/wpa_supplicant/defconfig b/wpa_supplicant/defconfig > +# Driver interface for Atheros driver > +#CONFIG_DRIVER_ATHEROS=y This driver wrapper is only for hostapd, so it should not be mentioned in wpa_supplicant/defconfig. > +# Enable WPS NFC (Near Field Communication) method > +#CONFIG_WPS_NFC=y > + > +# Enable WPS NFC support for NXP PN531 device > +#CONFIG_WPS_NFC_PN531=y > + > +# Enable support for WPS USBA out-of-band mechanism > +# with USB Flash Drives (UFD) > +#CONFIG_WPS_UFD=y Same as above, i.e., I would rather hide these until the implementation is in more usable state. > +# Enable validating WPS attributes in management frames > +# and WSC messages (WPS 2.0) > +#CONFIG_WPS_STRICT=y > + > +# Enable WPS testing operations > +#CONFIG_WPS_TESTING=y Same as above - extra complexity for very small use case. > +# Enable TDLS testing operations > +#CONFIG_TDLS_TESTING=y This is in the same special use case category.. > +# Enable DBus control interface > +#CONFIG_DBUS=y Makefile does not use this, so this should not be added here. The real build config options for the D-Bus interface (CONFIG_CTRL_IFACE_DBUS*) are already mentioned. > +# Enable additional Valgrind support. Valgrind headers are required. > +#CONFIG_VALGRIND=y See above - not used currently in hostap.git and no point in documenting it here either.
diff --git a/hostapd/defconfig b/hostapd/defconfig index 3cf0d13..fe37e29 100644 --- a/hostapd/defconfig +++ b/hostapd/defconfig @@ -104,11 +104,30 @@ CONFIG_EAP_TTLS=y # Wi-Fi Protected Setup (WPS) #CONFIG_WPS=y + # Enable WSC 2.0 support #CONFIG_WPS2=y + # Enable UPnP support for external WPS Registrars #CONFIG_WPS_UPNP=y +# Enable WPS NFC (Near Field Communication) method +#CONFIG_WPS_NFC=y + +# Enable WPS NFC support for NXP PN531 device +#CONFIG_WPS_NFC_PN531=y + +# Enable support for WPS USBA out-of-band mechanism +# with USB Flash Drives (UFD) +#CONFIG_WPS_UFD=y + +# Enable validating WPS attributes in management frames +# and WSC messages (WPS 2.0) +#CONFIG_WPS_STRICT=y + +# Enable WPS testing operations +#CONFIG_WPS_TESTING=y + # EAP-IKEv2 #CONFIG_EAP_IKEV2=y diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index 1080ef0..8c959fd 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -1293,6 +1293,10 @@ ifdef CONFIG_FIPS L_CFLAGS += -DCONFIG_FIPS endif +ifdef CONFIG_VALGRIND +CFLAGS += -DCONFIG_VALGRIND +endif + OBJS += $(SHA1OBJS) $(DESOBJS) OBJS_p += $(SHA1OBJS) @@ -1328,12 +1332,6 @@ endif OBJS += src/drivers/driver_common.c -OBJS_wpa_rm := ctrl_iface.c ctrl_iface_unix.c -OBJS_wpa := $(filter-out $(OBJS_wpa_rm),$(OBJS)) $(OBJS_h) tests/test_wpa.c -ifdef CONFIG_AUTHENTICATOR -OBJS_wpa += tests/link_test.c -endif -OBJS_wpa += $(OBJS_l2) OBJS += wpa_supplicant.c events.c blacklist.c wpas_glue.c scan.c OBJS_t := $(OBJS) $(OBJS_l2) eapol_test.c OBJS_t += src/radius/radius_client.c diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index 1d66aa7..8076152 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -1295,6 +1295,10 @@ ifdef CONFIG_FIPS CFLAGS += -DCONFIG_FIPS endif +ifdef CONFIG_VALGRIND +CFLAGS += -DCONFIG_VALGRIND +endif + OBJS += $(SHA1OBJS) $(DESOBJS) OBJS_p += $(SHA1OBJS) diff --git a/wpa_supplicant/defconfig b/wpa_supplicant/defconfig index 2d6bc81..4432123 100644 --- a/wpa_supplicant/defconfig +++ b/wpa_supplicant/defconfig @@ -62,20 +62,12 @@ CONFIG_DRIVER_HOSTAP=y # Driver interface for Atmel driver CONFIG_DRIVER_ATMEL=y -# Driver interface for old Broadcom driver -# Please note that the newer Broadcom driver ("hybrid Linux driver") supports -# Linux wireless extensions and does not need (or even work) with the old -# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver. -#CONFIG_DRIVER_BROADCOM=y -# Example path for wlioctl.h; change to match your configuration -#CFLAGS += -I/opt/WRT54GS/release/src/include - # Driver interface for Intel ipw2100/2200 driver # Deprecated; use CONFIG_DRIVER_WEXT=y instead. #CONFIG_DRIVER_IPW=y -# Driver interface for Ralink driver -#CONFIG_DRIVER_RALINK=y +# Driver interface for Atheros driver +#CONFIG_DRIVER_ATHEROS=y # Driver interface for generic Linux wireless extensions # Note: WEXT is deprecated in the current Linux kernel version and no new @@ -197,14 +189,34 @@ CONFIG_EAP_LEAP=y # Wi-Fi Protected Setup (WPS) #CONFIG_WPS=y + # Enable WSC 2.0 support #CONFIG_WPS2=y + # Enable WPS external registrar functionality #CONFIG_WPS_ER=y + # Disable credentials for an open network by default when acting as a WPS # registrar. #CONFIG_WPS_REG_DISABLE_OPEN=y +# Enable WPS NFC (Near Field Communication) method +#CONFIG_WPS_NFC=y + +# Enable WPS NFC support for NXP PN531 device +#CONFIG_WPS_NFC_PN531=y + +# Enable support for WPS USBA out-of-band mechanism +# with USB Flash Drives (UFD) +#CONFIG_WPS_UFD=y + +# Enable validating WPS attributes in management frames +# and WSC messages (WPS 2.0) +#CONFIG_WPS_STRICT=y + +# Enable WPS testing operations +#CONFIG_WPS_TESTING=y + # EAP-IKEv2 #CONFIG_EAP_IKEV2=y @@ -484,3 +496,18 @@ CONFIG_PEERKEY=y # Hotspot 2.0 #CONFIG_HS20=y + +# Enable TDLS (Tunneled Direct Link Setup, IEEE 802.11z) +#CONFIG_TDLS=y + +# Enable TDLS testing operations +#CONFIG_TDLS_TESTING=y + +# Enable RSN authentication for IBSS +#CONFIG_IBSS_RSN=y + +# Enable DBus control interface +#CONFIG_DBUS=y + +# Enable additional Valgrind support. Valgrind headers are required. +#CONFIG_VALGRIND=y