diff options
| author |   Ralph Campbell <ralph.campbell@qlogic.com> | 2006-09-22 15:22:24 -0700 |
|---|---|---|
| committer |   Roland Dreier <rolandd@cisco.com> | 2006-09-22 15:22:24 -0700 |
| commit | 64f817ba98095156149ba5991592d5d039f6da74 (patch) | |
| tree | 72aaa87275033036bbf0e886c1cb7cf1e9d38bb5 | |
| parent | IB/ehca: Add driver for IBM eHCA InfiniBand adapters (diff) | |
| download | linux-dev-64f817ba98095156149ba5991592d5d039f6da74.tar.xz linux-dev-64f817ba98095156149ba5991592d5d039f6da74.zip | |
IB/uverbs: Allow resize CQ operation to return driver-specific data
Add a ib_uverbs_resize_cq_resp.driver_data field so that low-level
drivers can return data from a resize CQ operation to userspace. Have
ib_uverbs_resize_cq() only copy the cqe field, to avoid having to bump
the userspace ABI.
Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
| -rw-r--r-- | drivers/infiniband/core/uverbs_cmd.c | 3 | ||||
| -rw-r--r-- | include/rdma/ib_user_verbs.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c index 8b6df7cec0bf..deae43f31e79 100644 --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c @@ -879,11 +879,10 @@ ssize_t ib_uverbs_resize_cq(struct ib_uverbs_file *file, if (ret) goto out; - memset(&resp, 0, sizeof resp); resp.cqe = cq->cqe; if (copy_to_user((void __user *) (unsigned long) cmd.response, - &resp, sizeof resp)) + &resp, sizeof resp.cqe)) ret = -EFAULT; out: diff --git a/include/rdma/ib_user_verbs.h b/include/rdma/ib_user_verbs.h index 7b5372010f4b..db1b814b62cc 100644 --- a/include/rdma/ib_user_verbs.h +++ b/include/rdma/ib_user_verbs.h @@ -275,6 +275,8 @@ struct ib_uverbs_resize_cq { struct ib_uverbs_resize_cq_resp { __u32 cqe; + __u32 reserved; + __u64 driver_data[0]; }; struct ib_uverbs_poll_cq { |