[upstream patch] dhcp: Remove the possible remaining dhcp_retry_cb timer

Change-Id: I9759e546298a5ae5cdfccfd629512f475e9ec2e8
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>

diff --git a/src/dhcp.c b/src/dhcp.c
index 5b0beab..b48cdc6 100755 (executable)
--- a/src/dhcp.c
+++ b/src/dhcp.c
@@ -257,9 +257,12 @@ static void no_lease_cb(GDHCPClient *dhcp_client, gpointer user_data)
        DBG("No lease available ipv4ll %d client %p", ipv4ll_running,
                dhcp->ipv4ll_client);
 
+       if (dhcp->timeout > 0)
+               g_source_remove(dhcp->timeout);
+
        dhcp->timeout = g_timeout_add_seconds(RATE_LIMIT_INTERVAL,
-                                               dhcp_retry_cb,
-                                               dhcp);
+                       dhcp_retry_cb,
+                       dhcp);
        if (ipv4ll_running)
                return;