5 files changed, 31 insertions, 9 deletions

diff --git a/include/linux/mlx4/cmd.h b/include/linux/mlx4/cmd.h
index 7d1eaa97de13..77323a72dd3c 100644
--- a/include/linux/mlx4/cmd.h
+++ b/include/linux/mlx4/cmd.h
@@ -81,7 +81,7 @@ enum {
         MLX4_CMD_SW2HW_CQ        = 0x16,
         MLX4_CMD_HW2SW_CQ        = 0x17,
         MLX4_CMD_QUERY_CQ        = 0x18,
-        MLX4_CMD_RESIZE_CQ       = 0x2c,
+        MLX4_CMD_MODIFY_CQ       = 0x2c,
 
         /* SRQ commands */
         MLX4_CMD_SW2HW_SRQ       = 0x35,
diff --git a/include/linux/mlx4/cq.h b/include/linux/mlx4/cq.h
index 0181e0a57cbf..071cf96cf01f 100644
--- a/include/linux/mlx4/cq.h
+++ b/include/linux/mlx4/cq.h
@@ -45,11 +45,11 @@ struct mlx4_cqe {
         u8                      sl;
         u8                      reserved1;
         __be16                  rlid;
-        u32                     reserved2;
+        __be32                  ipoib_status;
         __be32                  byte_cnt;
         __be16                  wqe_index;
         __be16                  checksum;
-        u8                      reserved3[3];
+        u8                      reserved2[3];
         u8                      owner_sr_opcode;
 };
 
@@ -85,6 +85,16 @@ enum {
         MLX4_CQE_SYNDROME_REMOTE_ABORTED_ERR            = 0x22,
 };
 
+enum {
+        MLX4_CQE_IPOIB_STATUS_IPV4                      = 1 << 22,
+        MLX4_CQE_IPOIB_STATUS_IPV4F                     = 1 << 23,
+        MLX4_CQE_IPOIB_STATUS_IPV6                      = 1 << 24,
+        MLX4_CQE_IPOIB_STATUS_IPV4OPT                   = 1 << 25,
+        MLX4_CQE_IPOIB_STATUS_TCP                       = 1 << 26,
+        MLX4_CQE_IPOIB_STATUS_UDP                       = 1 << 27,
+        MLX4_CQE_IPOIB_STATUS_IPOK                      = 1 << 28,
+};
+
 static inline void mlx4_cq_arm(struct mlx4_cq *cq, u32 cmd,
                                void __iomem *uar_page,
                                spinlock_t *doorbell_lock)
@@ -120,4 +130,9 @@ enum {
         MLX4_CQ_DB_REQ_NOT              = 2 << 24
 };
 
+int mlx4_cq_modify(struct mlx4_dev *dev, struct mlx4_cq *cq,
+                   u16 count, u16 period);
+int mlx4_cq_resize(struct mlx4_dev *dev, struct mlx4_cq *cq,
+                   int entries, struct mlx4_mtt *mtt);
+
 #endif /* MLX4_CQ_H */
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 6cdf813cd478..ff7df1a2222f 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -186,6 +186,7 @@ struct mlx4_caps {
         u32                     flags;
         u16                     stat_rate_support;
         u8                      port_width_cap[MLX4_MAX_PORTS + 1];
+        int                     max_gso_sz;
 };
 
 struct mlx4_buf_list {
diff --git a/include/linux/mlx4/driver.h b/include/linux/mlx4/driver.h
index 1b835ca49df1..53c5fdb6eac4 100644
--- a/include/linux/mlx4/driver.h
+++ b/include/linux/mlx4/driver.h
@@ -48,8 +48,7 @@ struct mlx4_interface {
         void *                  (*add)   (struct mlx4_dev *dev);
         void                    (*remove)(struct mlx4_dev *dev, void *context);
         void                    (*event) (struct mlx4_dev *dev, void *context,
-                                          enum mlx4_dev_event event, int subtype,
-                                          int port);
+                                          enum mlx4_dev_event event, int port);
         struct list_head        list;
 };
 
diff --git a/include/linux/mlx4/qp.h b/include/linux/mlx4/qp.h
index 09a2230923f2..a5e43febee4f 100644
--- a/include/linux/mlx4/qp.h
+++ b/include/linux/mlx4/qp.h
@@ -158,10 +158,12 @@ struct mlx4_qp_context {
 #define MLX4_FW_VER_WQE_CTRL_NEC mlx4_fw_ver(2, 2, 232)
 
 enum {
-        MLX4_WQE_CTRL_NEC       = 1 << 29,
-        MLX4_WQE_CTRL_FENCE     = 1 << 6,
-        MLX4_WQE_CTRL_CQ_UPDATE = 3 << 2,
-        MLX4_WQE_CTRL_SOLICITED = 1 << 1,
+        MLX4_WQE_CTRL_NEC               = 1 << 29,
+        MLX4_WQE_CTRL_FENCE             = 1 << 6,
+        MLX4_WQE_CTRL_CQ_UPDATE         = 3 << 2,
+        MLX4_WQE_CTRL_SOLICITED         = 1 << 1,
+        MLX4_WQE_CTRL_IP_CSUM           = 1 << 4,
+        MLX4_WQE_CTRL_TCP_UDP_CSUM      = 1 << 5,
 };
 
 struct mlx4_wqe_ctrl_seg {
@@ -217,6 +219,11 @@ struct mlx4_wqe_datagram_seg {
         __be32                  reservd[2];
 };
 
+struct mlx4_lso_seg {
+        __be32                  mss_hdr_size;
+        __be32                  header[0];
+};
+
 struct mlx4_wqe_bind_seg {
         __be32                  flags1;
         __be32                  flags2;