diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-07 13:01:58 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-07 13:01:58 +1000 |
commit | 0be9ad1abd8dd3abcfd8c5a8fc219d1dae56c06f (patch) | |
tree | 345f06a7c022195caf12f7ecb8b5277b84191cc4 /include/uapi | |
parent | bb87d015c633c967a2890ef4ed24dfa60fc79756 (diff) | |
parent | 18e11d8d330b92b1546aff8e9403818f80c41520 (diff) |
Merge remote-tracking branch 'infiniband/for-next'
Conflicts:
include/linux/mlx4/device.h
Diffstat (limited to 'include/uapi')
-rw-r--r-- | include/uapi/rdma/ib_user_verbs.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h index cbfdd4ca9510..26daf55ff76e 100644 --- a/include/uapi/rdma/ib_user_verbs.h +++ b/include/uapi/rdma/ib_user_verbs.h @@ -276,6 +276,22 @@ struct ib_uverbs_reg_mr_resp { __u32 rkey; }; +struct ib_uverbs_rereg_mr { + __u64 response; + __u32 mr_handle; + __u32 flags; + __u64 start; + __u64 length; + __u64 hca_va; + __u32 pd_handle; + __u32 access_flags; +}; + +struct ib_uverbs_rereg_mr_resp { + __u32 lkey; + __u32 rkey; +}; + struct ib_uverbs_dereg_mr { __u32 mr_handle; }; |