picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

networkd: keep bond slave up if already attached 

There is no need to disable an already correct enslaved interface.

relates to #10118
This commit is contained in:
Tobias Jungel 2018-10-19 13:12:35 +02:00 committed by Lennart Poettering
parent cc3981b127
commit cbff717048
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -469,6 +469,10 @@ static int link_new(Manager *manager, sd_netlink_message *message, Link **ret) {
return -ENOMEM;
}
r = sd_netlink_message_read_u32(message, IFLA_MASTER, (uint32_t *)&link->master_ifindex);
if (r < 0)
log_link_debug_errno(link, r, "New device has no master, continuing without");
r = sd_netlink_message_read_ether_addr(message, IFLA_ADDRESS, &link->mac);
if (r < 0)
log_link_debug_errno(link, r, "MAC address not found for new device, continuing without");
@ -2358,6 +2362,10 @@ static int link_enter_join_netdev(Link *link) {
return link_joined(link);
if (link->network->bond) {
if (link->network->bond->state == NETDEV_STATE_READY &&
link->network->bond->ifindex == link->master_ifindex)
return link_joined(link);
log_struct(LOG_DEBUG,
LOG_LINK_INTERFACE(link),
LOG_NETDEV_INTERFACE(link->network->bond),

1
src/network/networkd-link.h
View File

@ -52,6 +52,7 @@ typedef struct Link {
unsigned n_ref;
int ifindex;
int master_ifindex;
char *ifname;
char *kind;
unsigned short iftype;