}
static int link_update_hardware_address(Link *link, sd_netlink_message *message) {
- struct hw_addr_data old;
+ struct hw_addr_data addr;
int r;
assert(link);
if (r < 0 && r != -ENODATA)
return log_link_debug_errno(link, r, "rtnl: failed to read broadcast address: %m");
- old = link->hw_addr;
- r = netlink_message_read_hw_addr(message, IFLA_ADDRESS, &link->hw_addr);
+ r = netlink_message_read_hw_addr(message, IFLA_ADDRESS, &addr);
if (r == -ENODATA)
return 0;
if (r < 0)
return log_link_debug_errno(link, r, "rtnl: failed to read hardware address: %m");
- if (hw_addr_equal(&link->hw_addr, &old))
+ if (hw_addr_equal(&link->hw_addr, &addr))
return 0;
- if (hw_addr_is_null(&old))
- log_link_debug(link, "Saved hardware address: %s", HW_ADDR_TO_STR(&link->hw_addr));
+ if (hw_addr_is_null(&link->hw_addr))
+ log_link_debug(link, "Saved hardware address: %s", HW_ADDR_TO_STR(&addr));
else {
log_link_debug(link, "Hardware address is changed: %s → %s",
- HW_ADDR_TO_STR(&old), HW_ADDR_TO_STR(&link->hw_addr));
+ HW_ADDR_TO_STR(&link->hw_addr), HW_ADDR_TO_STR(&addr));
- if (hashmap_get(link->manager->links_by_hw_addr, &old) == link)
- hashmap_remove(link->manager->links_by_hw_addr, &old);
+ if (hashmap_get(link->manager->links_by_hw_addr, &link->hw_addr) == link)
+ hashmap_remove(link->manager->links_by_hw_addr, &link->hw_addr);
}
+ link->hw_addr = addr;
+
if (!hw_addr_is_null(&link->hw_addr)) {
r = hashmap_ensure_put(&link->manager->links_by_hw_addr, &hw_addr_hash_ops, &link->hw_addr, link);
if (r == -EEXIST && streq_ptr(link->kind, "bond"))