Commit f29d24a2 authored by Sabrina Dubroca's avatar Sabrina Dubroca Committed by Jakub Kicinski
Browse files

macsec: clean up local variables in macsec_notify 



For all events, we need to loop over the list of secys, so let's move
the common variables out of the switch/case.

Signed-off-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/9b8996af518fbeb3b7d527feb15d5788495e3108.1730929545.git.sd@queasysnail.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent bd97c29f

drivers/net/macsec.c

+7 −18
Original line number Diff line number Diff line
@@ -4441,31 +4441,26 @@ static int macsec_notify(struct notifier_block *this, unsigned long event, 
			 void *ptr)

{

	struct net_device *real_dev = netdev_notifier_info_to_dev(ptr);

	struct macsec_rxh_data *rxd;

	struct macsec_dev *m, *n;

	LIST_HEAD(head);



	if (!is_macsec_master(real_dev))

		return NOTIFY_DONE;



	rxd = macsec_data_rtnl(real_dev);



	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);

	case NETDEV_CHANGE:

		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;



		rxd = macsec_data_rtnl(real_dev);

	case NETDEV_UNREGISTER:

		list_for_each_entry_safe(m, n, &rxd->secys, secys) {

			macsec_common_dellink(m->secy.netdev, &head);

		}
@@ -4475,12 +4470,7 @@ static int macsec_notify(struct notifier_block *this, unsigned long event, 


		unregister_netdevice_many(&head);

		break;

	}

	case NETDEV_CHANGEMTU: {

		struct macsec_dev *m;

		struct macsec_rxh_data *rxd;



		rxd = macsec_data_rtnl(real_dev);

	case NETDEV_CHANGEMTU:

		list_for_each_entry(m, &rxd->secys, secys) {

			struct net_device *dev = m->secy.netdev;

			unsigned int mtu = real_dev->mtu - (m->secy.icv_len +
@@ -4490,7 +4480,6 @@ static int macsec_notify(struct notifier_block *this, unsigned long event, 
				dev_set_mtu(dev, mtu);

		}

	}

	}



	return NOTIFY_OK;

}