Mercurial > hg > dhcpcd

changeset 1879:c72449fd9540 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't spam warning about CSR all the time.
author Roy Marples <roy@marples.name>
date Tue, 26 Mar 2013 11:40:44 +0000
parents dd875f55ecbe
children 95b7a8c49de8
files dhcp.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/dhcp.c	Tue Mar 26 10:48:28 2013 +0000
+++ b/dhcp.c	Tue Mar 26 11:40:44 2013 +0000
@@ -1720,6 +1720,7 @@
 	state->state = DHS_REBIND;
 	eloop_timeout_delete(send_renew, ifp);
 	state->lease.server.s_addr = 0;
+	ifp->options->options &= ~ DHCPCD_CSR_WARNED;
 	send_rebind(ifp);
 }
 
@@ -1831,7 +1832,6 @@
 		    "%s: renew in %u seconds, rebind in %u seconds",
 		    iface->name, lease->renewaltime, lease->rebindtime);
 	}
-	ifo->options &= ~ DHCPCD_CSR_WARNED;
 	ipv4_applyaddr(iface);
 	daemonise();
 	state->state = DHS_BOUND;
@@ -2023,6 +2023,7 @@
 	free(state->old);
 	state->old = NULL;
 	state->lease.addr.s_addr = 0;
+	iface->options->options &= ~ DHCPCD_CSR_WARNED;
 }
 
 static void