summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2014-02-28 17:43:34 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-02 17:25:28 +0000
commite6e5f64bafb692b7bf9d1c536a09ea9517fa24e6 (patch)
tree1e92bf557c967e27f4be4b02ddb1ead075add3fa /meta
parent0d47ab74b115802c4b35c203abc7befcca2ebdba (diff)
downloadpoky-e6e5f64bafb692b7bf9d1c536a09ea9517fa24e6.tar.gz
wpa-supplicant: upgrade to 2.1
- USE {BP} variable; - Updated naming scheme; - Updated copyright owners. - Update defconfig file, is now in sync with current version; as such, more functionality can be enabled for wpa-supplicant. - removed register-autoscan-correctly.patch, included in upstream. (From OE-Core rev: 361d334cabdeb9f25788e9f4b84e8cf7b28d26d3) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc (renamed from meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc)8
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig-gnutls186
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/register-autoscan-correctly.patch51
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb6
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.1.bb2
5 files changed, 162 insertions, 91 deletions
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
index f9c5ea7f9c..11e82877b9 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
@@ -4,8 +4,8 @@ BUGTRACKER = "http://hostap.epitest.fi/bugz/"
4SECTION = "network" 4SECTION = "network"
5LICENSE = "BSD" 5LICENSE = "BSD"
6LIC_FILES_CHKSUM = "file://COPYING;md5=ab87f20cd7e8c0d0a6539b34d3791d0e \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=ab87f20cd7e8c0d0a6539b34d3791d0e \
7 file://README;md5=5cb758942d25f6f61fd4ac388fd446fa \ 7 file://README;beginline=1;endline=56;md5=a07250b28e857455336bb59fc31cb845 \
8 file://wpa_supplicant/wpa_supplicant.c;beginline=1;endline=12;md5=cba4fa09fa364da845ca546f21008909" 8 file://wpa_supplicant/wpa_supplicant.c;beginline=1;endline=12;md5=e8e021e30f3a6ab7c341b66b86626a5a"
9DEPENDS = "gnutls dbus libnl openssl" 9DEPENDS = "gnutls dbus libnl openssl"
10RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" 10RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
11 11
@@ -21,7 +21,9 @@ SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
21 file://wpa_supplicant.conf-sane \ 21 file://wpa_supplicant.conf-sane \
22 file://99_wpa_supplicant \ 22 file://99_wpa_supplicant \
23 file://fix-libnl3-host-contamination.patch \ 23 file://fix-libnl3-host-contamination.patch \
24 file://register-autoscan-correctly.patch" 24 "
25SRC_URI[md5sum] = "e96b8db5a8171cd17a5b2012d6ad7cc7"
26SRC_URI[sha256sum] = "91632e7e3b49a340ce408e2f978a93546a697383abf2e5a60f146faae9e1b277"
25 27
26S = "${WORKDIR}/wpa_supplicant-${PV}" 28S = "${WORKDIR}/wpa_supplicant-${PV}"
27 29
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig-gnutls b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig-gnutls
index 92573e2f99..92ef8231d5 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig-gnutls
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig-gnutls
@@ -78,12 +78,29 @@ CONFIG_DRIVER_HOSTAP=y
78#CONFIG_DRIVER_RALINK=y 78#CONFIG_DRIVER_RALINK=y
79 79
80# Driver interface for generic Linux wireless extensions 80# Driver interface for generic Linux wireless extensions
81# Note: WEXT is deprecated in the current Linux kernel version and no new
82# functionality is added to it. nl80211-based interface is the new
83# replacement for WEXT and its use allows wpa_supplicant to properly control
84# the driver to improve existing functionality like roaming and to support new
85# functionality.
81CONFIG_DRIVER_WEXT=y 86CONFIG_DRIVER_WEXT=y
82 87
83# Driver interface for Linux drivers using the nl80211 kernel interface 88# Driver interface for Linux drivers using the nl80211 kernel interface
84CONFIG_LIBNL32=y
85CONFIG_DRIVER_NL80211=y 89CONFIG_DRIVER_NL80211=y
86 90
91# driver_nl80211.c requires libnl. If you are compiling it yourself
92# you may need to point hostapd to your version of libnl.
93#
94#CFLAGS += -I$<path to libnl include files>
95#LIBS += -L$<path to libnl library files>
96
97# Use libnl v2.0 (or 3.0) libraries.
98#CONFIG_LIBNL20=y
99
100# Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored)
101CONFIG_LIBNL32=y
102
103
87# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) 104# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
88#CONFIG_DRIVER_BSD=y 105#CONFIG_DRIVER_BSD=y
89#CFLAGS += -I/usr/local/include 106#CFLAGS += -I/usr/local/include
@@ -110,11 +127,6 @@ CONFIG_DRIVER_NL80211=y
110# Driver interface for development testing 127# Driver interface for development testing
111#CONFIG_DRIVER_TEST=y 128#CONFIG_DRIVER_TEST=y
112 129
113# Include client MLME (management frame processing) for test driver
114# This can be used to test MLME operations in hostapd with the test interface.
115# space.
116#CONFIG_CLIENT_MLME=y
117
118# Driver interface for wired Ethernet drivers 130# Driver interface for wired Ethernet drivers
119CONFIG_DRIVER_WIRED=y 131CONFIG_DRIVER_WIRED=y
120 132
@@ -144,10 +156,9 @@ CONFIG_EAP_PEAP=y
144CONFIG_EAP_TTLS=y 156CONFIG_EAP_TTLS=y
145 157
146# EAP-FAST 158# EAP-FAST
147# Note: Default OpenSSL package does not include support for all the 159# Note: If OpenSSL is used as the TLS library, OpenSSL 1.0 or newer is needed
148# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL, 160# for EAP-FAST support. Older OpenSSL releases would need to be patched, e.g.,
149# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch) 161# with openssl-0.9.8x-tls-extensions.patch, to add the needed functions.
150# to add the needed functions.
151#CONFIG_EAP_FAST=y 162#CONFIG_EAP_FAST=y
152 163
153# EAP-GTC 164# EAP-GTC
@@ -162,6 +173,9 @@ CONFIG_EAP_OTP=y
162# EAP-PSK (experimental; this is _not_ needed for WPA-PSK) 173# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
163#CONFIG_EAP_PSK=y 174#CONFIG_EAP_PSK=y
164 175
176# EAP-pwd (secure authentication using only a password)
177#CONFIG_EAP_PWD=y
178
165# EAP-PAX 179# EAP-PAX
166#CONFIG_EAP_PAX=y 180#CONFIG_EAP_PAX=y
167 181
@@ -191,10 +205,22 @@ CONFIG_EAP_LEAP=y
191 205
192# Wi-Fi Protected Setup (WPS) 206# Wi-Fi Protected Setup (WPS)
193CONFIG_WPS=y 207CONFIG_WPS=y
208# Enable WSC 2.0 support
209#CONFIG_WPS2=y
210# Enable WPS external registrar functionality
211#CONFIG_WPS_ER=y
212# Disable credentials for an open network by default when acting as a WPS
213# registrar.
214#CONFIG_WPS_REG_DISABLE_OPEN=y
215# Enable WPS support with NFC config method
216#CONFIG_WPS_NFC=y
194 217
195# EAP-IKEv2 218# EAP-IKEv2
196#CONFIG_EAP_IKEV2=y 219#CONFIG_EAP_IKEV2=y
197 220
221# EAP-EKE
222#CONFIG_EAP_EKE=y
223
198# PKCS#12 (PFX) support (used to read private key and certificate file from 224# PKCS#12 (PFX) support (used to read private key and certificate file from
199# a file that usually has extension .p12 or .pfx) 225# a file that usually has extension .p12 or .pfx)
200CONFIG_PKCS12=y 226CONFIG_PKCS12=y
@@ -207,6 +233,12 @@ CONFIG_SMARTCARD=y
207# Enable this if EAP-SIM or EAP-AKA is included 233# Enable this if EAP-SIM or EAP-AKA is included
208#CONFIG_PCSC=y 234#CONFIG_PCSC=y
209 235
236# Support HT overrides (disable HT/HT40, mask MCS rates, etc.)
237#CONFIG_HT_OVERRIDES=y
238
239# Support VHT overrides (disable VHT, mask MCS rates, etc.)
240#CONFIG_VHT_OVERRIDES=y
241
210# Development testing 242# Development testing
211#CONFIG_EAPOL_TEST=y 243#CONFIG_EAPOL_TEST=y
212 244
@@ -214,6 +246,7 @@ CONFIG_SMARTCARD=y
214# unix = UNIX domain sockets (default for Linux/*BSD) 246# unix = UNIX domain sockets (default for Linux/*BSD)
215# udp = UDP sockets using localhost (127.0.0.1) 247# udp = UDP sockets using localhost (127.0.0.1)
216# named_pipe = Windows Named Pipe (default for Windows) 248# named_pipe = Windows Named Pipe (default for Windows)
249# udp-remote = UDP sockets with remote access (only for tests systems/purpose)
217# y = use default (backwards compatibility) 250# y = use default (backwards compatibility)
218# If this option is commented out, control interface is not included in the 251# If this option is commented out, control interface is not included in the
219# build. 252# build.
@@ -225,6 +258,10 @@ CONFIG_CTRL_IFACE=y
225# the resulting binary. 258# the resulting binary.
226#CONFIG_READLINE=y 259#CONFIG_READLINE=y
227 260
261# Include internal line edit mode in wpa_cli. This can be used as a replacement
262# for GNU Readline to provide limited command line editing and history support.
263#CONFIG_WPA_CLI_EDIT=y
264
228# Remove debugging code that is printing out debug message to stdout. 265# Remove debugging code that is printing out debug message to stdout.
229# This can be used to reduce the size of the wpa_supplicant considerably 266# This can be used to reduce the size of the wpa_supplicant considerably
230# if debugging code is not needed. The size reduction can be around 35% 267# if debugging code is not needed. The size reduction can be around 35%
@@ -235,11 +272,6 @@ CONFIG_CTRL_IFACE=y
235# 35-50 kB in code size. 272# 35-50 kB in code size.
236#CONFIG_NO_WPA=y 273#CONFIG_NO_WPA=y
237 274
238# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to
239# save about 1 kB in code size when building only WPA-Personal (no EAP support)
240# or 6 kB if building for WPA-Enterprise.
241#CONFIG_NO_WPA2=y
242
243# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support 275# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support
244# This option can be used to reduce code size by removing support for 276# This option can be used to reduce code size by removing support for
245# converting ASCII passphrases into PSK. If this functionality is removed, the 277# converting ASCII passphrases into PSK. If this functionality is removed, the
@@ -283,9 +315,11 @@ CONFIG_BACKEND=file
283# Select event loop implementation 315# Select event loop implementation
284# eloop = select() loop (default) 316# eloop = select() loop (default)
285# eloop_win = Windows events and WaitForMultipleObject() loop 317# eloop_win = Windows events and WaitForMultipleObject() loop
286# eloop_none = Empty template
287#CONFIG_ELOOP=eloop 318#CONFIG_ELOOP=eloop
288 319
320# Should we use poll instead of select? Select is used by default.
321#CONFIG_ELOOP_POLL=y
322
289# Select layer 2 packet implementation 323# Select layer 2 packet implementation
290# linux = Linux packet socket (default) 324# linux = Linux packet socket (default)
291# pcap = libpcap/libdnet/WinPcap 325# pcap = libpcap/libdnet/WinPcap
@@ -298,26 +332,30 @@ CONFIG_BACKEND=file
298# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS) 332# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
299CONFIG_PEERKEY=y 333CONFIG_PEERKEY=y
300 334
301# IEEE 802.11w (management frame protection) 335# IEEE 802.11w (management frame protection), also known as PMF
302# This version is an experimental implementation based on IEEE 802.11w/D1.0
303# draft and is subject to change since the standard has not yet been finalized.
304# Driver support is also needed for IEEE 802.11w. 336# Driver support is also needed for IEEE 802.11w.
305#CONFIG_IEEE80211W=y 337#CONFIG_IEEE80211W=y
306 338
307# Select TLS implementation 339# Select TLS implementation
308# openssl = OpenSSL (default) 340# openssl = OpenSSL (default)
309# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA) 341# gnutls = GnuTLS
310# internal = Internal TLSv1 implementation (experimental) 342# internal = Internal TLSv1 implementation (experimental)
311# none = Empty template 343# none = Empty template
312#CONFIG_TLS=openssl 344#CONFIG_TLS=openssl
313 345
314# Whether to enable TLS/IA support, which is required for EAP-TTLSv1. 346# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1)
315# You need CONFIG_TLS=gnutls for this to have any effect. Please note that 347# can be enabled to get a stronger construction of messages when block ciphers
316# even though the core GnuTLS library is released under LGPL, this extra 348# are used. It should be noted that some existing TLS v1.0 -based
317# library uses GPL and as such, the terms of GPL apply to the combination 349# implementation may not be compatible with TLS v1.1 message (ClientHello is
318# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not 350# sent prior to negotiating which version will be used)
319# apply for distribution of the resulting binary. 351#CONFIG_TLSV11=y
320#CONFIG_GNUTLS_EXTRA=y 352
353# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2)
354# can be enabled to enable use of stronger crypto algorithms. It should be
355# noted that some existing TLS v1.0 -based implementation may not be compatible
356# with TLS v1.2 message (ClientHello is sent prior to negotiating which version
357# will be used)
358#CONFIG_TLSV12=y
321 359
322# If CONFIG_TLS=internal is used, additional library and include paths are 360# If CONFIG_TLS=internal is used, additional library and include paths are
323# needed for LibTomMath. Alternatively, an integrated, minimal version of 361# needed for LibTomMath. Alternatively, an integrated, minimal version of
@@ -379,6 +417,17 @@ CONFIG_CTRL_IFACE_DBUS_NEW=y
379# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) 417# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
380#CONFIG_DEBUG_FILE=y 418#CONFIG_DEBUG_FILE=y
381 419
420# Send debug messages to syslog instead of stdout
421#CONFIG_DEBUG_SYSLOG=y
422# Set syslog facility for debug messages
423#CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
424
425# Add support for sending all debug messages (regardless of debug verbosity)
426# to the Linux kernel tracing facility. This helps debug the entire stack by
427# making it easy to record everything happening from the driver up into the
428# same file, e.g., using trace-cmd.
429#CONFIG_DEBUG_LINUX_TRACING=y
430
382# Enable privilege separation (see README 'Privilege separation' for details) 431# Enable privilege separation (see README 'Privilege separation' for details)
383#CONFIG_PRIVSEP=y 432#CONFIG_PRIVSEP=y
384 433
@@ -390,7 +439,7 @@ CONFIG_CTRL_IFACE_DBUS_NEW=y
390# This tracks use of memory allocations and other registrations and reports 439# This tracks use of memory allocations and other registrations and reports
391# incorrect use with a backtrace of call (or allocation) location. 440# incorrect use with a backtrace of call (or allocation) location.
392#CONFIG_WPA_TRACE=y 441#CONFIG_WPA_TRACE=y
393# For BSD, comment out these. 442# For BSD, uncomment these.
394#LIBS += -lexecinfo 443#LIBS += -lexecinfo
395#LIBS_p += -lexecinfo 444#LIBS_p += -lexecinfo
396#LIBS_c += -lexecinfo 445#LIBS_c += -lexecinfo
@@ -399,15 +448,69 @@ CONFIG_CTRL_IFACE_DBUS_NEW=y
399# This enables use of libbfd to get more detailed symbols for the backtraces 448# This enables use of libbfd to get more detailed symbols for the backtraces
400# generated by CONFIG_WPA_TRACE=y. 449# generated by CONFIG_WPA_TRACE=y.
401#CONFIG_WPA_TRACE_BFD=y 450#CONFIG_WPA_TRACE_BFD=y
402# For BSD, comment out these. 451# For BSD, uncomment these.
403#LIBS += -lbfd -liberty -lz 452#LIBS += -lbfd -liberty -lz
404#LIBS_p += -lbfd -liberty -lz 453#LIBS_p += -lbfd -liberty -lz
405#LIBS_c += -lbfd -liberty -lz 454#LIBS_c += -lbfd -liberty -lz
455
406CONFIG_TLS = gnutls 456CONFIG_TLS = gnutls
407#CONFIG_GNUTLS_EXTRA=y
408CONFIG_CTRL_IFACE_DBUS=y 457CONFIG_CTRL_IFACE_DBUS=y
409CONFIG_CTRL_IFACE_DBUS_NEW=y 458CONFIG_CTRL_IFACE_DBUS_NEW=y
410 459
460# wpa_supplicant depends on strong random number generation being available
461# from the operating system. os_get_random() function is used to fetch random
462# data when needed, e.g., for key generation. On Linux and BSD systems, this
463# works by reading /dev/urandom. It should be noted that the OS entropy pool
464# needs to be properly initialized before wpa_supplicant is started. This is
465# important especially on embedded devices that do not have a hardware random
466# number generator and may by default start up with minimal entropy available
467# for random number generation.
468#
469# As a safety net, wpa_supplicant is by default trying to internally collect
470# additional entropy for generating random data to mix in with the data fetched
471# from the OS. This by itself is not considered to be very strong, but it may
472# help in cases where the system pool is not initialized properly. However, it
473# is very strongly recommended that the system pool is initialized with enough
474# entropy either by using hardware assisted random number generator or by
475# storing state over device reboots.
476#
477# wpa_supplicant can be configured to maintain its own entropy store over
478# restarts to enhance random number generation. This is not perfect, but it is
479# much more secure than using the same sequence of random numbers after every
480# reboot. This can be enabled with -e<entropy file> command line option. The
481# specified file needs to be readable and writable by wpa_supplicant.
482#
483# If the os_get_random() is known to provide strong random data (e.g., on
484# Linux/BSD, the board in question is known to have reliable source of random
485# data from /dev/urandom), the internal wpa_supplicant random pool can be
486# disabled. This will save some in binary size and CPU use. However, this
487# should only be considered for builds that are known to be used on devices
488# that meet the requirements described above.
489#CONFIG_NO_RANDOM_POOL=y
490
491# IEEE 802.11n (High Throughput) support (mainly for AP mode)
492#CONFIG_IEEE80211N=y
493
494# IEEE 802.11ac (Very High Throughput) support (mainly for AP mode)
495# (depends on CONFIG_IEEE80211N)
496#CONFIG_IEEE80211AC=y
497
498# Wireless Network Management (IEEE Std 802.11v-2011)
499# Note: This is experimental and not complete implementation.
500#CONFIG_WNM=y
501
502# Interworking (IEEE 802.11u)
503# This can be used to enable functionality to improve interworking with
504# external networks (GAS/ANQP to learn more about the networks and network
505# selection based on available credentials).
506#CONFIG_INTERWORKING=y
507
508# Hotspot 2.0
509#CONFIG_HS20=y
510
511# Disable roaming in wpa_supplicant
512#CONFIG_NO_ROAMING=y
513
411# AP mode operations with wpa_supplicant 514# AP mode operations with wpa_supplicant
412# This can be used for controlling AP mode operations with wpa_supplicant. It 515# This can be used for controlling AP mode operations with wpa_supplicant. It
413# should be noted that this is mainly aimed at simple cases like 516# should be noted that this is mainly aimed at simple cases like
@@ -417,12 +520,33 @@ CONFIG_AP=y
417 520
418CONFIG_BGSCAN_SIMPLE=y 521CONFIG_BGSCAN_SIMPLE=y
419 522
523# P2P (Wi-Fi Direct)
524# This can be used to enable P2P support in wpa_supplicant. See README-P2P for
525# more information on P2P operations.
526#CONFIG_P2P=y
527
528# Enable TDLS support
529#CONFIG_TDLS=y
530
531# Wi-Fi Direct
532# This can be used to enable Wi-Fi Direct extensions for P2P using an external
533# program to control the additional information exchanges in the messages.
534#CONFIG_WIFI_DISPLAY=y
535
420# Autoscan 536# Autoscan
421# This can be used to enable automatic scan support in wpa_supplicant. 537# This can be used to enable automatic scan support in wpa_supplicant.
422# See wpa_supplicant.conf for more information on autoscan usage. 538# See wpa_supplicant.conf for more information on autoscan usage.
423# 539#
424# Enabling directly a module will enable autoscan support. 540# Enabling directly a module will enable autoscan support.
425# For exponential module: 541# For exponential module:
426CONFIG_AUTOSCAN_EXPONENTIAL=y 542CONFIG_AUTOSCAN_EXPONENTIAL=y
427# For periodic module: 543# For periodic module:
428#CONFIG_AUTOSCAN_PERIODIC=y 544#CONFIG_AUTOSCAN_PERIODIC=y
545
546# Password (and passphrase, etc.) backend for external storage
547# These optional mechanisms can be used to add support for storing passwords
548# and other secrets in external (to wpa_supplicant) location. This allows, for
549# example, operating system specific key storage to be used
550#
551# External password backend for testing purposes (developer use)
552#CONFIG_EXT_PASSWORD_TEST=y
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/register-autoscan-correctly.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/register-autoscan-correctly.patch
deleted file mode 100644
index 453240fda9..0000000000
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/register-autoscan-correctly.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From f157b78166baff2c32ed3983b4e787417505b343 Mon Sep 17 00:00:00 2001
2From: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
3Date: Mon, 1 Jul 2013 19:11:34 +0300
4Subject: [PATCH] dbus: Register the AutoScan method call at the right place
5
6Upstream-Status: Accepted [hostap@lists.shmoo.com]
7
8Signed-hostap: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
9---
10 wpa_supplicant/dbus/dbus_new.c | 18 +++++++++---------
11 1 file changed, 9 insertions(+), 9 deletions(-)
12
13diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
14index 8bc6618..d076d2d 100644
15--- a/wpa_supplicant/dbus/dbus_new.c
16+++ b/wpa_supplicant/dbus/dbus_new.c
17@@ -1917,15 +1917,6 @@ static const struct wpa_dbus_method_desc wpas_dbus_global_methods[] = {
18 END_ARGS
19 }
20 },
21-#ifdef CONFIG_AUTOSCAN
22- { "AutoScan", WPAS_DBUS_NEW_IFACE_INTERFACE,
23- (WPADBusMethodHandler) &wpas_dbus_handler_autoscan,
24- {
25- { "arg", "s", ARG_IN },
26- END_ARGS
27- }
28- },
29-#endif /* CONFIG_AUTOSCAN */
30 { NULL, NULL, NULL, { END_ARGS } }
31 };
32
33@@ -2649,6 +2640,15 @@ static const struct wpa_dbus_method_desc wpas_dbus_interface_methods[] = {
34 }
35 },
36 #endif /* CONFIG_AP */
37+#ifdef CONFIG_AUTOSCAN
38+ { "AutoScan", WPAS_DBUS_NEW_IFACE_INTERFACE,
39+ (WPADBusMethodHandler) &wpas_dbus_handler_autoscan,
40+ {
41+ { "arg", "s", ARG_IN },
42+ END_ARGS
43+ }
44+ },
45+#endif /* CONFIG_AUTOSCAN */
46 { NULL, NULL, NULL, { END_ARGS } }
47 };
48
49--
501.8.1.2
51
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb
deleted file mode 100644
index a8b0dad302..0000000000
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require wpa-supplicant-2.0.inc
2
3PR = "r1"
4
5SRC_URI[md5sum] = "3be2ebfdcced52e00eda0afe2889839d"
6SRC_URI[sha256sum] = "2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09"
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.1.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.1.bb
new file mode 100644
index 0000000000..afd0654016
--- /dev/null
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.1.bb
@@ -0,0 +1,2 @@
1require wpa-supplicant.inc
2