aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/infiniband/core/uverbs_cmd.c12
-rw-r--r--drivers/infiniband/core/uverbs_main.c1
-rw-r--r--drivers/infiniband/core/verbs.c3
-rw-r--r--include/rdma/ib_user_verbs.h4
4 files changed, 9 insertions, 11 deletions
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index be1cef1b3116..398c125d908c 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -1134,8 +1134,8 @@ out:
1134} 1134}
1135 1135
1136ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file, 1136ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file,
1137 const char __user *buf, int in_len, 1137 const char __user *buf, int in_len,
1138 int out_len) 1138 int out_len)
1139{ 1139{
1140 struct ib_uverbs_post_send cmd; 1140 struct ib_uverbs_post_send cmd;
1141 struct ib_uverbs_post_send_resp resp; 1141 struct ib_uverbs_post_send_resp resp;
@@ -1363,8 +1363,8 @@ err:
1363} 1363}
1364 1364
1365ssize_t ib_uverbs_post_recv(struct ib_uverbs_file *file, 1365ssize_t ib_uverbs_post_recv(struct ib_uverbs_file *file,
1366 const char __user *buf, int in_len, 1366 const char __user *buf, int in_len,
1367 int out_len) 1367 int out_len)
1368{ 1368{
1369 struct ib_uverbs_post_recv cmd; 1369 struct ib_uverbs_post_recv cmd;
1370 struct ib_uverbs_post_recv_resp resp; 1370 struct ib_uverbs_post_recv_resp resp;
@@ -1414,8 +1414,8 @@ out:
1414} 1414}
1415 1415
1416ssize_t ib_uverbs_post_srq_recv(struct ib_uverbs_file *file, 1416ssize_t ib_uverbs_post_srq_recv(struct ib_uverbs_file *file,
1417 const char __user *buf, int in_len, 1417 const char __user *buf, int in_len,
1418 int out_len) 1418 int out_len)
1419{ 1419{
1420 struct ib_uverbs_post_srq_recv cmd; 1420 struct ib_uverbs_post_srq_recv cmd;
1421 struct ib_uverbs_post_srq_recv_resp resp; 1421 struct ib_uverbs_post_srq_recv_resp resp;
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index 099fe6cde68c..335b6938a656 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -462,7 +462,6 @@ void ib_uverbs_cq_event_handler(struct ib_event *event, void *context_ptr)
462 ib_uverbs_async_handler(uobj->uverbs_file, uobj->uobject.user_handle, 462 ib_uverbs_async_handler(uobj->uverbs_file, uobj->uobject.user_handle,
463 event->event, &uobj->async_list, 463 event->event, &uobj->async_list,
464 &uobj->async_events_reported); 464 &uobj->async_events_reported);
465
466} 465}
467 466
468void ib_uverbs_qp_event_handler(struct ib_event *event, void *context_ptr) 467void ib_uverbs_qp_event_handler(struct ib_event *event, void *context_ptr)
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index ca07a2be87d3..c69334dc8012 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -574,8 +574,7 @@ int ib_destroy_cq(struct ib_cq *cq)
574} 574}
575EXPORT_SYMBOL(ib_destroy_cq); 575EXPORT_SYMBOL(ib_destroy_cq);
576 576
577int ib_resize_cq(struct ib_cq *cq, 577int ib_resize_cq(struct ib_cq *cq, int cqe)
578 int cqe)
579{ 578{
580 return cq->device->resize_cq ? 579 return cq->device->resize_cq ?
581 cq->device->resize_cq(cq, cqe, NULL) : -ENOSYS; 580 cq->device->resize_cq(cq, cqe, NULL) : -ENOSYS;
diff --git a/include/rdma/ib_user_verbs.h b/include/rdma/ib_user_verbs.h
index 6ad1207e4235..fb94c08169ce 100644
--- a/include/rdma/ib_user_verbs.h
+++ b/include/rdma/ib_user_verbs.h
@@ -426,7 +426,7 @@ struct ib_uverbs_sge {
426}; 426};
427 427
428struct ib_uverbs_send_wr { 428struct ib_uverbs_send_wr {
429 __u64 wr_id; 429 __u64 wr_id;
430 __u32 num_sge; 430 __u32 num_sge;
431 __u32 opcode; 431 __u32 opcode;
432 __u32 send_flags; 432 __u32 send_flags;
@@ -500,7 +500,7 @@ struct ib_uverbs_post_srq_recv_resp {
500 500
501struct ib_uverbs_global_route { 501struct ib_uverbs_global_route {
502 __u8 dgid[16]; 502 __u8 dgid[16];
503 __u32 flow_label; 503 __u32 flow_label;
504 __u8 sgid_index; 504 __u8 sgid_index;
505 __u8 hop_limit; 505 __u8 hop_limit;
506 __u8 traffic_class; 506 __u8 traffic_class;