Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

networkd:cleanup for #10542 (add missing bonding options) #10653

Merged
merged 1 commit into from
Nov 6, 2018
Merged

networkd:cleanup for #10542 (add missing bonding options) #10653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions man/systemd.netdev.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1269,9 +1269,9 @@
</varlistentry>

<varlistentry>
<term><varname>AdActorSysPrio=</varname></term>
<term><varname>AdActorSystemPriority=</varname></term>
<listitem>
<para>Specifies the 802.3ad system priority. Ranges [1-65535].</para>
<para>Specifies the 802.3ad actor system priority. Ranges [1-65535].</para>
</listitem>
</varlistentry>

Expand Down
6 changes: 3 additions & 3 deletions src/network/netdev/bond.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ int config_parse_ad_actor_sys_prio(const char *unit,
}

if (v == 0) {
log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse actor system priority '%s'. Range is [1,65535], ignoring: %m", rvalue);
log_syntax(unit, LOG_ERR, filename, line, 0, "Failed to parse actor system priority '%s'. Range is [1,65535], ignoring.", rvalue);
return 0;
}

Expand Down Expand Up @@ -449,7 +449,7 @@ int config_parse_ad_user_port_key(const char *unit,
}

if (v > 1023) {
log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse user port key '%s'. Range is [0,1023], ignoring: %m", rvalue);
log_syntax(unit, LOG_ERR, filename, line, 0, "Failed to parse user port key '%s'. Range is [0,1023], ignoring.", rvalue);
return 0;
}

Expand Down Expand Up @@ -488,7 +488,7 @@ int config_parse_ad_actor_system(const char *unit,
}

if (ether_addr_is_null(n) || (n->ether_addr_octet[0] & 0x01)) {
log_syntax(unit, LOG_ERR, filename, line, r, "Not a valid MAC address %s, can not be null or multicast. Ignoring assignment: %m", rvalue);
log_syntax(unit, LOG_ERR, filename, line, 0, "Not a valid MAC address %s, can not be null or multicast. Ignoring assignment.", rvalue);
return 0;
}

Expand Down
2 changes: 1 addition & 1 deletion src/network/netdev/netdev-gperf.gperf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ Bond.UpDelaySec, config_parse_sec, 0,
Bond.DownDelaySec, config_parse_sec, 0, offsetof(Bond, downdelay)
Bond.ARPIntervalSec, config_parse_sec, 0, offsetof(Bond, arp_interval)
Bond.LearnPacketIntervalSec, config_parse_sec, 0, offsetof(Bond, lp_interval)
Bond.AdActorSysPrio, config_parse_ad_actor_sys_prio, 0, offsetof(Bond, ad_actor_sys_prio)
Bond.AdActorSystemPriority, config_parse_ad_actor_sys_prio, 0, offsetof(Bond, ad_actor_sys_prio)
Bond.AdUserPortKey, config_parse_ad_user_port_key, 0, offsetof(Bond, ad_user_port_key)
Bond.AdActorSystem, config_parse_ad_actor_system, 0, offsetof(Bond, ad_actor_system)
Bridge.HelloTimeSec, config_parse_sec, 0, offsetof(Bridge, hello_time)
Expand Down
2 changes: 1 addition & 1 deletion test/test-network/conf/25-bond.netdev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ UpDelaySec=2s
DownDelaySec=2s
ResendIGMP=4
MinLinks=1
AdActorSysPrio=1218
AdActorSystemPriority=1218
AdUserPortKey=811
AdActorSystem=00:11:22:33:44:55
# feed the sanitizer
Expand Down