From 0565506882e72b1292c20d5717aabd0407dfe20f Mon Sep 17 00:00:00 2001
From: Seonah Moon <seonah1.moon@samsung.com>
Date: Fri, 15 May 2020 15:58:50 +0900
Subject: [PATCH] gsupplicant: update an interface state in GetInterface
 callback

Change-Id: I9530c2c897c4ed2aae0b90580012ce6c930e3a90
---
 gsupplicant/supplicant.c | 33 ---------------------------------
 packaging/connman.spec   |  2 +-
 2 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c
index 36625d0..2dccc95 100755
--- a/gsupplicant/supplicant.c
+++ b/gsupplicant/supplicant.c
@@ -452,10 +452,6 @@ struct assoc_count_data {
 static unsigned int last_connected_bss_timeout = 0;
 #endif
 
-static void interface_get_params(DBusMessageIter *iter, void *user_data);
-static void interface_get_result(const char *error,
-				DBusMessageIter *iter, void *user_data);
-
 static int network_remove(struct interface_data *data);
 
 #if defined TIZEN_EXT_WIFI_MESH
@@ -5500,29 +5496,11 @@ static void interface_create_result(const char *error,
 	struct interface_create_data *data = user_data;
 	const char *path = NULL;
 	int err;
-#if defined TIZEN_EXT
-	int ret;
-#endif
 
 	SUPPLICANT_DBG("");
 
 	if (error) {
 		g_message("error %s", error);
-#if defined TIZEN_EXT
-		SUPPLICANT_DBG("error %s", error);
-		if (strcmp(error, "fi.w1.wpa_supplicant1.InterfaceExists") == 0) {
-			SUPPLICANT_DBG("Send method: GetInterface");
-			ret = supplicant_dbus_method_call(SUPPLICANT_PATH,
-					SUPPLICANT_INTERFACE,
-					"GetInterface",
-					interface_get_params,
-					interface_get_result, user_data,
-					NULL);
-			if (ret < 0)
-				interface_create_data_free(data);
-			return;
-		}
-#endif
 		err = -EIO;
 		goto done;
 	}
@@ -5872,7 +5850,6 @@ int g_supplicant_interface_create(const char *ifname, const char *driver,
 	data->callback = callback;
 	data->user_data = user_data;
 
-#if !defined TIZEN_EXT
 	ret = supplicant_dbus_method_call(SUPPLICANT_PATH,
 						SUPPLICANT_INTERFACE,
 						"GetInterface",
@@ -5881,16 +5858,6 @@ int g_supplicant_interface_create(const char *ifname, const char *driver,
 						NULL);
 	if (ret < 0)
 		interface_create_data_free(data);
-#else
-	ret = supplicant_dbus_method_call(SUPPLICANT_PATH,
-						SUPPLICANT_INTERFACE,
-						"CreateInterface",
-						interface_create_params,
-						interface_create_result, data,
-						NULL);
-	if (ret < 0)
-		interface_create_data_free(data);
-#endif
 
 	return ret;
 }
diff --git a/packaging/connman.spec b/packaging/connman.spec
index a21b846..4a6815e 100644
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -5,7 +5,7 @@
 
 Name:           connman
 Version:        1.37
-Release:        40
+Release:        41
 License:        GPL-2.0+
 Summary:        Connection Manager
 Url:            http://connman.net
-- 
2.7.4