Skip to content

Commit 2d83619

Browse files
Saeed Mahameeddavem330
authored andcommitted
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: c02b374 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net") Signed-off-by: Saeed Mahameed <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent c02b374 commit 2d83619

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

include/linux/mlx5/mlx5_ifc.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,8 +1035,6 @@ struct mlx5_ifc_cmd_hca_cap_bits {
10351035
u8 log_max_wq_sz[0x5];
10361036

10371037
u8 nic_vport_change_event[0x1];
1038-
u8 disable_local_lb[0x1];
1039-
u8 reserved_at_3e2[0x1];
10401038
u8 disable_local_lb_uc[0x1];
10411039
u8 disable_local_lb_mc[0x1];
10421040
u8 log_min_hairpin_wq_data_sz[0x5];

0 commit comments

Comments
 (0)