]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
LLDP: Fix logs for LLDP
authorSusant Sahani <ssahani@gmail.com>
Fri, 10 May 2019 12:17:45 +0000 (17:47 +0530)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 10 May 2019 21:14:39 +0000 (06:14 +0900)
```
May 10 11:08:54 test systemd-networkd[447]: wwan0: Failed to stop LLDP: Success
May 10 11:08:54 test systemd-networkd[447]: wwan0: Gained carrier
May 10 11:08:54 test systemd-networkd[447]: wwan0: Failed to start LLDP: Success
```

src/network/networkd-link.c

index 9c6dc4d6d676330bda889d72cd8ea5aec5f3c655..af83cb49351e73c8f21dfbbb2e6b9aa170c35536 100644 (file)
@@ -3027,16 +3027,16 @@ static int link_update_lldp(Link *link) {
 
         if (link->flags & IFF_UP) {
                 r = sd_lldp_start(link->lldp);
+                if (r < 0)
+                        return log_link_warning_errno(link, r, "Failed to start LLDP: %m");
                 if (r > 0)
                         log_link_debug(link, "Started LLDP.");
-                else
-                        log_link_warning_errno(link, r, "Failed to start LLDP: %m");
         } else {
                 r = sd_lldp_stop(link->lldp);
+                if (r < 0)
+                        return log_link_warning_errno(link, r, "Failed to stop LLDP: %m");
                 if (r > 0)
                         log_link_debug(link, "Stopped LLDP.");
-                else
-                        log_link_warning_errno(link, r, "Failed to stop LLDP: %m");
         }
 
         return r;