| Message ID | 20180117075438.16060-1-saeedm@mellanox.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] net/mlx5: Fix build break | expand |
From: Saeed Mahameed <saeedm@mellanox.com> Date: Wed, 17 Jan 2018 09:54:38 +0200 > 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 <saeedm@mellanox.com> My bad, applied, thanks Saeed.
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];
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 <saeedm@mellanox.com> --- include/linux/mlx5/mlx5_ifc.h | 2 -- 1 file changed, 2 deletions(-)