]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Don't log carrier lost if carrier was UNKNOWN.
authorRoy Marples <roy@marples.name>
Thu, 6 Jun 2013 18:39:12 +0000 (18:39 +0000)
committerRoy Marples <roy@marples.name>
Thu, 6 Jun 2013 18:39:12 +0000 (18:39 +0000)
dhcpcd.c

index 7d95228f5c11640feb8d14bb725f2ca4a816f224..253d3dfc43198c6fc357302903aa6e7c01977d93 100644 (file)
--- 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);