From 686549569d709425da50e697d751e1dded4d1381 Mon Sep 17 00:00:00 2001
From: Ralph Campbell <ralph.campbell@qlogic.com>
Date: Fri, 22 Sep 2006 15:22:24 -0700
Subject: [PATCH] --- yaml --- r: 34288 b: refs/heads/master c:
 64f817ba98095156149ba5991592d5d039f6da74 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/infiniband/core/uverbs_cmd.c | 3 +--
 trunk/include/rdma/ib_user_verbs.h         | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b1057fd59805..1b5a87211ccf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fab97220c9e409a98b1956ba677ddd2dd43b0b95
+refs/heads/master: 64f817ba98095156149ba5991592d5d039f6da74
diff --git a/trunk/drivers/infiniband/core/uverbs_cmd.c b/trunk/drivers/infiniband/core/uverbs_cmd.c
index 8b6df7cec0bf..deae43f31e79 100644
--- a/trunk/drivers/infiniband/core/uverbs_cmd.c
+++ b/trunk/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/trunk/include/rdma/ib_user_verbs.h b/trunk/include/rdma/ib_user_verbs.h
index 7b5372010f4b..db1b814b62cc 100644
--- a/trunk/include/rdma/ib_user_verbs.h
+++ b/trunk/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 {