Merge branch 'main' into next

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

diff --git a/rdma/res-cq.c b/rdma/res-cq.c
index e1efe3ba41d0e296b689e52f5d23cd5b2fd3b7ca..313f929a29b547ae35835ec236f8f45eab6bc9a7 100644 (file)
--- a/rdma/res-cq.c
+++ b/rdma/res-cq.c
@@ -39,6 +39,20 @@ static void print_cq_dim_setting(struct rd *rd, struct nlattr *attr)
        print_on_off(rd, "adaptive-moderation", dim_setting);
 }
 
+static int res_cq_line_raw(struct rd *rd, const char *name, int idx,
+                          struct nlattr **nla_line)
+{
+       if (!nla_line[RDMA_NLDEV_ATTR_RES_RAW])
+               return MNL_CB_ERROR;
+
+       open_json_object(NULL);
+       print_dev(rd, idx, name);
+       print_raw_data(rd, nla_line);
+       newline(rd);
+
+       return MNL_CB_OK;
+}
+
 static int res_cq_line(struct rd *rd, const char *name, int idx,
                       struct nlattr **nla_line)
 {
@@ -128,7 +142,8 @@ int res_cq_idx_parse_cb(const struct nlmsghdr *nlh, void *data)
        name = mnl_attr_get_str(tb[RDMA_NLDEV_ATTR_DEV_NAME]);
        idx = mnl_attr_get_u32(tb[RDMA_NLDEV_ATTR_DEV_INDEX]);
 
-       return res_cq_line(rd, name, idx, tb);
+       return (rd->show_raw) ? res_cq_line_raw(rd, name, idx, tb) :
+               res_cq_line(rd, name, idx, tb);
 }
 
 int res_cq_parse_cb(const struct nlmsghdr *nlh, void *data)
@@ -156,7 +171,8 @@ int res_cq_parse_cb(const struct nlmsghdr *nlh, void *data)
                if (ret != MNL_CB_OK)
                        break;
 
-               ret = res_cq_line(rd, name, idx, nla_line);
+               ret = (rd->show_raw) ? res_cq_line_raw(rd, name, idx, nla_line) :
+                       res_cq_line(rd, name, idx, nla_line);
 
                if (ret != MNL_CB_OK)
                        break;