diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-02-19 09:18:21 -0500 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-02-19 09:18:21 -0500 |
| commit | 6dd7abae7110da6fa01f048baf5b679b5a4a56dd (patch) | |
| tree | 17ca298bbae17f05bdadae7f88e3be0f113a713f /include/uapi | |
| parent | 6df6b4a9ce43deb57d3e23b0e79a529464b5cf37 (diff) | |
| parent | 646ebd4166ca00bdf682a36bd2e1c9a74d848ac6 (diff) | |
| download | linux-stable-6dd7abae7110da6fa01f048baf5b679b5a4a56dd.tar.gz linux-stable-6dd7abae7110da6fa01f048baf5b679b5a4a56dd.tar.bz2 linux-stable-6dd7abae7110da6fa01f048baf5b679b5a4a56dd.zip | |
Merge branch 'k.o/for-4.10-rc' into HEAD
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/rdma/Kbuild | 1 | ||||
| -rw-r--r-- | include/uapi/rdma/cxgb3-abi.h | 2 | ||||
| -rw-r--r-- | include/uapi/rdma/ib_user_verbs.h | 11 |
3 files changed, 10 insertions, 4 deletions
diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild index 541311115505..1e0af1ff75c3 100644 --- a/include/uapi/rdma/Kbuild +++ b/include/uapi/rdma/Kbuild @@ -17,3 +17,4 @@ header-y += nes-abi.h header-y += ocrdma-abi.h header-y += hns-abi.h header-y += vmw_pvrdma-abi.h +header-y += qedr-abi.h diff --git a/include/uapi/rdma/cxgb3-abi.h b/include/uapi/rdma/cxgb3-abi.h index 48a19bda071b..d24eee12128f 100644 --- a/include/uapi/rdma/cxgb3-abi.h +++ b/include/uapi/rdma/cxgb3-abi.h @@ -30,7 +30,7 @@ * SOFTWARE. */ #ifndef CXGB3_ABI_USER_H -#define CXBG3_ABI_USER_H +#define CXGB3_ABI_USER_H #include <linux/types.h> diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h index dfdfe4e92d31..f4f87cff6dc6 100644 --- a/include/uapi/rdma/ib_user_verbs.h +++ b/include/uapi/rdma/ib_user_verbs.h @@ -37,7 +37,6 @@ #define IB_USER_VERBS_H #include <linux/types.h> -#include <rdma/ib_verbs.h> /* * Increment this value if any changes that break userspace ABI @@ -548,11 +547,17 @@ enum { }; enum { - IB_USER_LEGACY_LAST_QP_ATTR_MASK = IB_QP_DEST_QPN + /* + * This value is equal to IB_QP_DEST_QPN. + */ + IB_USER_LEGACY_LAST_QP_ATTR_MASK = 1ULL << 20, }; enum { - IB_USER_LAST_QP_ATTR_MASK = IB_QP_RATE_LIMIT + /* + * This value is equal to IB_QP_RATE_LIMIT. + */ + IB_USER_LAST_QP_ATTR_MASK = 1ULL << 25, }; struct ib_uverbs_ex_create_qp { |