SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network: make 'carrier' as the default required operational state for CAN device

Browse Source 
As CAN devices do not support IP address, hence the state never goes to
higher than 'carrier'.

Prompted by https://github.com/linux-can/can-utils/issues/68#issuecomment-1327987724.
This commit is contained in:
Yu Watanabe
2024-01-17 04:05:43 +09:00
parent 2e59ba4e24
commit 3255bda698
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-link.c
+5
View File
@@ -77,6 +77,11 @@ void link_required_operstate_for_online(Link *link, LinkOperationalStateRange *r
if (link->network && operational_state_range_is_valid(&link->network->required_operstate_for_online))
*ret = link->network->required_operstate_for_online;
else if (link->iftype == ARPHRD_CAN)
*ret = (const LinkOperationalStateRange) {
.min = LINK_OPERSTATE_CARRIER,
.max = LINK_OPERSTATE_CARRIER,
};
else
*ret = LINK_OPERSTATE_RANGE_DEFAULT;
}
src/network/networkd-network.c
+2 -2
View File
@@ -372,7 +372,7 @@ int network_load_one(Manager *manager, OrderedHashmap **networks, const char *fi
.n_ref = 1,
.required_for_online = -1,
.required_operstate_for_online = LINK_OPERSTATE_RANGE_DEFAULT,
.required_operstate_for_online = LINK_OPERSTATE_RANGE_INVALID,
.activation_policy = _ACTIVATION_POLICY_INVALID,
.group = -1,
.arp = -1,
@@ -1221,7 +1221,7 @@ int config_parse_required_for_online(
if (isempty(rvalue)) {
network->required_for_online = -1;
network->required_operstate_for_online = LINK_OPERSTATE_RANGE_DEFAULT;
network->required_operstate_for_online = LINK_OPERSTATE_RANGE_INVALID;
return 0;
}