Browse Source

Merge remote-tracking branch 'mlx5-next' into for-next

Pick up changes to mlx5_ifc.h needed for direct Scatter to CQE support
series to come next.

Signed-off-by: Doug Ledford <dledford@redhat.com>
Doug Ledford 6 years ago
parent
commit
5a8336d99a
1 changed files with 2 additions and 1 deletions
  1. 2 1
      include/linux/mlx5/mlx5_ifc.h

+ 2 - 1
include/linux/mlx5/mlx5_ifc.h

@@ -1005,7 +1005,8 @@ struct mlx5_ifc_cmd_hca_cap_bits {
 	u8         umr_modify_atomic_disabled[0x1];
 	u8         umr_indirect_mkey_disabled[0x1];
 	u8         umr_fence[0x2];
-	u8         reserved_at_20c[0x3];
+	u8         dc_req_scat_data_cqe[0x1];
+	u8         reserved_at_20d[0x2];
 	u8         drain_sigerr[0x1];
 	u8         cmdif_checksum[0x2];
 	u8         sigerr_cqe[0x1];