aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/android.config
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2013-05-04 17:16:55 (GMT)
committerJouni Malinen <j@w1.fi>2013-05-04 17:19:50 (GMT)
commitabfc3ad9afb6f0130afbfa60fdc8c98a68dfc527 (patch)
treed0b8408568e09c16087ecf53af5bed0f01d5eda0 /wpa_supplicant/android.config
parenta01e10da68f02469558745488bccd48beedad270 (diff)
downloadhostap-abfc3ad9afb6f0130afbfa60fdc8c98a68dfc527.zip
hostap-abfc3ad9afb6f0130afbfa60fdc8c98a68dfc527.tar.gz
hostap-abfc3ad9afb6f0130afbfa60fdc8c98a68dfc527.tar.bz2
Synchronize build config comments for wpa_supplicant
This updates number of comments in android.config to match the latest version in defconfig and adds some of the entries that were previously present only in android.config into defconfig. Signed-hostap: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'wpa_supplicant/android.config')
-rw-r--r--wpa_supplicant/android.config35
1 files changed, 30 insertions, 5 deletions
diff --git a/wpa_supplicant/android.config b/wpa_supplicant/android.config
index 99f1ed9..9258a0d 100644
--- a/wpa_supplicant/android.config
+++ b/wpa_supplicant/android.config
@@ -236,6 +236,7 @@ CONFIG_SMARTCARD=y
# unix = UNIX domain sockets (default for Linux/*BSD)
# udp = UDP sockets using localhost (127.0.0.1)
# named_pipe = Windows Named Pipe (default for Windows)
+# udp-remote = UDP sockets with remote access (only for tests systems/purpose)
# y = use default (backwards compatibility)
# If this option is commented out, control interface is not included in the
# build.
@@ -327,9 +328,7 @@ CONFIG_L2_PACKET=linux
# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
CONFIG_PEERKEY=y
-# IEEE 802.11w (management frame protection)
-# This version is an experimental implementation based on IEEE 802.11w/D1.0
-# draft and is subject to change since the standard has not yet been finalized.
+# IEEE 802.11w (management frame protection), also known as PMF
# Driver support is also needed for IEEE 802.11w.
CONFIG_IEEE80211W=y
@@ -504,10 +503,36 @@ CONFIG_HS20=y
# Disable roaming in wpa_supplicant
CONFIG_NO_ROAMING=y
-# Enable P2P
-CONFIG_P2P=y
+# AP mode operations with wpa_supplicant
+# This can be used for controlling AP mode operations with wpa_supplicant. It
+# should be noted that this is mainly aimed at simple cases like
+# WPA2-Personal while more complex configurations like WPA2-Enterprise with an
+# external RADIUS server can be supported with hostapd.
CONFIG_AP=y
+# P2P (Wi-Fi Direct)
+# This can be used to enable P2P support in wpa_supplicant. See README-P2P for
+# more information on P2P operations.
+CONFIG_P2P=y
+
CONFIG_TDLS=y
+# Autoscan
+# This can be used to enable automatic scan support in wpa_supplicant.
+# See wpa_supplicant.conf for more information on autoscan usage.
+#
+# Enabling directly a module will enable autoscan support.
+# For exponential module:
+#CONFIG_AUTOSCAN_EXPONENTIAL=y
+# For periodic module:
+#CONFIG_AUTOSCAN_PERIODIC=y
+
+# Password (and passphrase, etc.) backend for external storage
+# These optional mechanisms can be used to add support for storing passwords
+# and other secrets in external (to wpa_supplicant) location. This allows, for
+# example, operating system specific key storage to be used
+#
+# External password backend for testing purposes (developer use)
+#CONFIG_EXT_PASSWORD_TEST=y
+
include $(wildcard $(LOCAL_PATH)/android_config_*.inc)