aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaeed Mahameed <[email protected]>2018-01-17 09:54:38 +0200
committerDavid S. Miller <[email protected]>2018-01-17 11:24:28 -0500
commit2d83619de8a64703cd3b0bf21b3b85f081290bf3 (patch)
treedc68f8778a8063916e9fe07b72461185a4432e68
parentc02b3741eb99a1ec733e6134c53ba59e43e19e97 (diff)
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: c02b3741eb99 ("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]>
-rw-r--r--include/linux/mlx5/mlx5_ifc.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index 94135c03d52b..acd829d8613b 100644
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -1035,8 +1035,6 @@ struct mlx5_ifc_cmd_hca_cap_bits {
u8 log_max_wq_sz[0x5];
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_mc[0x1];
u8 log_min_hairpin_wq_data_sz[0x5];