Merge remote-tracking branches 'spi/fix/dt', 'spi/fix/fsl-dspi' and 'spi/fix/fsl...

[cascardo/linux.git] / drivers / net / ethernet / mellanox / mlxsw / switchx2.c

diff --git a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
index 377daa4..c0c23e2 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
@@ -997,7 +997,7 @@ static int mlxsw_sx_port_create(struct mlxsw_sx *mlxsw_sx, u8 local_port)
        /* Each packet needs to have a Tx header (metadata) on top all other
         * headers.
         */
-       dev->hard_header_len += MLXSW_TXHDR_LEN;
+       dev->needed_headroom = MLXSW_TXHDR_LEN;
 
        err = mlxsw_sx_port_module_check(mlxsw_sx_port, &usable);
        if (err) {
@@ -1512,10 +1512,6 @@ static void mlxsw_sx_fini(struct mlxsw_core *mlxsw_core)
 static struct mlxsw_config_profile mlxsw_sx_config_profile = {
        .used_max_vepa_channels         = 1,
        .max_vepa_channels              = 0,
-       .used_max_lag                   = 1,
-       .max_lag                        = 64,
-       .used_max_port_per_lag          = 1,
-       .max_port_per_lag               = 16,
        .used_max_mid                   = 1,
        .max_mid                        = 7000,
        .used_max_pgt                   = 1,