From: Roy Marples <roy@marples.name>
Date: Sun, 29 Jan 2012 16:49:04 +0000 (+0000)
Subject: Remove the RA's before reporting no carrier.
X-Git-Tag: v5.5.1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70b967d7d79d93d4a347b9437dbb1bccb4663f95;p=thirdparty%2Fdhcpcd.git

Remove the RA's before reporting no carrier.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 090a429b..819953b5 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -912,13 +912,13 @@ handle_carrier(int action, int flags, const char *ifname)
 			syslog(LOG_INFO, "%s: carrier lost", iface->name);
 			close_sockets(iface);
 			delete_timeouts(iface, start_expire, NULL);
-			drop_dhcp(iface, "NOCARRIER");
 			if (iface->ras) {
 				ipv6rs_free(iface);
 				iface->ras = NULL;
 				iface->state->reason = "ROUTERADVERT";
 				run_script(iface);
 			}
+			drop_dhcp(iface, "NOCARRIER");
 		}
 	} else if (carrier == 1 && !(~iface->flags & (IFF_UP | IFF_RUNNING))) {
 		if (iface->carrier != LINK_UP) {