rdma: align uapi headers with 4.20-rc5

Upstream headers were updated.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/rdma/include/uapi/rdma/ib_user_verbs.h b/rdma/include/uapi/rdma/ib_user_verbs.h
index 25a16760de2ad1c6a735d71b3bd4edcc07f1e3c3..1254b51a551a1c370557340a2c480467dd1e5bac 100644 (file)
--- a/rdma/include/uapi/rdma/ib_user_verbs.h
+++ b/rdma/include/uapi/rdma/ib_user_verbs.h
@@ -763,10 +763,28 @@ struct ib_uverbs_sge {
        __u32 lkey;
 };
 
+enum ib_uverbs_wr_opcode {
+       IB_UVERBS_WR_RDMA_WRITE = 0,
+       IB_UVERBS_WR_RDMA_WRITE_WITH_IMM = 1,
+       IB_UVERBS_WR_SEND = 2,
+       IB_UVERBS_WR_SEND_WITH_IMM = 3,
+       IB_UVERBS_WR_RDMA_READ = 4,
+       IB_UVERBS_WR_ATOMIC_CMP_AND_SWP = 5,
+       IB_UVERBS_WR_ATOMIC_FETCH_AND_ADD = 6,
+       IB_UVERBS_WR_LOCAL_INV = 7,
+       IB_UVERBS_WR_BIND_MW = 8,
+       IB_UVERBS_WR_SEND_WITH_INV = 9,
+       IB_UVERBS_WR_TSO = 10,
+       IB_UVERBS_WR_RDMA_READ_WITH_INV = 11,
+       IB_UVERBS_WR_MASKED_ATOMIC_CMP_AND_SWP = 12,
+       IB_UVERBS_WR_MASKED_ATOMIC_FETCH_AND_ADD = 13,
+       /* Review enum ib_wr_opcode before modifying this */
+};
+
 struct ib_uverbs_send_wr {
        __aligned_u64 wr_id;
        __u32 num_sge;
-       __u32 opcode;
+       __u32 opcode;           /* see enum ib_uverbs_wr_opcode */
        __u32 send_flags;
        union {
                __be32 imm_data;

diff --git a/rdma/include/uapi/rdma/rdma_netlink.h b/rdma/include/uapi/rdma/rdma_netlink.h
index 6513fb89abfa1d5dc8b676c717c784763aab8d04..e2228c0917154b7dadec4201801a106b47d4b96e 100644 (file)
--- a/rdma/include/uapi/rdma/rdma_netlink.h
+++ b/rdma/include/uapi/rdma/rdma_netlink.h
@@ -227,8 +227,9 @@ enum rdma_nldev_command {
        RDMA_NLDEV_CMD_UNSPEC,
 
        RDMA_NLDEV_CMD_GET, /* can dump */
+       RDMA_NLDEV_CMD_SET,
 
-       /* 2 - 4 are free to use */
+       /* 3 - 4 are free to use */
 
        RDMA_NLDEV_CMD_PORT_GET = 5, /* can dump */