Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03a1eabc authored Oct 04, 2016 by David S. Miller

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>

parents 1ebf8b42 251d41c5

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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) {

drivers/net/ethernet/mellanox/mlxsw/switchx2.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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) {