From: Marcel Holtmann <marcel@holtmann.org>
Date: Fri, 26 Nov 2010 09:49:09 +0000 (+0100)
Subject: Revert "Return to mainloop before starting DHCP procedure"
X-Git-Tag: 0.64~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=abe0a8232bb8c92883bd4328becdbf60b7d54e55;p=platform%2Fupstream%2Fconnman.git

Revert "Return to mainloop before starting DHCP procedure"

This reverts commit c678775fd7e36250be2c036e4746d8af0164fea9.
---

diff --git a/plugins/dhcp.c b/plugins/dhcp.c
index e4dff18..73c975d 100644
--- a/plugins/dhcp.c
+++ b/plugins/dhcp.c
@@ -111,15 +111,6 @@ static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data)
 	connman_dhcp_bound(dhcp);
 }
 
-static gboolean start_dhcp(gpointer user_data)
-{
-	GDHCPClient *dhcp_client = user_data;
-
-	g_dhcp_client_start(dhcp_client);
-
-	return FALSE;
-}
-
 static int dhcp_request(struct connman_dhcp *dhcp)
 {
 	GDHCPClient *dhcp_client;
@@ -164,9 +155,7 @@ static int dhcp_request(struct connman_dhcp *dhcp)
 
 	g_dhcp_client_ref(dhcp_client);
 
-	g_timeout_add_seconds(0, start_dhcp, dhcp_client);
-
-	return 0;
+	return g_dhcp_client_start(dhcp_client);
 }
 
 static int dhcp_release(struct connman_dhcp *dhcp)