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

network: SamplePoint= should be specified only when BitRate= is specified

Browse Source 
See can_get_bittiming() in drivers/net/can/dev/bittiming.c of kernel.
This commit is contained in:
Yu Watanabe
2021-08-16 18:54:01 +09:00
parent 239f91f71c
commit 817561cc60
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
man/systemd.network.xml
+2 -1
View File
@@ -2957,7 +2957,8 @@ IPv6Token=prefixstable:2002:da8:1::</programlisting></para>
<term><varname>SamplePoint=</varname></term>
<listitem>
<para>Optional sample point in percent with one decimal (e.g. <literal>75%</literal>,
<literal>87.5%</literal>) or permille (e.g. <literal>875‰</literal>).</para>
<literal>87.5%</literal>) or permille (e.g. <literal>875‰</literal>). This will be ignored when
<varname>BitRate=</varname> is unspecified.</para>
</listitem>
</varlistentry>
<varlistentry>
src/network/networkd-can.c
+2 -2
View File
@@ -31,7 +31,7 @@ int can_set_netlink_message(Link *link, sd_netlink_message *m) {
if (r < 0)
return log_link_debug_errno(link, r, "Could not open IFLA_INFO_DATA container: %m");
if (link->network->can_bitrate > 0 || link->network->can_sample_point > 0) {
if (link->network->can_bitrate > 0) {
struct can_bittiming bt = {
.bitrate = link->network->can_bitrate,
.sample_point = link->network->can_sample_point,
@@ -48,7 +48,7 @@ int can_set_netlink_message(Link *link, sd_netlink_message *m) {
return log_link_debug_errno(link, r, "Could not append IFLA_CAN_BITTIMING attribute: %m");
}
if (link->network->can_data_bitrate > 0 || link->network->can_data_sample_point > 0) {
if (link->network->can_data_bitrate > 0) {
struct can_bittiming bt = {
.bitrate = link->network->can_data_bitrate,
.sample_point = link->network->can_data_sample_point,