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: handle bound_by list even if IgnoreCarrierLoss=yes

Browse Source
This commit is contained in:
Yu Watanabe
2021-06-06 16:36:54 +09:00
parent ad82f0c32b
commit aa9117c0c4
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1483,9 +1483,13 @@ static int link_carrier_gained(Link *link) {
assert(link);
r = link_handle_bound_by_list(link);
if (r < 0)
return r;
if (link->iftype == ARPHRD_CAN)
/* let's shortcut things for CAN which doesn't need most of what's done below. */
return link_handle_bound_by_list(link);
return 0;
r = wifi_get_info(link);
if (r < 0)
@@ -1506,7 +1510,7 @@ static int link_carrier_gained(Link *link) {
return r;
}
return link_handle_bound_by_list(link);
return 0;
}
static int link_carrier_lost(Link *link) {
@@ -1514,12 +1518,16 @@ static int link_carrier_lost(Link *link) {
assert(link);
if (link->network && link->network->ignore_carrier_loss)
return 0;
r = link_handle_bound_by_list(link);
if (r < 0)
return r;
if (link->iftype == ARPHRD_CAN)
/* let's shortcut things for CAN which doesn't need most of what's done below. */
return link_handle_bound_by_list(link);
return 0;
if (link->network && link->network->ignore_carrier_loss)
return 0;
r = link_stop_engines(link, false);
if (r < 0) {
@@ -1538,7 +1546,7 @@ static int link_carrier_lost(Link *link) {
return r;
}
return link_handle_bound_by_list(link);
return 0;
}
int link_carrier_reset(Link *link) {