X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-ipv4ll.c;h=beac939b39522b9a38694a9d26a385424f53cc22;hb=f2dacc96b25528ca1b0caca6364a69d656cf1569;hp=5467bc372e3455e07cf108bd6b40326b86e1efd4;hpb=b22d8a00f48f3c5fc4510b4acd3e1a43e731e592;p=elogind.git

diff --git a/src/network/networkd-ipv4ll.c b/src/network/networkd-ipv4ll.c
index 5467bc372..beac939b3 100644
--- a/src/network/networkd-ipv4ll.c
+++ b/src/network/networkd-ipv4ll.c
@@ -40,12 +40,11 @@ static int ipv4ll_address_lost(Link *link) {
         if (r < 0)
                 return 0;
 
-        log_debug_link(link, "IPv4 link-local release %u.%u.%u.%u",
-                       ADDRESS_FMT_VAL(addr));
+        log_link_debug(link, "IPv4 link-local release %u.%u.%u.%u", ADDRESS_FMT_VAL(addr));
 
         r = address_new_dynamic(&address);
         if (r < 0) {
-                log_error_link(link, "Could not allocate address: %s", strerror(-r));
+                log_link_error(link, "Could not allocate address: %s", strerror(-r));
                 return r;
         }
 
@@ -58,7 +57,7 @@ static int ipv4ll_address_lost(Link *link) {
 
         r = route_new_dynamic(&route, RTPROT_UNSPEC);
         if (r < 0) {
-                log_error_link(link, "Could not allocate route: %s",
+                log_link_error(link, "Could not allocate route: %s",
                                strerror(-r));
                 return r;
         }
@@ -83,7 +82,7 @@ static int ipv4ll_route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdat
 
         r = sd_rtnl_message_get_errno(m);
         if (r < 0 && r != -EEXIST) {
-                log_error_link(link, "could not set ipv4ll route: %s", strerror(-r));
+                log_link_error(link, "could not set ipv4ll route: %s", strerror(-r));
                 link_enter_failed(link);
         }
 
@@ -104,7 +103,7 @@ static int ipv4ll_address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userd
 
         r = sd_rtnl_message_get_errno(m);
         if (r < 0 && r != -EEXIST) {
-                log_error_link(link, "could not set ipv4ll address: %s", strerror(-r));
+                log_link_error(link, "could not set ipv4ll address: %s", strerror(-r));
                 link_enter_failed(link);
         } else if (r >= 0) {
                 /* calling handler directly so take a ref */
@@ -135,7 +134,7 @@ static int ipv4ll_address_claimed(sd_ipv4ll *ll, Link *link) {
         else if (r < 0)
                 return r;
 
-        log_debug_link(link, "IPv4 link-local claim %u.%u.%u.%u",
+        log_link_debug(link, "IPv4 link-local claim %u.%u.%u.%u",
                        ADDRESS_FMT_VAL(address));
 
         r = address_new_dynamic(&ll_addr);
@@ -200,9 +199,9 @@ static void ipv4ll_handler(sd_ipv4ll *ll, int event, void *userdata){
                         break;
                 default:
                         if (event < 0)
-                                log_warning_link(link, "IPv4 link-local error: %s", strerror(-event));
+                                log_link_warning(link, "IPv4 link-local error: %s", strerror(-event));
                         else
-                                log_warning_link(link, "IPv4 link-local unknown event: %d", event);
+                                log_link_warning(link, "IPv4 link-local unknown event: %d", event);
                         break;
         }
 }