Patchwork dbus: Register the AutoScan method call at the right place

login
register
mail settings
Submitter Tomasz Bursztyka
Date July 1, 2013, 1:07 p.m.
Message ID <1372684060-768-1-git-send-email-tomasz.bursztyka@linux.intel.com>
Download mbox | patch
Permalink /patch/256124/
State Accepted
Commit 06aeff5f8f2ba6d116911a1e3507519c44ee5043
Headers show

Comments

Tomasz Bursztyka - July 1, 2013, 1:07 p.m.
Signed-hostap: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
---

Hi,

Found out, finally, that there had been a mistake in my version 4 of the autoscan initial patches.
It was registering the AutoScan method call in the wrong place. Version 3 of the patchset was right.

I don't know how, but I made a mistake in this version 4 (a rebase or whatever).

So please review, this patch which fixes the AutoScan method call registration

Sorry for this.

 wpa_supplicant/dbus/dbus_new.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
Jouni Malinen - July 1, 2013, 4:12 p.m.
On Mon, Jul 01, 2013 at 04:07:40PM +0300, Tomasz Bursztyka wrote:
> So please review, this patch which fixes the AutoScan method call registration

Thanks, applied.

Patch

diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
index 9293d72..ddd2c82 100644
--- a/wpa_supplicant/dbus/dbus_new.c
+++ b/wpa_supplicant/dbus/dbus_new.c
@@ -1990,15 +1990,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 } }
 };
 
@@ -2736,6 +2727,15 @@  static const struct wpa_dbus_method_desc wpas_dbus_interface_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 } }
 };