diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-07-24 15:33:43 +0300 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-07-24 15:33:43 +0300 |
| commit | 03da084ed8804ddc5918883be84245b53393b8fb (patch) | |
| tree | 564a4860cb9c5de3f504fd6156110d95b1c9f26b /include/rdma/rdma_vt.h | |
| parent | 520eccdfe187591a51ea9ab4c1a024ae4d0f68d9 (diff) | |
| parent | bc5214ee29220251e5507882696ded5ca183b169 (diff) | |
| download | linux-03da084ed8804ddc5918883be84245b53393b8fb.tar.xz | |
Merge branch 'hfi1' into k.o/for-4.14
Diffstat (limited to 'include/rdma/rdma_vt.h')
| -rw-r--r-- | include/rdma/rdma_vt.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/rdma/rdma_vt.h b/include/rdma/rdma_vt.h index 55af69271053..22fb15ff5e8b 100644 --- a/include/rdma/rdma_vt.h +++ b/include/rdma/rdma_vt.h @@ -75,6 +75,7 @@ struct rvt_ibport { __be64 mkey; u64 tid; u32 port_cap_flags; + u16 port_cap3_flags; u32 pma_sample_start; u32 pma_sample_interval; __be16 pma_counter_select[5]; @@ -514,7 +515,8 @@ int rvt_invalidate_rkey(struct rvt_qp *qp, u32 rkey); int rvt_rkey_ok(struct rvt_qp *qp, struct rvt_sge *sge, u32 len, u64 vaddr, u32 rkey, int acc); int rvt_lkey_ok(struct rvt_lkey_table *rkt, struct rvt_pd *pd, - struct rvt_sge *isge, struct ib_sge *sge, int acc); + struct rvt_sge *isge, struct rvt_sge *last_sge, + struct ib_sge *sge, int acc); struct rvt_mcast *rvt_mcast_find(struct rvt_ibport *ibp, union ib_gid *mgid, u16 lid); |