Merge remote-tracking branch 'wireless-next/master' into mac80211-next

1 files changed, 13 insertions, 4 deletions

diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h
index 68029b30c3dc..da78875807fc 100644
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@ -181,7 +181,7 @@ enum {
         MLX5_DEV_CAP_FLAG_TLP_HINTS     = 1LL << 39,
         MLX5_DEV_CAP_FLAG_SIG_HAND_OVER = 1LL << 40,
         MLX5_DEV_CAP_FLAG_DCT           = 1LL << 41,
-        MLX5_DEV_CAP_FLAG_CMDIF_CSUM    = 1LL << 46,
+        MLX5_DEV_CAP_FLAG_CMDIF_CSUM    = 3LL << 46,
 };
 
 enum {
@@ -230,6 +230,15 @@ enum {
         MLX5_MAX_PAGE_SHIFT             = 31
 };
 
+enum {
+        MLX5_ADAPTER_PAGE_SHIFT         = 12
+};
+
+enum {
+        MLX5_CAP_OFF_DCT                = 41,
+        MLX5_CAP_OFF_CMDIF_CSUM         = 46,
+};
+
 struct mlx5_inbox_hdr {
         __be16          opcode;
         u8              rsvd[4];
@@ -319,9 +328,9 @@ struct mlx5_hca_cap {
         u8      rsvd25[42];
         __be16  log_uar_page_sz;
         u8      rsvd26[28];
-        u8      log_msx_atomic_size_qp;
+        u8      log_max_atomic_size_qp;
         u8      rsvd27[2];
-        u8      log_msx_atomic_size_dc;
+        u8      log_max_atomic_size_dc;
         u8      rsvd28[76];
 };
 
@@ -417,7 +426,7 @@ struct mlx5_init_seg {
         struct health_buffer    health;
         __be32                  rsvd2[884];
         __be32                  health_counter;
-        __be32                  rsvd3[1023];
+        __be32                  rsvd3[1019];
         __be64                  ieee1588_clk;
         __be32                  ieee1588_clk_type;
         __be32                  clr_intx;