Patchwork wpa-supplicant: backport patch to fix dbus interface for autoscan functionality

login
register
mail settings
Submitter Simon Busch
Date July 15, 2013, 5 p.m.
Message ID <1373907623-24030-1-git-send-email-morphis@gravedo.de>
Download mbox | patch
Permalink /patch/53697/
State New
Headers show

Comments

Simon Busch - July 15, 2013, 5 p.m.
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>
---
 .../wpa-supplicant/wpa-supplicant-2.0.inc          |  3 +-
 .../register-autoscan-correctly.patch              | 49 ++++++++++++++++++++++
 .../wpa-supplicant/wpa-supplicant_2.0.bb           |  2 +-
 3 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/register-autoscan-correctly.patch
Saul Wold - July 15, 2013, 5:07 p.m.
On 07/15/2013 10:00 AM, Simon Busch wrote:
> 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>
> ---
>   .../wpa-supplicant/wpa-supplicant-2.0.inc          |  3 +-
>   .../register-autoscan-correctly.patch              | 49 ++++++++++++++++++++++
>   .../wpa-supplicant/wpa-supplicant_2.0.bb           |  2 +-
>   3 files changed, 52 insertions(+), 2 deletions(-)
>   create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/register-autoscan-correctly.patch
>
> 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 8d7233a..ce669a1 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 0000000..4881295
> --- /dev/null
> +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/register-autoscan-correctly.patch
This needs an Upstream-Status: tag in this patch.
> @@ -0,0 +1,49 @@
> +From 199f871006f756911a844dfadbc6e8b98e1088ef Mon Sep 17 00:00:00 2001
> +From: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
> +Date: Mon, 1 Jul 2013 16:07:40 +0300
> +Subject: [PATCH] dbus: Register the AutoScan method call at the right place
> +
> +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
> +
> diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb
> index a8b0dad..da18621 100644
> --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb
> +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb
> @@ -1,6 +1,6 @@
>   require wpa-supplicant-2.0.inc
>
> -PR = "r1"
> +PR = "r2"
>
No PR bumps required anymore.

Thanks
	Sau!

>   SRC_URI[md5sum] = "3be2ebfdcced52e00eda0afe2889839d"
>   SRC_URI[sha256sum] = "2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09"
>

Patch

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 8d7233a..ce669a1 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 0000000..4881295
--- /dev/null
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/register-autoscan-correctly.patch
@@ -0,0 +1,49 @@ 
+From 199f871006f756911a844dfadbc6e8b98e1088ef Mon Sep 17 00:00:00 2001
+From: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
+Date: Mon, 1 Jul 2013 16:07:40 +0300
+Subject: [PATCH] dbus: Register the AutoScan method call at the right place
+
+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
+
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb
index a8b0dad..da18621 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb
@@ -1,6 +1,6 @@ 
 require wpa-supplicant-2.0.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI[md5sum] = "3be2ebfdcced52e00eda0afe2889839d"
 SRC_URI[sha256sum] = "2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09"