Merge branch 'master' into next

[mirror_iproute2.git] / rdma / res-pd.c

diff --git a/rdma/res-pd.c b/rdma/res-pd.c
index 6e5e4e6b8fb87cc0a185ee9d33670d1cdb5ea3f6..df538010347587d7200d6b9b8b7dbd169c14159a 100644 (file)
--- a/rdma/res-pd.c
+++ b/rdma/res-pd.c
@@ -60,9 +60,7 @@ static int res_pd_line(struct rd *rd, const char *name, int idx,
                comm = (char *)mnl_attr_get_str(
                        nla_line[RDMA_NLDEV_ATTR_RES_KERN_NAME]);
 
-       if (rd->json_output)
-               jsonw_start_array(rd->jw);
-
+       open_json_object(NULL);
        print_dev(rd, idx, name);
        res_print_uint(rd, "pdn", pdn, nla_line[RDMA_NLDEV_ATTR_RES_PDN]);
        print_key(rd, "local_dma_lkey", local_dma_lkey,