]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #15036 from yuwata/can-termination-mod
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 7 Mar 2020 10:11:03 +0000 (19:11 +0900)
committerGitHub <noreply@github.com>
Sat, 7 Mar 2020 10:11:03 +0000 (19:11 +0900)
network: add CAN Termination tristate option

1  2 
man/systemd.network.xml
src/libsystemd/sd-netlink/netlink-types.c
src/network/networkd-network-gperf.gperf
src/network/networkd-network.c
src/network/networkd-network.h
test/fuzz/fuzz-network-parser/directives.network

Simple merge
index 9345e0fd1ee8a7a33dfa29ae3c74942f04958c21,9679300b62d8e056eb0d2a0f4e8ac113eb0c0b53..8bf80afddd296082d74ddb430fb6e6d984149374
@@@ -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
Simple merge
Simple merge