OSDN Git Service

net/mlx5: Fix build break
authorSaeed Mahameed <saeedm@mellanox.com>
Wed, 17 Jan 2018 07:54:38 +0000 (09:54 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 17 Jan 2018 16:24:28 +0000 (11:24 -0500)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/mlx5/mlx5_ifc.h

index 94135c0..acd829d 100644 (file)
@@ -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];