diff mbox series

[net] mlxsw: spectrum_fid: Fix incorrect local port type

Message ID eace1f9d96545ab8a2775db857cb7e291a9b166b.1679398549.git.petrm@nvidia.com (mailing list archive)
State Accepted
Commit bb765a743377d46d8da8e7f7e5128022504741b9
Delegated to: Netdev Maintainers
Headers show
Series [net] mlxsw: spectrum_fid: Fix incorrect local port type | expand

Checks

Context Check Description
netdev/series_format success Single patches do not need cover letters
netdev/tree_selection success Clearly marked for net
netdev/fixes_present success Fixes tag present in non-next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 18 this patch: 18
netdev/cc_maintainers success CCed 8 of 8 maintainers
netdev/build_clang success Errors and warnings before: 18 this patch: 18
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 18 this patch: 18
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 16 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Petr Machata March 21, 2023, 11:42 a.m. UTC
From: Ido Schimmel <idosch@nvidia.com>

Local port is a 10-bit number, but it was mistakenly stored in a u8,
resulting in firmware errors when using a netdev corresponding to a
local port higher than 255.

Fix by storing the local port in u16, as is done in the rest of the
code.

Fixes: bf73904f5fba ("mlxsw: Add support for 802.1Q FID family")
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: Danielle Ratson <danieller@nvidia.com>
Signed-off-by: Petr Machata <petrm@nvidia.com>
---
 drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Simon Horman March 21, 2023, 4:43 p.m. UTC | #1
On Tue, Mar 21, 2023 at 12:42:00PM +0100, Petr Machata wrote:
> From: Ido Schimmel <idosch@nvidia.com>
> 
> Local port is a 10-bit number, but it was mistakenly stored in a u8,
> resulting in firmware errors when using a netdev corresponding to a
> local port higher than 255.
> 
> Fix by storing the local port in u16, as is done in the rest of the
> code.
> 
> Fixes: bf73904f5fba ("mlxsw: Add support for 802.1Q FID family")
> Signed-off-by: Ido Schimmel <idosch@nvidia.com>
> Reviewed-by: Danielle Ratson <danieller@nvidia.com>
> Signed-off-by: Petr Machata <petrm@nvidia.com>

Reviewed-by: Simon Horman <simon.horman@corigine.com>
patchwork-bot+netdevbpf@kernel.org March 22, 2023, 3 p.m. UTC | #2
Hello:

This patch was applied to netdev/net.git (main)
by Paolo Abeni <pabeni@redhat.com>:

On Tue, 21 Mar 2023 12:42:00 +0100 you wrote:
> From: Ido Schimmel <idosch@nvidia.com>
> 
> Local port is a 10-bit number, but it was mistakenly stored in a u8,
> resulting in firmware errors when using a netdev corresponding to a
> local port higher than 255.
> 
> Fix by storing the local port in u16, as is done in the rest of the
> code.
> 
> [...]

Here is the summary with links:
  - [net] mlxsw: spectrum_fid: Fix incorrect local port type
    https://git.kernel.org/netdev/net/c/bb765a743377

You are awesome, thank you!
diff mbox series

Patch

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c
index 045a24cacfa5..b6ee2d658b0c 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c
@@ -1354,7 +1354,7 @@  static int mlxsw_sp_fid_8021q_port_vid_map(struct mlxsw_sp_fid *fid,
 					   u16 vid)
 {
 	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
-	u8 local_port = mlxsw_sp_port->local_port;
+	u16 local_port = mlxsw_sp_port->local_port;
 	int err;
 
 	/* In case there are no {Port, VID} => FID mappings on the port,
@@ -1391,7 +1391,7 @@  mlxsw_sp_fid_8021q_port_vid_unmap(struct mlxsw_sp_fid *fid,
 				  struct mlxsw_sp_port *mlxsw_sp_port, u16 vid)
 {
 	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
-	u8 local_port = mlxsw_sp_port->local_port;
+	u16 local_port = mlxsw_sp_port->local_port;
 
 	mlxsw_sp_fid_port_vid_list_del(fid, mlxsw_sp_port->local_port, vid);
 	mlxsw_sp_fid_evid_map(fid, local_port, vid, false);