From 4bd2c4e8e0b3d88e58aa54039a5bc38a3662e75d Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 26 Nov 2021 21:00:18 +0900 Subject: [PATCH 1/2] netif-util: update log message Follow-up for 37593b7c488f7b957936500158f200af16534c6b. --- src/shared/netif-util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/netif-util.c b/src/shared/netif-util.c index 8d3d4473fa..6afb3c3b69 100644 --- a/src/shared/netif-util.c +++ b/src/shared/netif-util.c @@ -148,14 +148,14 @@ int net_verify_hardware_address( if (ether_addr_is_multicast(&new_hw_addr->ether)) { if (warn_invalid) - log_link_warning(&link, "Specified MAC address has multicast bit set, clearing the bit."); + log_link_warning(&link, "Specified MAC address has the multicast bit set, clearing the bit."); new_hw_addr->bytes[0] &= 0xfe; } if (!ether_addr_is_local(&new_hw_addr->ether)) { if (warn_invalid) - log_link_warning(&link, "Specified MAC address has not local assignment bit set, setting the bit."); + log_link_warning(&link, "Specified MAC address does not have the local assignment bit set, setting the bit."); new_hw_addr->bytes[0] |= 0x02; } From 36edc2c956aa1bbad9e299d45d87d8a93980c7f2 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 26 Nov 2021 21:01:30 +0900 Subject: [PATCH 2/2] network: update comment Addresses https://github.com/systemd/systemd/pull/21517#discussion_r757096584. --- src/network/networkd-setlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c index 8b44965409..e7b39778da 100644 --- a/src/network/networkd-setlink.c +++ b/src/network/networkd-setlink.c @@ -543,9 +543,9 @@ static bool link_is_ready_to_call_set_link(Request *req) { break; case SET_LINK_MAC: if (req->netlink_handler == link_set_mac_handler) { - /* This is the second trial to set hardware address. On the first attempt + /* This is the second attempt to set hardware address. On the first attempt * req->netlink_handler points to link_set_mac_allow_retry_handler(). - * The first trial failed as the interface was up. */ + * The first attempt failed as the interface was up. */ r = link_down(link); if (r < 0) { link_enter_failed(link);