mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
Merge branch 'mlxsw-fixes'
Jiri Pirko says: ==================== mlxsw fixes Just a couple of fixes from Ido. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
9ffa8a1863
2 changed files with 9 additions and 1 deletions
|
@ -49,7 +49,7 @@
|
|||
#define MLXSW_PORT_MID 0xd000
|
||||
|
||||
#define MLXSW_PORT_MAX_PHY_PORTS 0x40
|
||||
#define MLXSW_PORT_MAX_PORTS MLXSW_PORT_MAX_PHY_PORTS
|
||||
#define MLXSW_PORT_MAX_PORTS (MLXSW_PORT_MAX_PHY_PORTS + 1)
|
||||
|
||||
#define MLXSW_PORT_DEVID_BITS_OFFSET 10
|
||||
#define MLXSW_PORT_PHY_BITS_OFFSET 4
|
||||
|
|
|
@ -2746,6 +2746,13 @@ static int mlxsw_sp_vport_bridge_leave(struct mlxsw_sp_port *mlxsw_sp_vport,
|
|||
goto err_vport_flood_set;
|
||||
}
|
||||
|
||||
err = mlxsw_sp_port_stp_state_set(mlxsw_sp_vport, vid,
|
||||
MLXSW_REG_SPMS_STATE_FORWARDING);
|
||||
if (err) {
|
||||
netdev_err(dev, "Failed to set STP state\n");
|
||||
goto err_port_stp_state_set;
|
||||
}
|
||||
|
||||
if (flush_fdb && mlxsw_sp_vport_fdb_flush(mlxsw_sp_vport))
|
||||
netdev_err(dev, "Failed to flush FDB\n");
|
||||
|
||||
|
@ -2763,6 +2770,7 @@ static int mlxsw_sp_vport_bridge_leave(struct mlxsw_sp_port *mlxsw_sp_vport,
|
|||
|
||||
return 0;
|
||||
|
||||
err_port_stp_state_set:
|
||||
err_vport_flood_set:
|
||||
err_port_vid_learning_set:
|
||||
err_port_vid_to_fid_validate:
|
||||
|
|
Loading…
Reference in a new issue