leds: trigger: netdev: Recheck NETDEV_LED_MODE_LINKUP on dev rename

Dev can be renamed also while up for supported device. We currently
wrongly clear the NETDEV_LED_MODE_LINKUP flag on NETDEV_CHANGENAME
event.

Fix this by rechecking if the carrier is ok on NETDEV_CHANGENAME and
correctly set the NETDEV_LED_MODE_LINKUP bit.

Fixes: 5f820ed52371 ("leds: trigger: netdev: fix handling on interface rename")
Cc: stable@vger.kernel.org # v5.5+
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Lee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/20230419210743.3594-2-ansuelsmth@gmail.com

diff --git a/drivers/leds/trigger/ledtrig-netdev.c b/drivers/leds/trigger/ledtrig-netdev.c
index d5e774d8302158179110d40d5b6aa10ddc68f804..f4d670ec30bcb4126ea4872098fafefffa1bd3f7 100644 (file)
--- a/drivers/leds/trigger/ledtrig-netdev.c
+++ b/drivers/leds/trigger/ledtrig-netdev.c
@@ -318,6 +318,9 @@ static int netdev_trig_notify(struct notifier_block *nb,
        clear_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode);
        switch (evt) {
        case NETDEV_CHANGENAME:
+               if (netif_carrier_ok(dev))
+                       set_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode);
+               fallthrough;
        case NETDEV_REGISTER:
                if (trigger_data->net_dev)
                        dev_put(trigger_data->net_dev);