817-v6.5-01-leds-trigger-netdev-Recheck-NETDEV_LED_MODE_LINKUP-o.patch 1.3 KB

1234567891011121314151617181920212223242526272829303132333435
  1. From cee4bd16c3195a701be683f7da9e88c6e11acb73 Mon Sep 17 00:00:00 2001
  2. From: Christian Marangi <[email protected]>
  3. Date: Wed, 19 Apr 2023 23:07:39 +0200
  4. Subject: [PATCH 1/5] leds: trigger: netdev: Recheck NETDEV_LED_MODE_LINKUP on
  5. dev rename
  6. Dev can be renamed also while up for supported device. We currently
  7. wrongly clear the NETDEV_LED_MODE_LINKUP flag on NETDEV_CHANGENAME
  8. event.
  9. Fix this by rechecking if the carrier is ok on NETDEV_CHANGENAME and
  10. correctly set the NETDEV_LED_MODE_LINKUP bit.
  11. Fixes: 5f820ed52371 ("leds: trigger: netdev: fix handling on interface rename")
  12. Cc: [email protected] # v5.5+
  13. Signed-off-by: Christian Marangi <[email protected]>
  14. Reviewed-by: Andrew Lunn <[email protected]>
  15. Signed-off-by: Lee Jones <[email protected]>
  16. Link: https://lore.kernel.org/r/[email protected]
  17. ---
  18. drivers/leds/trigger/ledtrig-netdev.c | 3 +++
  19. 1 file changed, 3 insertions(+)
  20. --- a/drivers/leds/trigger/ledtrig-netdev.c
  21. +++ b/drivers/leds/trigger/ledtrig-netdev.c
  22. @@ -318,6 +318,9 @@ static int netdev_trig_notify(struct not
  23. clear_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode);
  24. switch (evt) {
  25. case NETDEV_CHANGENAME:
  26. + if (netif_carrier_ok(dev))
  27. + set_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode);
  28. + fallthrough;
  29. case NETDEV_REGISTER:
  30. if (trigger_data->net_dev)
  31. dev_put(trigger_data->net_dev);