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: Sabrina Dubroca <sd@queasysnail.net>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/9b8996af518fbeb3b7d527feb15d5788495e3108.1730929545.git.sd@queasysnail.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index e3579bfd3bdcd59b6deba5b7653ab27abc2f06a4..351154dd92a620fc14382be7c8776ec86cf054da 100644 (file)
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -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;
 }