Merge branch 'main' into next

[mirror_iproute2.git] / rdma / sys.c

diff --git a/rdma/sys.c b/rdma/sys.c
index cef39081872c61071d7baa61798f4491df672dc8..8fb565d705983a4e20b0021eaaa08e1b056aca60 100644 (file)
--- a/rdma/sys.c
+++ b/rdma/sys.c
@@ -20,7 +20,6 @@ static const char *netns_modes_str[] = {
 static int sys_show_parse_cb(const struct nlmsghdr *nlh, void *data)
 {
        struct nlattr *tb[RDMA_NLDEV_ATTR_MAX] = {};
-       struct rd *rd = data;
 
        mnl_attr_parse(nlh, 0, rd_attr_cb, tb);
 
@@ -31,15 +30,13 @@ static int sys_show_parse_cb(const struct nlmsghdr *nlh, void *data)
                netns_mode =
                        mnl_attr_get_u8(tb[RDMA_NLDEV_SYS_ATTR_NETNS_MODE]);
 
-               if (netns_mode <= ARRAY_SIZE(netns_modes_str))
+               if (netns_mode < ARRAY_SIZE(netns_modes_str))
                        mode_str = netns_modes_str[netns_mode];
                else
                        mode_str = "unknown";
 
-               if (rd->json_output)
-                       jsonw_string_field(rd->jw, "netns", mode_str);
-               else
-                       pr_out("netns %s\n", mode_str);
+               print_color_string(PRINT_ANY, COLOR_NONE, "netns", "netns %s\n",
+                                  mode_str);
        }
        return MNL_CB_OK;
 }