From: Yu Watanabe Date: Sat, 7 Mar 2020 10:11:03 +0000 (+0900) Subject: Merge pull request #15036 from yuwata/can-termination-mod X-Git-Tag: v246-rc1~779 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a834cb52473f82be40b430425635f963ecf05297;p=thirdparty%2Fsystemd.git Merge pull request #15036 from yuwata/can-termination-mod network: add CAN Termination tristate option --- a834cb52473f82be40b430425635f963ecf05297 diff --cc src/network/networkd-network-gperf.gperf index 9345e0fd1ee,9679300b62d..8bf80afddd2 --- a/src/network/networkd-network-gperf.gperf +++ b/src/network/networkd-network-gperf.gperf @@@ -255,12 -251,9 +255,13 @@@ CAN.BitRate CAN.SamplePoint, config_parse_permille, 0, offsetof(Network, can_sample_point) CAN.RestartSec, config_parse_sec, 0, offsetof(Network, can_restart_us) CAN.TripleSampling, config_parse_tristate, 0, offsetof(Network, can_triple_sampling) + CAN.Termination, config_parse_tristate, 0, offsetof(Network, can_termination) QDisc.Parent, config_parse_qdisc_parent, _QDISC_KIND_INVALID, 0 QDisc.Handle, config_parse_qdisc_handle, _QDISC_KIND_INVALID, 0 +CAKE.Parent, config_parse_qdisc_parent, QDISC_KIND_CAKE, 0 +CAKE.Handle, config_parse_qdisc_handle, QDISC_KIND_CAKE, 0 +CAKE.Bandwidth, config_parse_cake_bandwidth, QDISC_KIND_CAKE, 0 +CAKE.Overhead, config_parse_cake_overhead, QDISC_KIND_CAKE, 0 ControlledDelay.Parent, config_parse_qdisc_parent, QDISC_KIND_CODEL, 0 ControlledDelay.Handle, config_parse_qdisc_handle, QDISC_KIND_CODEL, 0 ControlledDelay.PacketLimit, config_parse_controlled_delay_u32, QDISC_KIND_CODEL, 0