Merge branch 'mlxsw-Two-small-fixes' (23201ea5) · Commits · 戴 / test

Ido Schimmel says: ==================== mlxsw: Two small fixes Patch #1 from Jiri fixes the error path of the module initialization function. Found during manual code inspection. Patch #2 from Petr further reduces the default shared buffer pool sizes in order to work around a problem that was originally described in commit ("mlxsw: spectrum_buffers: Reduce pool size on Spectrum-2"). ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -6330,7 +6330,7 @@ static int __init mlxsw_sp_module_init(void)
		return 0;

		err_sp2_pci_driver_register:
		mlxsw_pci_driver_unregister(&mlxsw_sp2_pci_driver);
		mlxsw_pci_driver_unregister(&mlxsw_sp1_pci_driver);
		err_sp1_pci_driver_register:
		mlxsw_core_driver_unregister(&mlxsw_sp2_driver);
		err_sp2_core_driver_register:

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -437,8 +437,8 @@ static const struct mlxsw_sp_sb_pr mlxsw_sp1_sb_prs[] = {
		MLXSW_SP1_SB_PR_CPU_SIZE, true, false),
		};

		#define MLXSW_SP2_SB_PR_INGRESS_SIZE 38128752
		#define MLXSW_SP2_SB_PR_EGRESS_SIZE 38128752
		#define MLXSW_SP2_SB_PR_INGRESS_SIZE 35297568
		#define MLXSW_SP2_SB_PR_EGRESS_SIZE 35297568
		#define MLXSW_SP2_SB_PR_CPU_SIZE (256 * 1000)

		/* Order according to mlxsw_sp2_sb_pool_dess */

Admin message