36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From 922cdcc6aed81f869fbdd875ad779ef9a2b02e75 Mon Sep 17 00:00:00 2001
|
|
From: Brett Holman <bholman.devel@gmail.com>
|
|
Date: Mon, 13 Mar 2023 09:21:30 -0600
|
|
Subject: [PATCH] network: ipv4acd: update MAC address on change (#26753)
|
|
|
|
Commit 76a86ffdbee2dd9ef0f2b5338e14eb6ba7671456 added function
|
|
ipv4acd_update_mac() but invoked ipv4ll_update_mac(), which doesn't
|
|
align with debug or commit messages.
|
|
|
|
(cherry picked from commit 0a14f83a0edb2c809c932b5d98240dd10a6bb79a)
|
|
(cherry picked from commit 59ae2a45a92025097de94cc7c0c622aa990179cf)
|
|
(cherry picked from commit 0703aa328c0c405e3771af8078c43fa9d5980860)
|
|
|
|
Conflict:NA
|
|
Reference:https://github.com/systemd/systemd-stable/commit/922cdcc6aed81f869fbdd875ad779ef9a2b02e75
|
|
---
|
|
src/network/networkd-link.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
|
|
index 14d0f8eab4..5da0e4c563 100644
|
|
--- a/src/network/networkd-link.c
|
|
+++ b/src/network/networkd-link.c
|
|
@@ -2127,7 +2127,7 @@ static int link_update_hardware_address(Link *link, sd_netlink_message *message)
|
|
log_link_debug_errno(link, r, "Failed to manage link by its new hardware address, ignoring: %m");
|
|
}
|
|
|
|
- r = ipv4ll_update_mac(link);
|
|
+ r = ipv4acd_update_mac(link);
|
|
if (r < 0)
|
|
return log_link_debug_errno(link, r, "Could not update MAC address in IPv4 ACD client: %m");
|
|
|
|
--
|
|
2.33.0
|
|
|