Merge branch 'mlxsw-fixes'

Jiri Pirko says:

====================
mlxsw: Couple of fixes

Couple of fixes from Yotam.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index fd74d10..1ec0a4c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -2285,7 +2285,7 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, 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_sp_port_system_port_mapping_set(mlxsw_sp_port);
        if (err) {

diff --git a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
index 8b15bf0..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) {