dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

network/link: always join to the main interface when we receive IFLA_MASTER attribute

Browse Source 
Otherwise, e.g. when we enumerate a bridge port first, then the bridge
main interface, then the port cannot be managed by the main interface.

Fixes #30682.
This commit is contained in:
Yu Watanabe
2024-01-05 01:58:01 +09:00
parent b53bd7a32b
commit 74e95e3a81
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/network/networkd-link.c
View File

@@ -2000,20 +2000,18 @@ static int link_update_master(Link *link, sd_netlink_message *message) {
if (master_ifindex == link->ifindex)
master_ifindex = 0;
if (master_ifindex == link->master_ifindex)
return 0;
if (master_ifindex != link->master_ifindex) {
if (link->master_ifindex == 0)
log_link_debug(link, "Attached to master interface: %i", master_ifindex);
else if (master_ifindex == 0)
log_link_debug(link, "Detached from master interface: %i", link->master_ifindex);
else
log_link_debug(link, "Master interface changed: %i %s %i", link->master_ifindex,
special_glyph(SPECIAL_GLYPH_ARROW_RIGHT), master_ifindex);
if (link->master_ifindex == 0)
log_link_debug(link, "Attached to master interface: %i", master_ifindex);
else if (master_ifindex == 0)
log_link_debug(link, "Detached from master interface: %i", link->master_ifindex);
else
log_link_debug(link, "Master interface changed: %i %s %i", link->master_ifindex,
special_glyph(SPECIAL_GLYPH_ARROW_RIGHT), master_ifindex);
link_drop_from_master(link);
link->master_ifindex = master_ifindex;
link_drop_from_master(link);
link->master_ifindex = master_ifindex;
}
r = link_append_to_master(link);
if (r < 0)