History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

David S. Miller committed 9 years ago

Commit 35eeacf2 parents bed45f7 1ee183297 files · +853 −341Browse files

Showing the changes to include/uapi (1 of 97 files). Show all

Unified · Split

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 {