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

Commit 25fb0b6c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-next' 



Jiri Pirko says:

====================
mlxsw: spectrum_buffers: couple of cosmetic patches

As suggested by David Laight
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents de33efd0 b94cdabb

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

+4 −11
Original line number Diff line number Diff line
@@ -162,19 +162,12 @@ static int mlxsw_sp_sb_pm_occ_query(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
}



static const u16 mlxsw_sp_pbs[] = {

	2 * MLXSW_SP_BYTES_TO_CELLS(ETH_FRAME_LEN),

	0,

	0,

	0,

	0,

	0,

	0,

	0,

	0, /* Unused */

	2 * MLXSW_SP_BYTES_TO_CELLS(MLXSW_PORT_MAX_MTU),

	[0] = 2 * MLXSW_SP_BYTES_TO_CELLS(ETH_FRAME_LEN),

	[9] = 2 * MLXSW_SP_BYTES_TO_CELLS(MLXSW_PORT_MAX_MTU),

};



#define MLXSW_SP_PBS_LEN ARRAY_SIZE(mlxsw_sp_pbs)

#define MLXSW_SP_PB_UNUSED 8



static int mlxsw_sp_port_pb_init(struct mlxsw_sp_port *mlxsw_sp_port)

{
@@ -184,7 +177,7 @@ static int mlxsw_sp_port_pb_init(struct mlxsw_sp_port *mlxsw_sp_port) 
	mlxsw_reg_pbmc_pack(pbmc_pl, mlxsw_sp_port->local_port,

			    0xffff, 0xffff / 2);

	for (i = 0; i < MLXSW_SP_PBS_LEN; i++) {

		if (i == 8)

		if (i == MLXSW_SP_PB_UNUSED)

			continue;

		mlxsw_reg_pbmc_lossy_buffer_pack(pbmc_pl, i, mlxsw_sp_pbs[i]);

	}