1 files changed, 13 insertions, 4 deletions

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 09509edb1c5f..857b3b9cf120 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -136,6 +136,7 @@ struct ib_device_attr {
         int                     max_qp_init_rd_atom;
         int                     max_ee_init_rd_atom;
         enum ib_atomic_cap      atomic_cap;
+        enum ib_atomic_cap      masked_atomic_cap;
         int                     max_ee;
         int                     max_rdd;
         int                     max_mw;
@@ -467,6 +468,8 @@ enum ib_wc_opcode {
         IB_WC_LSO,
         IB_WC_LOCAL_INV,
         IB_WC_FAST_REG_MR,
+        IB_WC_MASKED_COMP_SWAP,
+        IB_WC_MASKED_FETCH_ADD,
 /*
  * Set value of IB_WC_RECV so consumers can test if a completion is a
  * receive by testing (opcode & IB_WC_RECV).
@@ -552,7 +555,7 @@ enum ib_qp_type {
         IB_QPT_UC,
         IB_QPT_UD,
         IB_QPT_RAW_IPV6,
-        IB_QPT_RAW_ETY
+        IB_QPT_RAW_ETHERTYPE
 };
 
 enum ib_qp_create_flags {
@@ -689,6 +692,8 @@ enum ib_wr_opcode {
         IB_WR_RDMA_READ_WITH_INV,
         IB_WR_LOCAL_INV,
         IB_WR_FAST_REG_MR,
+        IB_WR_MASKED_ATOMIC_CMP_AND_SWP,
+        IB_WR_MASKED_ATOMIC_FETCH_AND_ADD,
 };
 
 enum ib_send_flags {
@@ -731,6 +736,8 @@ struct ib_send_wr {
                         u64     remote_addr;
                         u64     compare_add;
                         u64     swap;
+                        u64     compare_add_mask;
+                        u64     swap_mask;
                         u32     rkey;
                 } atomic;
                 struct {
@@ -984,9 +991,9 @@ struct ib_device {
         struct list_head              event_handler_list;
         spinlock_t                    event_handler_lock;
 
+        spinlock_t                    client_data_lock;
         struct list_head              core_list;
         struct list_head              client_data_list;
-        spinlock_t                    client_data_lock;
 
         struct ib_cache               cache;
         int                          *pkey_tbl_len;
@@ -1144,8 +1151,8 @@ struct ib_device {
                 IB_DEV_UNREGISTERED
         }                            reg_state;
 
-        u64                          uverbs_cmd_mask;
         int                          uverbs_abi_ver;
+        u64                          uverbs_cmd_mask;
 
         char                         node_desc[64];
         __be64                       node_guid;
@@ -1165,7 +1172,9 @@ struct ib_client {
 struct ib_device *ib_alloc_device(size_t size);
 void ib_dealloc_device(struct ib_device *device);
 
-int ib_register_device   (struct ib_device *device);
+int ib_register_device(struct ib_device *device,
+                       int (*port_callback)(struct ib_device *,
+                                            u8, struct kobject *));
 void ib_unregister_device(struct ib_device *device);
 
 int ib_register_client   (struct ib_client *client);