Commit e6ac0758 authored Oct 28, 2018 by Sabrina Dubroca Committed by David S. Miller Oct 28, 2018

macsec: update operstate when lower device changes

Like all other virtual devices (macvlan, vlan), the operstate of a
macsec device should match the state of its lower device. This is done
by calling netif_stacked_transfer_operstate from its netdevice notifier.

We also need to call netif_stacked_transfer_operstate when a new macsec
device is created, so that its operstate is set properly. This is only
relevant when we try to bring the device up directly when we create it.

Radu Rendec proposed a similar patch, inspired from the 802.1q driver,
that included changing the administrative state of the macsec device,
instead of just the operstate. This version is similar to what the
macvlan driver does, and updates only the operstate.

Fixes: c09440f7 ("macsec: introduce IEEE 802.1AE driver")
Reported-by: Radu Rendec <radu.rendec@gmail.com>
Reported-by: Patrick Talbert <ptalbert@redhat.com>
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 38b4f18d

drivers/net/macsec.c

+17 −0

Original line number	Diff line number	Diff line
		@@ -3306,6 +3306,9 @@ static int macsec_newlink(struct net net, struct net_device dev,
		if (err < 0)
		goto del_dev;

		netif_stacked_transfer_operstate(real_dev, dev);
		linkwatch_fire_event(dev);

		macsec_generation++;

		return 0;
		@@ -3490,6 +3493,20 @@ static int macsec_notify(struct notifier_block *this, unsigned long event,
		return NOTIFY_DONE;

		switch (event) {
		case NETDEV_DOWN:
		case NETDEV_UP:
		case NETDEV_CHANGE: {
		struct macsec_dev m, n;
		struct macsec_rxh_data *rxd;

		rxd = macsec_data_rtnl(real_dev);
		list_for_each_entry_safe(m, n, &rxd->secys, secys) {
		struct net_device *dev = m->secy.netdev;

		netif_stacked_transfer_operstate(real_dev, dev);
		}
		break;
		}
		case NETDEV_UNREGISTER: {
		struct macsec_dev m, n;
		struct macsec_rxh_data *rxd;

Admin message