summaryrefslogtreecommitdiffstats
path: root/dhcpcd.c
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2009-03-03 23:41:53 +0000
committerRoy Marples <roy@marples.name>2009-03-03 23:41:53 +0000
commit746e44f9c2425916efb61485ae22cf67b9a38408 (patch)
tree8705acf824b9c71cedf20fcfa5abc8a781357e12 /dhcpcd.c
parent0ffa23aeb6deed59311ea6fd3efd09a6cc3c8ef3 (diff)
downloaddhcpcd-746e44f9c2425916efb61485ae22cf67b9a38408.tar.xz
If we reboot an IPv4LL address, start DHCP negotiation right away.
Diffstat (limited to 'dhcpcd.c')
-rw-r--r--dhcpcd.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/dhcpcd.c b/dhcpcd.c
index 327aa935..0436104d 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -364,9 +364,9 @@ start_expire(void *arg)
{
struct interface *iface = arg;
+ iface->state->interval = 0;
if (iface->addr.s_addr == 0) {
/* We failed to reboot, so enter discovery. */
- iface->state->interval = 0;
start_discover(iface);
return;
}
@@ -375,7 +375,6 @@ start_expire(void *arg)
delete_timeout(NULL, iface);
drop_config(iface, "EXPIRE");
unlink(iface->leasefile);
- iface->state->interval = 0;
if (iface->carrier != LINK_DOWN)
start_interface(iface);
}