Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37286d25 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum: Remove unused function argument 



Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0355b59f

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

+3 −6
Original line number Original line Diff line number Diff line
@@ -2872,7 +2872,6 @@ static int mlxsw_sp_port_lag_join(struct mlxsw_sp_port *mlxsw_sp_port, 
}

}





static void mlxsw_sp_vport_bridge_leave(struct mlxsw_sp_port *mlxsw_sp_vport,

static void mlxsw_sp_vport_bridge_leave(struct mlxsw_sp_port *mlxsw_sp_vport,

					struct net_device *br_dev,

					bool flush_fdb);

					bool flush_fdb);





static void mlxsw_sp_port_lag_leave(struct mlxsw_sp_port *mlxsw_sp_port,

static void mlxsw_sp_port_lag_leave(struct mlxsw_sp_port *mlxsw_sp_port,
@@ -2903,7 +2902,7 @@ static void mlxsw_sp_port_lag_leave(struct mlxsw_sp_port *mlxsw_sp_port, 
			continue;

			continue;





		br_dev = mlxsw_sp_vport_br_get(mlxsw_sp_vport);

		br_dev = mlxsw_sp_vport_br_get(mlxsw_sp_vport);

		mlxsw_sp_vport_bridge_leave(mlxsw_sp_vport, br_dev, false);

		mlxsw_sp_vport_bridge_leave(mlxsw_sp_vport, false);

	}

	}





	if (mlxsw_sp_port->bridged) {

	if (mlxsw_sp_port->bridged) {
@@ -2995,7 +2994,7 @@ static void mlxsw_sp_port_vlan_unlink(struct mlxsw_sp_port *mlxsw_sp_port, 
		struct net_device *br_dev;

		struct net_device *br_dev;





		br_dev = mlxsw_sp_vport_br_get(mlxsw_sp_vport);

		br_dev = mlxsw_sp_vport_br_get(mlxsw_sp_vport);

		mlxsw_sp_vport_bridge_leave(mlxsw_sp_vport, br_dev, true);

		mlxsw_sp_vport_bridge_leave(mlxsw_sp_vport, true);

	}

	}





	mlxsw_sp_vport->dev = mlxsw_sp_port->dev;

	mlxsw_sp_vport->dev = mlxsw_sp_port->dev;
@@ -3290,7 +3289,6 @@ static int mlxsw_sp_vport_bridge_join(struct mlxsw_sp_port *mlxsw_sp_vport, 
}

}





static void mlxsw_sp_vport_bridge_leave(struct mlxsw_sp_port *mlxsw_sp_vport,

static void mlxsw_sp_vport_bridge_leave(struct mlxsw_sp_port *mlxsw_sp_vport,

					struct net_device *br_dev,

					bool flush_fdb)

					bool flush_fdb)

{

{

	u16 vid = mlxsw_sp_vport_vid_get(mlxsw_sp_vport);

	u16 vid = mlxsw_sp_vport_vid_get(mlxsw_sp_vport);
@@ -3369,8 +3367,7 @@ static int mlxsw_sp_netdevice_vport_event(struct net_device *dev, 
			 */

			 */

			if (!mlxsw_sp_vport)

			if (!mlxsw_sp_vport)

				return 0;

				return 0;

			mlxsw_sp_vport_bridge_leave(mlxsw_sp_vport, upper_dev,

			mlxsw_sp_vport_bridge_leave(mlxsw_sp_vport, true);

						    true);

		}

		}

	}

	}