diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-07-27 09:00:38 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-07-27 09:00:38 -0400 |
| commit | a5f66725c7748a6831005a091b4aa9d18abb3b03 (patch) | |
| tree | b282b84f1c106bf00e8112979721567a91dfb86a /include | |
| parent | f55c1e6608bed7f583f5be4a74bbca16b288a7e5 (diff) | |
| parent | 67cbe3532c2cd84303a2073cedad6b8bcad13be3 (diff) | |
| download | linux-stable-a5f66725c7748a6831005a091b4aa9d18abb3b03.tar.gz linux-stable-a5f66725c7748a6831005a091b4aa9d18abb3b03.tar.bz2 linux-stable-a5f66725c7748a6831005a091b4aa9d18abb3b03.zip | |
Merge branch 'misc' into k.o/for-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/rdma/ib_verbs.h | 1 | ||||
| -rw-r--r-- | include/uapi/rdma/qedr-abi.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index baa72d31db27..1082b4c81b2c 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -3565,6 +3565,7 @@ void ib_drain_qp(struct ib_qp *qp); int ib_resolve_eth_dmac(struct ib_device *device, struct rdma_ah_attr *ah_attr); +int ib_get_eth_speed(struct ib_device *dev, u8 port_num, u8 *speed, u8 *width); static inline u8 *rdma_ah_retrieve_dmac(struct rdma_ah_attr *attr) { diff --git a/include/uapi/rdma/qedr-abi.h b/include/uapi/rdma/qedr-abi.h index 75c270d839c8..54b64357ab24 100644 --- a/include/uapi/rdma/qedr-abi.h +++ b/include/uapi/rdma/qedr-abi.h @@ -49,6 +49,9 @@ struct qedr_alloc_ucontext_resp { __u32 sges_per_recv_wr; __u32 sges_per_srq_wr; __u32 max_cqes; + __u8 dpm_enabled; + __u8 wids_enabled; + __u16 wid_count; }; struct qedr_alloc_pd_ureq { |