Merge branch 'hfi1' into k.o/for-4.14

[linux-2.6-block.git] / include / rdma / rdma_vt.h

diff --git a/include/rdma/rdma_vt.h b/include/rdma/rdma_vt.h
index 55af692710539d6555c072a0c2a290aca7bfba42..22fb15ff5e8b7e9f83672ac054ccd796cb9dc074 100644 (file)
--- 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);