From: Jaehyun Kim <jeik01.kim@samsung.com>
Date: Wed, 8 Sep 2021 06:51:07 +0000 (+0000)
Subject: Merge "Fix build failure when tizen-maintain-online feature is enabled" into tizen
X-Git-Tag: accepted/tizen/unified/20210915.025055~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3be4b5a0f3d6b975583bdbd041c89cfc73d1f9cf;hp=237a525b8f7acc3dbebbe60ecef3305fe4699eab;p=platform%2Fupstream%2Fconnman.git

Merge "Fix build failure when tizen-maintain-online feature is enabled" into tizen
---

diff --git a/src/service.c b/src/service.c
index a409162..c61963e 100755
--- a/src/service.c
+++ b/src/service.c
@@ -9414,7 +9414,13 @@ static gboolean redo_wispr_ipv4(gpointer user_data)
 {
 	struct connman_service *service = user_data;
 
+#if defined TIZEN_MAINTAIN_ONLINE
+	DBG("");
+
+	__connman_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV4);
+#else
 	redo_wispr(service, CONNMAN_IPCONFIG_TYPE_IPV4);
+#endif
 
 	return FALSE;
 }
@@ -9428,19 +9434,6 @@ static gboolean redo_wispr_ipv6(gpointer user_data)
 	return FALSE;
 }
 
-#if defined TIZEN_MAINTAIN_ONLINE
-static gboolean redo_wispr_ipv4(gpointer user_data)
-{
-	struct connman_service *service = user_data;
-
-	DBG("");
-
-	__connman_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV4);
-
-	return FALSE;
-}
-#endif
-
 int __connman_service_online_check_failed(struct connman_service *service,
 					enum connman_ipconfig_type type)
 {