From b650a5d49208eb9a5e3778803be747e4b6529666 Mon Sep 17 00:00:00 2001
From: Denis Kenzior <denkenz@gmail.com>
Date: Wed, 5 Sep 2018 10:37:14 -0500
Subject: [PATCH] station: Move ConnectHiddenNetwork to station

---
 src/device.c  | 15 ---------------
 src/station.c |  5 ++++-
 src/station.h |  4 ----
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/device.c b/src/device.c
index adbaa09d..c6559c60 100644
--- a/src/device.c
+++ b/src/device.c
@@ -115,19 +115,6 @@ static struct l_dbus_message *device_get_networks(struct l_dbus *dbus,
 	return station_dbus_get_networks(dbus, message, station);
 }
 
-static struct l_dbus_message *device_connect_hidden_network(struct l_dbus *dbus,
-						struct l_dbus_message *message,
-						void *user_data)
-{
-	struct device *device = user_data;
-	struct station *station = device->station;
-
-	if (!device->powered || !device->station)
-		return dbus_error_not_available(message);
-
-	return station_dbus_connect_hidden_network(dbus, message, station);
-}
-
 static bool device_property_get_name(struct l_dbus *dbus,
 					struct l_dbus_message *message,
 					struct l_dbus_message_builder *builder,
@@ -464,8 +451,6 @@ static void setup_device_interface(struct l_dbus_interface *interface)
 	l_dbus_interface_method(interface, "GetOrderedNetworks", 0,
 				device_get_networks, "a(osns)", "",
 				"networks");
-	l_dbus_interface_method(interface, "ConnectHiddenNetwork", 0,
-				device_connect_hidden_network, "", "s", "name");
 	l_dbus_interface_property(interface, "Name", 0, "s",
 					device_property_get_name, NULL);
 	l_dbus_interface_property(interface, "Address", 0, "s",
diff --git a/src/station.c b/src/station.c
index 4d23a5a4..cfc4185b 100644
--- a/src/station.c
+++ b/src/station.c
@@ -1704,7 +1704,7 @@ next:
 	return true;
 }
 
-struct l_dbus_message *station_dbus_connect_hidden_network(
+static struct l_dbus_message *station_dbus_connect_hidden_network(
 						struct l_dbus *dbus,
 						struct l_dbus_message *message,
 						void *user_data)
@@ -2193,6 +2193,9 @@ void station_free(struct station *station)
 
 static void station_setup_interface(struct l_dbus_interface *interface)
 {
+	l_dbus_interface_method(interface, "ConnectHiddenNetwork", 0,
+				station_dbus_connect_hidden_network,
+				"", "s", "name");
 	l_dbus_interface_method(interface, "RegisterSignalLevelAgent", 0,
 				station_dbus_signal_agent_register,
 				"", "oan", "path", "levels");
diff --git a/src/station.h b/src/station.h
index 4fc684c0..7d770a5e 100644
--- a/src/station.h
+++ b/src/station.h
@@ -99,10 +99,6 @@ void station_ap_directed_roam(struct station *station,
 				const struct mmpdu_header *hdr,
 				const void *body, size_t body_len);
 
-struct l_dbus_message *station_dbus_connect_hidden_network(
-						struct l_dbus *dbus,
-						struct l_dbus_message *message,
-						void *user_data);
 struct l_dbus_message *station_dbus_disconnect(struct l_dbus *dbus,
 						struct l_dbus_message *message,
 						void *user_data);