Commit 2d83619d authored by Saeed Mahameed's avatar Saeed Mahameed Committed by David S. Miller

net/mlx5: Fix build break

The latest merge between net and net-next introduced a complier assert in
mlx5 driver.  In hca_cap_bits older fields are kept along with newer
fields that should have replaced them.

Fixes: c02b3741 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net")
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c02b3741
...@@ -1035,8 +1035,6 @@ struct mlx5_ifc_cmd_hca_cap_bits { ...@@ -1035,8 +1035,6 @@ struct mlx5_ifc_cmd_hca_cap_bits {
u8 log_max_wq_sz[0x5]; u8 log_max_wq_sz[0x5];
u8 nic_vport_change_event[0x1]; u8 nic_vport_change_event[0x1];
u8 disable_local_lb[0x1];
u8 reserved_at_3e2[0x1];
u8 disable_local_lb_uc[0x1]; u8 disable_local_lb_uc[0x1];
u8 disable_local_lb_mc[0x1]; u8 disable_local_lb_mc[0x1];
u8 log_min_hairpin_wq_data_sz[0x5]; u8 log_min_hairpin_wq_data_sz[0x5];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment