Skip to content

Commit 23201ea

Browse files
committed
Merge branch 'mlxsw-Two-small-fixes'
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 e891ce1 ("mlxsw: spectrum_buffers: Reduce pool size on Spectrum-2"). ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents abb48f8 + 744ad9a commit 23201ea

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6330,7 +6330,7 @@ static int __init mlxsw_sp_module_init(void)
63306330
return 0;
63316331

63326332
err_sp2_pci_driver_register:
6333-
mlxsw_pci_driver_unregister(&mlxsw_sp2_pci_driver);
6333+
mlxsw_pci_driver_unregister(&mlxsw_sp1_pci_driver);
63346334
err_sp1_pci_driver_register:
63356335
mlxsw_core_driver_unregister(&mlxsw_sp2_driver);
63366336
err_sp2_core_driver_register:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,8 +437,8 @@ static const struct mlxsw_sp_sb_pr mlxsw_sp1_sb_prs[] = {
437437
MLXSW_SP1_SB_PR_CPU_SIZE, true, false),
438438
};
439439

440-
#define MLXSW_SP2_SB_PR_INGRESS_SIZE 38128752
441-
#define MLXSW_SP2_SB_PR_EGRESS_SIZE 38128752
440+
#define MLXSW_SP2_SB_PR_INGRESS_SIZE 35297568
441+
#define MLXSW_SP2_SB_PR_EGRESS_SIZE 35297568
442442
#define MLXSW_SP2_SB_PR_CPU_SIZE (256 * 1000)
443443

444444
/* Order according to mlxsw_sp2_sb_pool_dess */

0 commit comments

Comments
 (0)