From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 17 May 2022 13:20:32 +0000 (+0900)
Subject: networkctl: fix units for bond parameters
X-Git-Tag: v251~17^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05e022a913533560a86a9b6a3ffda252df0cad1f;p=thirdparty%2Fsystemd.git

networkctl: fix units for bond parameters

Fixes RHBZ#2086166 (https://bugzilla.redhat.com/show_bug.cgi?id=2086166).
---

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 56baf125bd6..8830f79eb78 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -1814,13 +1814,13 @@ static int link_status_one(
                                    TABLE_STRING, bond_mode_to_string(info->mode),
                                    TABLE_EMPTY,
                                    TABLE_STRING, "Miimon:",
-                                   TABLE_TIMESPAN_MSEC, jiffies_to_usec(info->miimon),
+                                   TABLE_TIMESPAN_MSEC, info->miimon * USEC_PER_MSEC,
                                    TABLE_EMPTY,
                                    TABLE_STRING, "Updelay:",
-                                   TABLE_TIMESPAN_MSEC, jiffies_to_usec(info->updelay),
+                                   TABLE_TIMESPAN_MSEC, info->updelay * USEC_PER_MSEC,
                                    TABLE_EMPTY,
                                    TABLE_STRING, "Downdelay:",
-                                   TABLE_TIMESPAN_MSEC, jiffies_to_usec(info->downdelay));
+                                   TABLE_TIMESPAN_MSEC, info->downdelay * USEC_PER_MSEC);
                 if (r < 0)
                         return table_log_add_error(r);