Commit 23201ea5 authored by David S. Miller's avatar David S. Miller

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 e891ce1d ("mlxsw: spectrum_buffers: Reduce pool size on
Spectrum-2").
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents abb48f80 744ad9a3
...@@ -6330,7 +6330,7 @@ static int __init mlxsw_sp_module_init(void) ...@@ -6330,7 +6330,7 @@ static int __init mlxsw_sp_module_init(void)
return 0; return 0;
err_sp2_pci_driver_register: 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: err_sp1_pci_driver_register:
mlxsw_core_driver_unregister(&mlxsw_sp2_driver); mlxsw_core_driver_unregister(&mlxsw_sp2_driver);
err_sp2_core_driver_register: err_sp2_core_driver_register:
......
...@@ -437,8 +437,8 @@ static const struct mlxsw_sp_sb_pr mlxsw_sp1_sb_prs[] = { ...@@ -437,8 +437,8 @@ static const struct mlxsw_sp_sb_pr mlxsw_sp1_sb_prs[] = {
MLXSW_SP1_SB_PR_CPU_SIZE, true, false), MLXSW_SP1_SB_PR_CPU_SIZE, true, false),
}; };
#define MLXSW_SP2_SB_PR_INGRESS_SIZE 38128752 #define MLXSW_SP2_SB_PR_INGRESS_SIZE 35297568
#define MLXSW_SP2_SB_PR_EGRESS_SIZE 38128752 #define MLXSW_SP2_SB_PR_EGRESS_SIZE 35297568
#define MLXSW_SP2_SB_PR_CPU_SIZE (256 * 1000) #define MLXSW_SP2_SB_PR_CPU_SIZE (256 * 1000)
/* Order according to mlxsw_sp2_sb_pool_dess */ /* Order according to mlxsw_sp2_sb_pool_dess */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment