From: Susant Sahani <ssahani@vmware.com>
Date: Tue, 24 Mar 2020 11:23:35 +0000 (+0100)
Subject: networkctl: Use string table for bridge state
X-Git-Tag: v246-rc1~708^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F15214%2Fhead;p=thirdparty%2Fsystemd.git

networkctl: Use string table for bridge state
---

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index fe511b0c354..ee50fdad8c8 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -21,6 +21,7 @@
 #include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-util.h"
+#include "bridge-util.h"
 #include "device-util.h"
 #include "escape.h"
 #include "ether-addr-util.h"
@@ -1487,20 +1488,10 @@ static int link_status_one(
                         return table_log_add_error(r);
 
                 if (info->port_state <= BR_STATE_BLOCKING) {
-                        static const struct {
-                                const char *state;
-                        } state_table[] = {
-                                { "disabled" },
-                                { "listening" },
-                                { "learning" },
-                                { "forwarding" },
-                                { "blocking" },
-                        };
-
                         r = table_add_many(table,
                                            TABLE_EMPTY,
                                            TABLE_STRING, "Port State:",
-                                           TABLE_STRING, state_table[info->port_state]);
+                                           TABLE_STRING, bridge_state_to_string(info->port_state));
                 }
         } else if (streq_ptr(info->netdev_kind, "bond")) {
                 static const struct {