1 files changed, 31 insertions, 4 deletions

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 701e7b40560a..95bf4bac44cb 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -94,7 +94,7 @@ enum ib_device_cap_flags {
         IB_DEVICE_SRQ_RESIZE            = (1<<13),
         IB_DEVICE_N_NOTIFY_CQ           = (1<<14),
         IB_DEVICE_ZERO_STAG             = (1<<15),
-        IB_DEVICE_SEND_W_INV            = (1<<16),
+        IB_DEVICE_RESERVED              = (1<<16), /* old SEND_W_INV */
         IB_DEVICE_MEM_WINDOW            = (1<<17),
         /*
          * Devices should set IB_DEVICE_UD_IP_SUM if they support
@@ -104,6 +104,8 @@ enum ib_device_cap_flags {
          * IPoIB driver may set NETIF_F_IP_CSUM for datagram mode.
          */
         IB_DEVICE_UD_IP_CSUM            = (1<<18),
+        IB_DEVICE_UD_TSO                = (1<<19),
+        IB_DEVICE_SEND_W_INV            = (1<<21),
 };
 
 enum ib_atomic_cap {
@@ -411,6 +413,7 @@ enum ib_wc_opcode {
         IB_WC_COMP_SWAP,
         IB_WC_FETCH_ADD,
         IB_WC_BIND_MW,
+        IB_WC_LSO,
 /*
  * Set value of IB_WC_RECV so consumers can test if a completion is a
  * receive by testing (opcode & IB_WC_RECV).
@@ -495,6 +498,10 @@ enum ib_qp_type {
         IB_QPT_RAW_ETY
 };
 
+enum ib_qp_create_flags {
+        IB_QP_CREATE_IPOIB_UD_LSO       = 1 << 0,
+};
+
 struct ib_qp_init_attr {
         void                  (*event_handler)(struct ib_event *, void *);
         void                   *qp_context;
@@ -504,6 +511,7 @@ struct ib_qp_init_attr {
         struct ib_qp_cap        cap;
         enum ib_sig_type        sq_sig_type;
         enum ib_qp_type         qp_type;
+        enum ib_qp_create_flags create_flags;
         u8                      port_num; /* special QP types only */
 };
 
@@ -617,7 +625,9 @@ enum ib_wr_opcode {
         IB_WR_SEND_WITH_IMM,
         IB_WR_RDMA_READ,
         IB_WR_ATOMIC_CMP_AND_SWP,
-        IB_WR_ATOMIC_FETCH_AND_ADD
+        IB_WR_ATOMIC_FETCH_AND_ADD,
+        IB_WR_LSO,
+        IB_WR_SEND_WITH_INV,
 };
 
 enum ib_send_flags {
@@ -641,7 +651,10 @@ struct ib_send_wr {
         int                     num_sge;
         enum ib_wr_opcode       opcode;
         int                     send_flags;
-        __be32                  imm_data;
+        union {
+                __be32          imm_data;
+                u32             invalidate_rkey;
+        } ex;
         union {
                 struct {
                         u64     remote_addr;
@@ -655,6 +668,9 @@ struct ib_send_wr {
                 } atomic;
                 struct {
                         struct ib_ah *ah;
+                        void   *header;
+                        int     hlen;
+                        int     mss;
                         u32     remote_qpn;
                         u32     remote_qkey;
                         u16     pkey_index; /* valid for GSI only */
@@ -730,7 +746,7 @@ struct ib_uobject {
         struct ib_ucontext     *context;        /* associated user context */
         void                   *object;         /* containing object */
         struct list_head        list;           /* link to context's list */
-        u32                     id;             /* index into kernel idr */
+        int                     id;             /* index into kernel idr */
         struct kref             ref;
         struct rw_semaphore     mutex;          /* protects .live */
         int                     live;
@@ -971,6 +987,8 @@ struct ib_device {
                                                 int comp_vector,
                                                 struct ib_ucontext *context,
                                                 struct ib_udata *udata);
+        int                        (*modify_cq)(struct ib_cq *cq, u16 cq_count,
+                                                u16 cq_period);
         int                        (*destroy_cq)(struct ib_cq *cq);
         int                        (*resize_cq)(struct ib_cq *cq, int cqe,
                                                 struct ib_udata *udata);
@@ -1376,6 +1394,15 @@ struct ib_cq *ib_create_cq(struct ib_device *device,
 int ib_resize_cq(struct ib_cq *cq, int cqe);
 
 /**
+ * ib_modify_cq - Modifies moderation params of the CQ
+ * @cq: The CQ to modify.
+ * @cq_count: number of CQEs that will trigger an event
+ * @cq_period: max period of time in usec before triggering an event
+ *
+ */
+int ib_modify_cq(struct ib_cq *cq, u16 cq_count, u16 cq_period);
+
+/**
  * ib_destroy_cq - Destroys the specified CQ.
  * @cq: The CQ to destroy.
  */