Mercurial > hg > dhcpcd
changeset 1535:a9c6a8491829 draft
Rever prior patch that added an extra second per interface now we
always daemonise in master mode.
| author | Roy Marples <roy@marples.name> |
|---|---|
| date | Sat, 26 Jun 2010 10:36:20 +0000 |
| parents | 9d5f74b954b4 |
| children | 62486dedcf13 |
| files | dhcpcd.c |
| diffstat | 1 files changed, 0 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/dhcpcd.c Sat Jun 26 09:17:54 2010 +0000 +++ b/dhcpcd.c Sat Jun 26 10:36:20 2010 +0000 @@ -195,7 +195,6 @@ handle_exit_timeout(_unused void *arg) { int timeout; - struct interface *ifp; syslog(LOG_ERR, "timed out"); if (!(options & DHCPCD_TIMEOUT_IPV4LL)) { @@ -207,9 +206,6 @@ } options &= ~DHCPCD_TIMEOUT_IPV4LL; timeout = (PROBE_NUM * PROBE_MAX) + PROBE_WAIT + 1; - /* Add an extra second per interface */ - for (ifp = ifaces; ifp; ifp = ifp->next) - timeout++; syslog(LOG_WARNING, "allowing %d seconds for IPv4LL timeout", timeout); add_timeout_sec(timeout, handle_exit_timeout, NULL); }