aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/infiniband/core/uverbs_cmd.c2
-rw-r--r--drivers/infiniband/core/verbs.c4
-rw-r--r--drivers/infiniband/ulp/ipoib/ipoib_ethtool.c5
-rw-r--r--include/rdma/ib_verbs.h4
4 files changed, 8 insertions, 7 deletions
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 53143e4b1c50..16d55710b116 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -3901,7 +3901,7 @@ int ib_uverbs_ex_modify_cq(struct ib_uverbs_file *file,
3901 if (!cq) 3901 if (!cq)
3902 return -EINVAL; 3902 return -EINVAL;
3903 3903
3904 ret = ib_modify_cq(cq, cmd.attr.cq_count, cmd.attr.cq_period); 3904 ret = rdma_set_cq_moderation(cq, cmd.attr.cq_count, cmd.attr.cq_period);
3905 3905
3906 uobj_put_obj_read(cq); 3906 uobj_put_obj_read(cq);
3907 3907
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index d8f1a5d34f4f..3fb8fb6cc824 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -1550,12 +1550,12 @@ struct ib_cq *ib_create_cq(struct ib_device *device,
1550} 1550}
1551EXPORT_SYMBOL(ib_create_cq); 1551EXPORT_SYMBOL(ib_create_cq);
1552 1552
1553int ib_modify_cq(struct ib_cq *cq, u16 cq_count, u16 cq_period) 1553int rdma_set_cq_moderation(struct ib_cq *cq, u16 cq_count, u16 cq_period)
1554{ 1554{
1555 return cq->device->modify_cq ? 1555 return cq->device->modify_cq ?
1556 cq->device->modify_cq(cq, cq_count, cq_period) : -ENOSYS; 1556 cq->device->modify_cq(cq, cq_count, cq_period) : -ENOSYS;
1557} 1557}
1558EXPORT_SYMBOL(ib_modify_cq); 1558EXPORT_SYMBOL(rdma_set_cq_moderation);
1559 1559
1560int ib_destroy_cq(struct ib_cq *cq) 1560int ib_destroy_cq(struct ib_cq *cq)
1561{ 1561{
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
index 8dc1e6225cc8..2706bf26cbac 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
@@ -99,8 +99,9 @@ static int ipoib_set_coalesce(struct net_device *dev,
99 coal->rx_max_coalesced_frames > 0xffff) 99 coal->rx_max_coalesced_frames > 0xffff)
100 return -EINVAL; 100 return -EINVAL;
101 101
102 ret = ib_modify_cq(priv->recv_cq, coal->rx_max_coalesced_frames, 102 ret = rdma_set_cq_moderation(priv->recv_cq,
103 coal->rx_coalesce_usecs); 103 coal->rx_max_coalesced_frames,
104 coal->rx_coalesce_usecs);
104 if (ret && ret != -ENOSYS) { 105 if (ret && ret != -ENOSYS) {
105 ipoib_warn(priv, "failed modifying CQ (%d)\n", ret); 106 ipoib_warn(priv, "failed modifying CQ (%d)\n", ret);
106 return ret; 107 return ret;
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 0b484c023fa9..fd84cda5ed7c 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -3169,13 +3169,13 @@ struct ib_cq *ib_create_cq(struct ib_device *device,
3169int ib_resize_cq(struct ib_cq *cq, int cqe); 3169int ib_resize_cq(struct ib_cq *cq, int cqe);
3170 3170
3171/** 3171/**
3172 * ib_modify_cq - Modifies moderation params of the CQ 3172 * rdma_set_cq_moderation - Modifies moderation params of the CQ
3173 * @cq: The CQ to modify. 3173 * @cq: The CQ to modify.
3174 * @cq_count: number of CQEs that will trigger an event 3174 * @cq_count: number of CQEs that will trigger an event
3175 * @cq_period: max period of time in usec before triggering an event 3175 * @cq_period: max period of time in usec before triggering an event
3176 * 3176 *
3177 */ 3177 */
3178int ib_modify_cq(struct ib_cq *cq, u16 cq_count, u16 cq_period); 3178int rdma_set_cq_moderation(struct ib_cq *cq, u16 cq_count, u16 cq_period);
3179 3179
3180/** 3180/**
3181 * ib_destroy_cq - Destroys the specified CQ. 3181 * ib_destroy_cq - Destroys the specified CQ.