Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 21929
b: refs/heads/master
c: a74cd4a
h: refs/heads/master
i:
  21927: 5ded107
v: v3
  • Loading branch information
Roland Dreier committed Mar 20, 2006
1 parent 521eb03 commit b5de761
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d844183d9c7b103da1d7a1c753a1c171e9ce26b3
refs/heads/master: a74cd4af0bfa9578594acbb711a958104c93b772
12 changes: 6 additions & 6 deletions trunk/drivers/infiniband/core/uverbs_cmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1134,8 +1134,8 @@ ssize_t ib_uverbs_destroy_qp(struct ib_uverbs_file *file,
}

ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file,
const char __user *buf, int in_len,
int out_len)
const char __user *buf, int in_len,
int out_len)
{
struct ib_uverbs_post_send cmd;
struct ib_uverbs_post_send_resp resp;
Expand Down Expand Up @@ -1363,8 +1363,8 @@ static struct ib_recv_wr *ib_uverbs_unmarshall_recv(const char __user *buf,
}

ssize_t ib_uverbs_post_recv(struct ib_uverbs_file *file,
const char __user *buf, int in_len,
int out_len)
const char __user *buf, int in_len,
int out_len)
{
struct ib_uverbs_post_recv cmd;
struct ib_uverbs_post_recv_resp resp;
Expand Down Expand Up @@ -1414,8 +1414,8 @@ ssize_t ib_uverbs_post_recv(struct ib_uverbs_file *file,
}

ssize_t ib_uverbs_post_srq_recv(struct ib_uverbs_file *file,
const char __user *buf, int in_len,
int out_len)
const char __user *buf, int in_len,
int out_len)
{
struct ib_uverbs_post_srq_recv cmd;
struct ib_uverbs_post_srq_recv_resp resp;
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/infiniband/core/uverbs_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,6 @@ void ib_uverbs_cq_event_handler(struct ib_event *event, void *context_ptr)
ib_uverbs_async_handler(uobj->uverbs_file, uobj->uobject.user_handle,
event->event, &uobj->async_list,
&uobj->async_events_reported);

}

void ib_uverbs_qp_event_handler(struct ib_event *event, void *context_ptr)
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/infiniband/core/verbs.c
Original file line number Diff line number Diff line change
Expand Up @@ -574,8 +574,7 @@ int ib_destroy_cq(struct ib_cq *cq)
}
EXPORT_SYMBOL(ib_destroy_cq);

int ib_resize_cq(struct ib_cq *cq,
int cqe)
int ib_resize_cq(struct ib_cq *cq, int cqe)
{
return cq->device->resize_cq ?
cq->device->resize_cq(cq, cqe, NULL) : -ENOSYS;
Expand Down
4 changes: 2 additions & 2 deletions trunk/include/rdma/ib_user_verbs.h
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ struct ib_uverbs_sge {
};

struct ib_uverbs_send_wr {
__u64 wr_id;
__u64 wr_id;
__u32 num_sge;
__u32 opcode;
__u32 send_flags;
Expand Down Expand Up @@ -500,7 +500,7 @@ struct ib_uverbs_post_srq_recv_resp {

struct ib_uverbs_global_route {
__u8 dgid[16];
__u32 flow_label;
__u32 flow_label;
__u8 sgid_index;
__u8 hop_limit;
__u8 traffic_class;
Expand Down

0 comments on commit b5de761

Please sign in to comment.