From: Roy Marples <roy@marples.name>
Date: Thu, 6 Jun 2013 18:39:12 +0000 (+0000)
Subject: Don't log carrier lost if carrier was UNKNOWN.
X-Git-Tag: v6.0.0~41
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2e8e5175d10b9034746eee4ccf4a033a232ef4c;p=thirdparty%2Fdhcpcd.git

Don't log carrier lost if carrier was UNKNOWN.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 7d95228f..253d3dfc 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -384,8 +384,9 @@ handle_carrier(int carrier, int flags, const char *ifname)
 	/* IFF_RUNNING is checked, if needed, earlier and is OS dependant */
 	else if (carrier == LINK_DOWN || (ifp->flags & IFF_UP) == 0) {
 		if (ifp->carrier != LINK_DOWN) {
+			if (ifp->carrier == LINK_UP)
+				syslog(LOG_INFO, "%s: carrier lost", ifp->name);
 			ifp->carrier = LINK_DOWN;
-			syslog(LOG_INFO, "%s: carrier lost", ifp->name);
 			dhcp_close(ifp);
 			dhcp6_drop(ifp, "EXPIRE6");
 			ipv6rs_drop(ifp);
@@ -398,8 +399,8 @@ handle_carrier(int carrier, int flags, const char *ifname)
 		}
 	} else if (carrier == LINK_UP && ifp->flags & IFF_UP) {
 		if (ifp->carrier != LINK_UP) {
-			ifp->carrier = LINK_UP;
 			syslog(LOG_INFO, "%s: carrier acquired", ifp->name);
+			ifp->carrier = LINK_UP;
 			if (ifp->wireless)
 				getifssid(ifp->name, ifp->ssid);
 			configure_interface(ifp, margc, margv);