Commit a8150c9f authored by Ioana Ciornei's avatar Ioana Ciornei Committed by David S. Miller
Browse files

dpaa2-switch: reorganize the [pre]changeupper events 



Create separate functions, dpaa2_switch_port_prechangeupper and
dpaa2_switch_port_changeupper, to be called directly when a DPSW port
changes its upper device.

This way we are not open-coding everything in the main event callback
and we can easily extent, for example, with bond offload.

Signed-off-by: default avatarIoana Ciornei <ioana.ciornei@nxp.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f6da2764

drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c

+52 −25
Original line number Diff line number Diff line
@@ -2173,51 +2173,78 @@ dpaa2_switch_prechangeupper_sanity_checks(struct net_device *netdev, 
	return 0;

}



static int dpaa2_switch_port_netdevice_event(struct notifier_block *nb,

					     unsigned long event, void *ptr)

static int dpaa2_switch_port_prechangeupper(struct net_device *netdev,

					    struct netdev_notifier_changeupper_info *info)

{

	struct net_device *netdev = netdev_notifier_info_to_dev(ptr);

	struct netdev_notifier_changeupper_info *info = ptr;

	struct netlink_ext_ack *extack;

	struct net_device *upper_dev;

	int err = 0;

	int err;



	if (!dpaa2_switch_port_dev_check(netdev))

		return NOTIFY_DONE;

		return 0;



	extack = netdev_notifier_info_to_extack(&info->info);



	switch (event) {

	case NETDEV_PRECHANGEUPPER:

	upper_dev = info->upper_dev;

		if (!netif_is_bridge_master(upper_dev))

			break;



	if (netif_is_bridge_master(upper_dev)) {

		err = dpaa2_switch_prechangeupper_sanity_checks(netdev,

								upper_dev,

								extack);

		if (err)

			goto out;

			return err;



		if (!info->linking)

			dpaa2_switch_port_pre_bridge_leave(netdev);

	}



	return 0;

}



static int dpaa2_switch_port_changeupper(struct net_device *netdev,

					 struct netdev_notifier_changeupper_info *info)

{

	struct netlink_ext_ack *extack;

	struct net_device *upper_dev;



	if (!dpaa2_switch_port_dev_check(netdev))

		return 0;



	extack = netdev_notifier_info_to_extack(&info->info);



		break;

	case NETDEV_CHANGEUPPER:

	upper_dev = info->upper_dev;

	if (netif_is_bridge_master(upper_dev)) {

		if (info->linking)

				err = dpaa2_switch_port_bridge_join(netdev,

			return dpaa2_switch_port_bridge_join(netdev,

							     upper_dev,

							     extack);

		else

				err = dpaa2_switch_port_bridge_leave(netdev);

			return dpaa2_switch_port_bridge_leave(netdev);

	}

		break;



	return 0;

}



out:

static int dpaa2_switch_port_netdevice_event(struct notifier_block *nb,

					     unsigned long event, void *ptr)

{

	struct net_device *netdev = netdev_notifier_info_to_dev(ptr);

	int err = 0;



	switch (event) {

	case NETDEV_PRECHANGEUPPER:

		err = dpaa2_switch_port_prechangeupper(netdev, ptr);

		if (err)

			return notifier_from_errno(err);



		break;

	case NETDEV_CHANGEUPPER:

		err = dpaa2_switch_port_changeupper(netdev, ptr);

		if (err)

			return notifier_from_errno(err);



		break;

	}



	return NOTIFY_DONE;

}



struct ethsw_switchdev_event_work {