diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-08 12:15:50 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-08 12:15:50 +0100 |
| commit | 4e37fd4d5dfd39f547b0b00fa184a440a1e44b96 (patch) | |
| tree | 1f2a678cce5422703aa376ab3506f430d51f89da /include/rdma/ib_verbs.h | |
| parent | ARM: cpuidle: Refactor rollback operations if init fails (diff) | |
| parent | PM / QoS: Fix device resume latency framework (diff) | |
| download | linux-4e37fd4d5dfd39f547b0b00fa184a440a1e44b96.tar.xz linux-4e37fd4d5dfd39f547b0b00fa184a440a1e44b96.zip | |
Merge branch 'pm-qos' into pm-cpuidle
Diffstat (limited to 'include/rdma/ib_verbs.h')
| -rw-r--r-- | include/rdma/ib_verbs.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index bdb1279a415b..e8608b2dc844 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -285,7 +285,7 @@ enum ib_tm_cap_flags { IB_TM_CAP_RC = 1 << 0, }; -struct ib_xrq_caps { +struct ib_tm_caps { /* Max size of RNDV header */ u32 max_rndv_hdr_size; /* Max number of entries in tag matching list */ @@ -358,7 +358,7 @@ struct ib_device_attr { struct ib_rss_caps rss_caps; u32 max_wq_type_rq; u32 raw_packet_caps; /* Use ib_raw_packet_caps enum */ - struct ib_xrq_caps xrq_caps; + struct ib_tm_caps tm_caps; }; enum ib_mtu { @@ -1739,7 +1739,7 @@ struct ib_mr { u32 lkey; u32 rkey; u64 iova; - u32 length; + u64 length; unsigned int page_size; bool need_inval; union { |