diff options
author | James Morris <james.morris@microsoft.com> | 2018-12-17 11:24:28 -0800 |
---|---|---|
committer | James Morris <james.morris@microsoft.com> | 2018-12-17 11:24:28 -0800 |
commit | 8bd8ea195f6d135a8d85201116314eb5237ad7e7 (patch) | |
tree | 3ef99e468f0b4b13cc11002aa60c4451e326191b /drivers/infiniband/sw/rdmavt/ah.h | |
parent | 1072bd678547f8663cfb81a22fdb50c589e4976e (diff) | |
parent | 7566ec393f4161572ba6f11ad5171fd5d59b0fbd (diff) |
Merge tag 'v4.20-rc7' into next-general
Sync with Linux 4.20-rc7, to pick up: Revert "ovl: relax permission checking on underlying layers"
Diffstat (limited to 'drivers/infiniband/sw/rdmavt/ah.h')
-rw-r--r-- | drivers/infiniband/sw/rdmavt/ah.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/sw/rdmavt/ah.h b/drivers/infiniband/sw/rdmavt/ah.h index 16105af99189..25271b48a683 100644 --- a/drivers/infiniband/sw/rdmavt/ah.h +++ b/drivers/infiniband/sw/rdmavt/ah.h @@ -51,7 +51,8 @@ #include <rdma/rdma_vt.h> struct ib_ah *rvt_create_ah(struct ib_pd *pd, - struct rdma_ah_attr *ah_attr); + struct rdma_ah_attr *ah_attr, + struct ib_udata *udata); int rvt_destroy_ah(struct ib_ah *ibah); int rvt_modify_ah(struct ib_ah *ibah, struct rdma_ah_attr *ah_attr); int rvt_query_ah(struct ib_ah *ibah, struct rdma_ah_attr *ah_attr); |