picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2985 from keszybz/lldp-assert 

Replace if with assert_cc in lldp code and a build-sys tweak
This commit is contained in:
Martin Pitt 2016-04-08 08:31:33 +02:00
parent 74dd72d559 c8cf4dc1e5
commit 710a8858a9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -1383,6 +1383,9 @@ pkgconfigdata_DATA += \
nodist_rpmmacros_DATA = \
src/core/macros.systemd
BUILT_SOURCES += \
src/core/triggers.systemd
EXTRA_DIST += \
src/core/systemd.pc.in \
src/core/macros.systemd.in \

3
src/network/networkd-lldp-tx.c
View File

@ -239,9 +239,8 @@ static int link_send_lldp(Link *link) {
(void) gethostname_strict(&hostname);
(void) parse_env_file("/etc/machine-info", NEWLINE, "PRETTY_HOSTNAME", &pretty_hostname, NULL);
assert_cc(LLDP_TX_INTERVAL_USEC * LLDP_TX_HOLD + 1 <= (UINT16_MAX - 1) * USEC_PER_SEC);
ttl = DIV_ROUND_UP(LLDP_TX_INTERVAL_USEC * LLDP_TX_HOLD + 1, USEC_PER_SEC);
if (ttl > (usec_t) UINT16_MAX)
ttl = (usec_t) UINT16_MAX;
caps = (link->network && link->network->ip_forward != ADDRESS_FAMILY_NO) ?
SD_LLDP_SYSTEM_CAPABILITIES_ROUTER :