From 795a52cd74c66d750e5d9022f3a250bd8a91c0c7 Mon Sep 17 00:00:00 2001 From: Roland Dreier Date: Tue, 8 Nov 2005 11:10:25 -0800 Subject: [PATCH] --- yaml --- r: 13772 b: refs/heads/master c: 40de2e548c225e3ef859e3c60de9785e37e1b5b1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/core/verbs.c | 12 ++---------- trunk/include/rdma/ib_verbs.h | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 3f3cb75babd0..8255663488b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b4ff2c0e624089ad87dc1604e239b7c3201c53f +refs/heads/master: 40de2e548c225e3ef859e3c60de9785e37e1b5b1 diff --git a/trunk/drivers/infiniband/core/verbs.c b/trunk/drivers/infiniband/core/verbs.c index 72d3ef786db5..4f51d797f84a 100644 --- a/trunk/drivers/infiniband/core/verbs.c +++ b/trunk/drivers/infiniband/core/verbs.c @@ -324,16 +324,8 @@ EXPORT_SYMBOL(ib_destroy_cq); int ib_resize_cq(struct ib_cq *cq, int cqe) { - int ret; - - if (!cq->device->resize_cq) - return -ENOSYS; - - ret = cq->device->resize_cq(cq, &cqe); - if (!ret) - cq->cqe = cqe; - - return ret; + return cq->device->resize_cq ? + cq->device->resize_cq(cq, cqe) : -ENOSYS; } EXPORT_SYMBOL(ib_resize_cq); diff --git a/trunk/include/rdma/ib_verbs.h b/trunk/include/rdma/ib_verbs.h index f72d46d54e0a..a7f4c355a91f 100644 --- a/trunk/include/rdma/ib_verbs.h +++ b/trunk/include/rdma/ib_verbs.h @@ -881,7 +881,7 @@ struct ib_device { struct ib_ucontext *context, struct ib_udata *udata); int (*destroy_cq)(struct ib_cq *cq); - int (*resize_cq)(struct ib_cq *cq, int *cqe); + int (*resize_cq)(struct ib_cq *cq, int cqe); int (*poll_cq)(struct ib_cq *cq, int num_entries, struct ib_wc *wc); int (*peek_cq)(struct ib_cq *cq, int wc_cnt);