summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaesub kim <taesub.kim@samsung.com>2017-03-28 09:30:24 (GMT)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>2017-03-28 09:30:24 (GMT)
commitb66e94f65d745a5ddd24a68bf68d91186aa320d7 (patch)
tree9461d6b92530d102ce11e4cd1716434e042ab48e
parent619c30df57f62fbbc958f707f681ebe5ef4a5470 (diff)
parent2a675d6cae5a359ea30a971ae1c9d2ed4316dd2c (diff)
downloadconnman-b66e94f65d745a5ddd24a68bf68d91186aa320d7.zip
connman-b66e94f65d745a5ddd24a68bf68d91186aa320d7.tar.gz
connman-b66e94f65d745a5ddd24a68bf68d91186aa320d7.tar.bz2
Merge "[upstream patch] dhcp: Remove the possible remaining dhcp_retry_cb timer" into tizen
-rwxr-xr-xsrc/dhcp.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/dhcp.c b/src/dhcp.c
index 013948e..32ffcd9 100755
--- 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;