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>

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 8d7233a908cf7984a6fa15a8a307cd5ed1b357c0..ce669a1ffa4fe4876b32a8f5bc829525a3bab459 100644 (file)
--- 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 (file)
index 0000000..453240f
--- /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
+