Commit 721717fa authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

mlxsw: spectrum: Split a helper out of mlxsw_sp_netdevice_event() 



Move the meat of mlxsw_sp_netdevice_event() to a separate function that
does just the validation. This separate helper will be possible to call
later for recursive ascent when validating attachment of a front panel port
to a bridge with uppers.

Signed-off-by: default avatarPetr Machata <petrm@nvidia.com>
Reviewed-by: default avatarDanielle Ratson <danieller@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 96c3e45c

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

+15 −5
Original line number Diff line number Diff line
@@ -5146,21 +5146,18 @@ static int mlxsw_sp_netdevice_vxlan_event(struct mlxsw_sp *mlxsw_sp, 
	return 0;

}



static int mlxsw_sp_netdevice_event(struct notifier_block *nb,

static int __mlxsw_sp_netdevice_event(struct mlxsw_sp *mlxsw_sp,

				      unsigned long event, void *ptr)

{

	struct net_device *dev = netdev_notifier_info_to_dev(ptr);

	struct mlxsw_sp_span_entry *span_entry;

	struct mlxsw_sp *mlxsw_sp;

	int err = 0;



	mlxsw_sp = container_of(nb, struct mlxsw_sp, netdevice_nb);

	if (event == NETDEV_UNREGISTER) {

		span_entry = mlxsw_sp_span_entry_find_by_port(mlxsw_sp, dev);

		if (span_entry)

			mlxsw_sp_span_entry_invalidate(mlxsw_sp, span_entry);

	}

	mlxsw_sp_span_respin(mlxsw_sp);



	if (netif_is_vxlan(dev))

		err = mlxsw_sp_netdevice_vxlan_event(mlxsw_sp, dev, event, ptr);
@@ -5175,6 +5172,19 @@ static int mlxsw_sp_netdevice_event(struct notifier_block *nb, 
	else if (netif_is_macvlan(dev))

		err = mlxsw_sp_netdevice_macvlan_event(dev, event, ptr);



	return err;

}



static int mlxsw_sp_netdevice_event(struct notifier_block *nb,

				    unsigned long event, void *ptr)

{

	struct mlxsw_sp *mlxsw_sp;

	int err;



	mlxsw_sp = container_of(nb, struct mlxsw_sp, netdevice_nb);

	mlxsw_sp_span_respin(mlxsw_sp);

	err = __mlxsw_sp_netdevice_event(mlxsw_sp, event, ptr);



	return notifier_from_errno(err);

}