History

Merge branch 'k.o/for-4.10-rc' into HEAD

Doug Ledford committed 9 years ago

Commit 6dd7aba2 parents 6df6b4a 646ebd430 files · +283 −196Browse files

Showing the changes to include/uapi (3 of 30 files). Show all

Unified · Split

3 files
  1. include/uapi/rdma/Kbuild +1 −0
  2. include/uapi/rdma/cxgb3-abi.h +1 −1
  3. include/uapi/rdma/ib_user_verbs.h +8 −3
include/uapi/rdma/Kbuild+1−0
@@ -17,3 +17,4 @@ header-y += nes-abi.h · 16 unmodified lines
1717 header-y += ocrdma-abi.h
1818 header-y += hns-abi.h
1919 header-y += vmw_pvrdma-abi.h
20+header-y += qedr-abi.h
include/uapi/rdma/cxgb3-abi.h+1−1
@@ -30,7 +30,7 @@ · 29 unmodified lines
3030 * SOFTWARE.
3131 */
3232 #ifndef CXGB3_ABI_USER_H
33−#define CXBG3_ABI_USER_H
33+#define CXGB3_ABI_USER_H
3434
3535 #include <linux/types.h>
3636
include/uapi/rdma/ib_user_verbs.h+8−3
@@ -37,7 +37,6 @@ · 36 unmodified lines
3737 #define IB_USER_VERBS_H
3838
3939 #include <linux/types.h>
40−#include <rdma/ib_verbs.h>
4140
4241 /*
4342 * Increment this value if any changes that break userspace ABI
@@ -548,11 +547,17 @@ enum { · 504 unmodified lines
548547 };
549548
550549 enum {
551− IB_USER_LEGACY_LAST_QP_ATTR_MASK = IB_QP_DEST_QPN
550+ /*
551+ * This value is equal to IB_QP_DEST_QPN.
552+ */
553+ IB_USER_LEGACY_LAST_QP_ATTR_MASK = 1ULL << 20,
552554 };
553555
554556 enum {
555− IB_USER_LAST_QP_ATTR_MASK = IB_QP_RATE_LIMIT
557+ /*
558+ * This value is equal to IB_QP_RATE_LIMIT.
559+ */
560+ IB_USER_LAST_QP_ATTR_MASK = 1ULL << 25,
556561 };
557562
558563 struct ib_uverbs_ex_create_qp {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t