summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSimon Busch <morphis@gravedo.de>2013-07-15 18:11:44 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-18 21:23:42 +0100
commit314b92a8edd8c61020bfae58aa4c3ee10f94653d (patch)
tree03a207f84f5f7d907163df3cbe140baac1bd087e /meta
parente9b5ef1c2014ee4fbaca7cfd6e206c8fe68d3f7f (diff)
downloadpoky-314b92a8edd8c61020bfae58aa4c3ee10f94653d.tar.gz
wpa-supplicant: backport patch to fix dbus interface for autoscan functionality
See https://lists.connman.net/pipermail/connman/2013-July/014871.html for details about the issue with connman and http://lists.shmoo.com/pipermail/hostap/2013-July/028167.html about the upstream submission of the patch. (From OE-Core rev: 0d045e401bbd6a5ebf31a25e333fccc5a529f8cb) Signed-off-by: Simon Busch <morphis@gravedo.de> Signed-off-by: Saul Wold <sgw@linux.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-2.0.inc3
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/register-autoscan-correctly.patch51
2 files changed, 53 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
index 8d7233a908..ce669a1ffa 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
@@ -20,7 +20,8 @@ SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
20 file://wpa_supplicant.conf \ 20 file://wpa_supplicant.conf \
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 25
25S = "${WORKDIR}/wpa_supplicant-${PV}" 26S = "${WORKDIR}/wpa_supplicant-${PV}"
26 27
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
new file mode 100644
index 0000000000..453240fda9
--- /dev/null
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/register-autoscan-correctly.patch
@@ -0,0 +1,51 @@
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