diff options
| author | Doug Ledford <dledford@redhat.com> | 2018-10-17 11:23:37 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2018-10-17 11:23:37 -0400 |
| commit | 5a8336d99a81ae7492d41b5a13dc2717b0d39565 (patch) | |
| tree | 6a77bc69695c0df3e5dfb31702962d3b8e9a183a | |
| parent | 508a523f6bc6cdfbf7031d66559d4ad24956b741 (diff) | |
| parent | 94a04d1d3d3681adde1a3e022b25dbac7b345b7e (diff) | |
| download | talos-op-linux-5a8336d99a81ae7492d41b5a13dc2717b0d39565.tar.gz talos-op-linux-5a8336d99a81ae7492d41b5a13dc2717b0d39565.zip | |
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>
| -rw-r--r-- | include/linux/mlx5/mlx5_ifc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h index 68f4d5f9d929..0f460fb22c31 100644 --- a/include/linux/mlx5/mlx5_ifc.h +++ b/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]; |
