Commit f8ad2721 authored by Nicolas Cavallari's avatar Nicolas Cavallari Committed by Thomas Petazzoni
Browse files

wpa_supplicant: Add an explicit option to enable nl80211. 



Currently, nl80211 support is conditionnal with libnl being enabled,
using implicit dependencies.  This causes problems since it is not
obvious and wpa_supplicant without nl80211 isn't what most user expects.

If nl80211 isn't enabled, then buildroot only enables the wext driver,
which will only work if some deprecated kernel feature isn't left
disabled, or if using a outdated out-of-tree linux driver which doesn't
use the cfg80211 infrastructure.

This makes nl80211 support an explicit option, which
"select BR2_PACKAGE_LIBNL" accordingly.  To handle upgrades nicely, it
would have been nice to have "default y if BR2_PACKAGE_LIBNL", but
Kconfig treats this as a circular dependency.  So instead, this enables
the option by default, which is less worse than not enabling nl80211
when it was previously implicitely enabled.

[Thomas:
 - rewrap Config.in help text
 - add comment about thread dependency.]

Signed-off-by: default avatarNicolas Cavallari <nicolas.cavallari@green-communications.fr>
Reviewed-by: default avatarGary Bisson <gary.bisson@boundarydevices.com>
Tested-by: default avatarGary Bisson <gary.bisson@boundarydevices.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 3dde19e5

package/wpa_supplicant/Config.in

+21 −0
Original line number Diff line number Diff line
@@ -8,6 +8,27 @@ config BR2_PACKAGE_WPA_SUPPLICANT 


if BR2_PACKAGE_WPA_SUPPLICANT



config BR2_PACKAGE_WPA_SUPPLICANT_NL80211

	bool "Enable nl80211 support"

	default y

	select BR2_PACKAGE_LIBNL

	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl

	help

	  Enable support for nl80211.  This is the current wireless

	  API for Linux, supported by all wireless drivers in vanilla

	  Linux, but may not be supported by some out-of-tree Linux

	  wireless drivers.  wpa_supplicant will still fall back to

	  using the Wireless Extensions (wext) API with these drivers.



	  If this option is disabled, then only the deprecated wext

	  API will be supported, with far less features.  Linux may

	  supports using wext with modern drivers using a

	  compatibility layer, but it must be enabled in the kernel

	  configuration.



comment "nl80211 support needs a toolchain w/ threads"

	depends on !BR2_TOOLCHAIN_HAS_THREADS



config BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT

	bool "Enable AP mode"

	help

package/wpa_supplicant/wpa_supplicant.mk

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ WPA_SUPPLICANT_CONFIG_DISABLE = \ 
# libnl-3 needs -lm (for rint) and -lpthread if linking statically

# And library order matters hence stick -lnl-3 first since it's appended

# in the wpa_supplicant Makefiles as in LIBS+=-lnl-3 ... thus failing

ifeq ($(BR2_PACKAGE_LIBNL),y)

ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_NL80211),y)

ifeq ($(BR2_STATIC_LIBS),y)

WPA_SUPPLICANT_LIBS += -lnl-3 -lm -lpthread

endif