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

Commit 6debb68a authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: refine netdev event notifier 



Rework the netdev event handler, similar to what the Mellanox Spectrum
driver does, to easily welcome more events later (for example
NETDEV_PRECHANGEUPPER) and use netdev helpers (such as
netif_is_bridge_master).

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Acked-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 16bfa702

net/dsa/slave.c

+30 −24
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ static int dsa_slave_bridge_port_join(struct net_device *dev, 
	if (ds->drv->port_bridge_join)

		ret = ds->drv->port_bridge_join(ds, p->port, br);



	return ret;

	return ret == -EOPNOTSUPP ? 0 : ret;

}



static void dsa_slave_bridge_port_leave(struct net_device *dev)
@@ -1143,40 +1143,46 @@ static bool dsa_slave_dev_check(struct net_device *dev) 
	return dev->netdev_ops == &dsa_slave_netdev_ops;

}



static int dsa_slave_master_changed(struct net_device *dev)

static int dsa_slave_port_upper_event(struct net_device *dev,

				      unsigned long event, void *ptr)

{

	struct net_device *master = netdev_master_upper_dev_get(dev);

	struct dsa_slave_priv *p = netdev_priv(dev);

	struct netdev_notifier_changeupper_info *info = ptr;

	struct net_device *upper = info->upper_dev;

	int err = 0;



	if (master && master->rtnl_link_ops &&

	    !strcmp(master->rtnl_link_ops->kind, "bridge"))

		err = dsa_slave_bridge_port_join(dev, master);

	else if (dsa_port_is_bridged(p))

	switch (event) {

	case NETDEV_CHANGEUPPER:

		if (netif_is_bridge_master(upper)) {

			if (info->linking)

				err = dsa_slave_bridge_port_join(dev, upper);

			else

				dsa_slave_bridge_port_leave(dev);

		}



	return err;

		break;

	}



int dsa_slave_netdevice_event(struct notifier_block *unused,

			      unsigned long event, void *ptr)

{

	struct net_device *dev;

	int err = 0;

	return notifier_from_errno(err);

}



static int dsa_slave_port_event(struct net_device *dev, unsigned long event,

				void *ptr)

{

	switch (event) {

	case NETDEV_CHANGEUPPER:

		dev = netdev_notifier_info_to_dev(ptr);

		if (!dsa_slave_dev_check(dev))

			goto out;



		err = dsa_slave_master_changed(dev);

		if (err && err != -EOPNOTSUPP)

			netdev_warn(dev, "failed to reflect master change\n");

		return dsa_slave_port_upper_event(dev, event, ptr);

	}



		break;

	return NOTIFY_DONE;

}



out:

int dsa_slave_netdevice_event(struct notifier_block *unused,

			      unsigned long event, void *ptr)

{

	struct net_device *dev = netdev_notifier_info_to_dev(ptr);



	if (dsa_slave_dev_check(dev))

		return dsa_slave_port_event(dev, event, ptr);



	return NOTIFY_DONE;

}