summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorSimon Busch <morphis@gravedo.de>2013-07-15 18:11:44 +0000
committerSaul Wold <sgw@linux.intel.com>2013-07-18 07:14:40 -0700
commit0d045e401bbd6a5ebf31a25e333fccc5a529f8cb (patch)
tree65cf7f93e1ff934e1739e768514c8f3850977499 /meta/recipes-connectivity
parent222ae6001db286d66462c6334f7f054ca727b7be (diff)
downloadopenembedded-core-0d045e401bbd6a5ebf31a25e333fccc5a529f8cb.tar.gz
openembedded-core-0d045e401bbd6a5ebf31a25e333fccc5a529f8cb.tar.bz2
openembedded-core-0d045e401bbd6a5ebf31a25e333fccc5a529f8cb.zip
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. Signed-off-by: Simon Busch <morphis@gravedo.de> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-connectivity')
-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 \
file://wpa_supplicant.conf \
file://wpa_supplicant.conf-sane \
file://99_wpa_supplicant \
- file://fix-libnl3-host-contamination.patch"
+ file://fix-libnl3-host-contamination.patch \
+ file://register-autoscan-correctly.patch"
S = "${WORKDIR}/wpa_supplicant-${PV}"
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 @@
+From f157b78166baff2c32ed3983b4e787417505b343 Mon Sep 17 00:00:00 2001
+From: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
+Date: Mon, 1 Jul 2013 19:11:34 +0300
+Subject: [PATCH] dbus: Register the AutoScan method call at the right place
+
+Upstream-Status: Accepted [hostap@lists.shmoo.com]
+
+Signed-hostap: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
+---
+ wpa_supplicant/dbus/dbus_new.c | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
+index 8bc6618..d076d2d 100644
+--- a/wpa_supplicant/dbus/dbus_new.c
++++ b/wpa_supplicant/dbus/dbus_new.c
+@@ -1917,15 +1917,6 @@ static const struct wpa_dbus_method_desc wpas_dbus_global_methods[] = {
+ END_ARGS
+ }
+ },
+-#ifdef CONFIG_AUTOSCAN
+- { "AutoScan", WPAS_DBUS_NEW_IFACE_INTERFACE,
+- (WPADBusMethodHandler) &wpas_dbus_handler_autoscan,
+- {
+- { "arg", "s", ARG_IN },
+- END_ARGS
+- }
+- },
+-#endif /* CONFIG_AUTOSCAN */
+ { NULL, NULL, NULL, { END_ARGS } }
+ };
+
+@@ -2649,6 +2640,15 @@ static const struct wpa_dbus_method_desc wpas_dbus_interface_methods[] = {
+ }
+ },
+ #endif /* CONFIG_AP */
++#ifdef CONFIG_AUTOSCAN
++ { "AutoScan", WPAS_DBUS_NEW_IFACE_INTERFACE,
++ (WPADBusMethodHandler) &wpas_dbus_handler_autoscan,
++ {
++ { "arg", "s", ARG_IN },
++ END_ARGS
++ }
++ },
++#endif /* CONFIG_AUTOSCAN */
+ { NULL, NULL, NULL, { END_ARGS } }
+ };
+
+--
+1.8.1.2
+