shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-30 14:55:37 +03:00
Code

network: set MAC address before enslaving to bond or bridge interface

Browse Source 
As the master interface may inherit the slave MAC address.
This commit is contained in:
Yu Watanabe 2021-12-07 05:57:29 +09:00
parent 0ddd608a6d
commit 5329a37935
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/network/networkd-setlink.c
View File

@ -568,12 +568,19 @@ static bool link_is_ready_to_call_set_link(Request *req) {
break;
case SET_LINK_MASTER: {
uint32_t m = 0;
Request req_mac = {
.link = link,
.type = REQUEST_TYPE_SET_LINK,
.set_link_operation_ptr = INT_TO_PTR(SET_LINK_MAC),
};
if (link->network->batadv) {
if (!netdev_is_ready(link->network->batadv))
return false;
m = link->network->batadv->ifindex;
} else if (link->network->bond) {
if (ordered_set_contains(link->manager->request_queue, &req_mac))
return false;
if (!netdev_is_ready(link->network->bond))
return false;
m = link->network->bond->ifindex;
@ -589,6 +596,8 @@ static bool link_is_ready_to_call_set_link(Request *req) {
}
}
} else if (link->network->bridge) {
if (ordered_set_contains(link->manager->request_queue, &req_mac))
return false;
if (!netdev_is_ready(link->network->bridge))
return false;
m = link->network->bridge->ifindex;