From: Ido Schimmel <idosch@OSS.NVIDIA.COM>
To: <netdev@vger.kernel.org>
Cc: <davem@davemloft.net>, <kuba@kernel.org>, <jiri@OSS.NVIDIA.COM>,
<petrm@OSS.NVIDIA.COM>, <danieller@OSS.NVIDIA.COM>,
<amcohen@OSS.NVIDIA.COM>, <mlxsw@OSS.NVIDIA.COM>,
Ido Schimmel <idosch@OSS.NVIDIA.COM>
Subject: [PATCH net-next 06/11] mlxsw: spectrum_buffers: Switch function arguments
Date: Mon, 17 May 2021 20:03:56 +0300 [thread overview]
Message-ID: <20210517170401.188563-7-idosch@nvidia.com> (raw)
In-Reply-To: <20210517170401.188563-1-idosch@nvidia.com>
From: Danielle Ratson <danieller@nvidia.com>
In the call path:
mlxsw_sp_hdroom_bufs_reset_sizes()
mlxsw_sp_hdroom_int_buf_size_get()
->int_buf_size_get()
The 'speed' and 'mtu' arguments were mistakenly switched twice. The two
bugs thus canceled each other.
Clean this up by switching the arguments in both call sites, so that
they are passed in the right order.
Found during manual code inspection.
Signed-off-by: Danielle Ratson <danieller@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
---
drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c
index 37ff29a1686e..9de160e740b2 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c
@@ -364,7 +364,7 @@ static u16 mlxsw_sp_hdroom_buf_delay_get(const struct mlxsw_sp *mlxsw_sp,
static u32 mlxsw_sp_hdroom_int_buf_size_get(struct mlxsw_sp *mlxsw_sp, int mtu, u32 speed)
{
- u32 buffsize = mlxsw_sp->sb_ops->int_buf_size_get(speed, mtu);
+ u32 buffsize = mlxsw_sp->sb_ops->int_buf_size_get(mtu, speed);
return mlxsw_sp_bytes_cells(mlxsw_sp, buffsize) + 1;
}
@@ -388,8 +388,8 @@ void mlxsw_sp_hdroom_bufs_reset_sizes(struct mlxsw_sp_port *mlxsw_sp_port,
int i;
/* Internal buffer. */
- reserve_cells = mlxsw_sp_hdroom_int_buf_size_get(mlxsw_sp, mlxsw_sp_port->max_speed,
- mlxsw_sp_port->max_mtu);
+ reserve_cells = mlxsw_sp_hdroom_int_buf_size_get(mlxsw_sp, mlxsw_sp_port->max_mtu,
+ mlxsw_sp_port->max_speed);
reserve_cells = mlxsw_sp_port_headroom_8x_adjust(mlxsw_sp_port, reserve_cells);
hdroom->int_buf.reserve_cells = reserve_cells;
--
2.31.1
next prev parent reply other threads:[~2021-05-17 17:20 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-17 17:03 [PATCH net-next 00/11] mlxsw: Various updates Ido Schimmel
2021-05-17 17:03 ` [PATCH net-next 01/11] selftests: mlxsw: Make the unsplit array global in port_scale test Ido Schimmel
2021-05-17 17:03 ` [PATCH net-next 02/11] selftests: mlxsw: Make sampling test more robust Ido Schimmel
2021-05-17 17:03 ` [PATCH net-next 03/11] selftests: mlxsw: qos_headroom: Convert to iproute2 dcb Ido Schimmel
2021-05-17 17:03 ` [PATCH net-next 04/11] selftests: mlxsw: qos_pfc: " Ido Schimmel
2021-05-17 17:03 ` [PATCH net-next 05/11] selftests: mlxsw: qos_lib: Drop __mlnx_qos Ido Schimmel
2021-05-17 17:03 ` Ido Schimmel [this message]
2021-05-17 17:03 ` [PATCH net-next 07/11] mlxsw: Verify the accessed index doesn't exceed the array length Ido Schimmel
2021-05-17 17:03 ` [PATCH net-next 08/11] mlxsw: core: Avoid unnecessary EMAD buffer copy Ido Schimmel
2021-05-17 17:03 ` [PATCH net-next 09/11] mlxsw: spectrum_router: Avoid missing error code warning Ido Schimmel
2021-05-17 17:04 ` [PATCH net-next 10/11] mlxsw: Remove Mellanox SwitchIB ASIC support Ido Schimmel
2021-05-17 17:04 ` [PATCH net-next 11/11] mlxsw: Remove Mellanox SwitchX-2 " Ido Schimmel
2021-05-17 22:30 ` [PATCH net-next 00/11] mlxsw: Various updates patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210517170401.188563-7-idosch@nvidia.com \
--to=idosch@oss.nvidia.com \
--cc=amcohen@OSS.NVIDIA.COM \
--cc=danieller@OSS.NVIDIA.COM \
--cc=davem@davemloft.net \
--cc=jiri@OSS.NVIDIA.COM \
--cc=kuba@kernel.org \
--cc=mlxsw@OSS.NVIDIA.COM \
--cc=netdev@vger.kernel.org \
--cc=petrm@OSS.NVIDIA.COM \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).