target/linux/generic/backport-4.14/402-leds-trigger-netdev-fix-handling-on-interface-rename.patch

   1 From 0ff035231edca3713c3d0839c44e64a4ac41ef38 Mon Sep 17 00:00:00 2001
   2 From: Martin Schiller <ms@dev.tdt.de>
   3 Date: Thu, 24 Oct 2019 15:09:23 +0200
   4 Subject: [PATCH] leds: trigger: netdev: fix handling on interface rename
   5
   6 The NETDEV_CHANGENAME code is not "unneeded" like it is stated in commit
   7 4cb6560514fa ("leds: trigger: netdev: fix refcnt leak on interface
   8 rename").
   9
  10 The event was accidentally misinterpreted equivalent to
  11 NETDEV_UNREGISTER, but should be equivalent to NETDEV_REGISTER.
  12
  13 This was the case in the original code from the openwrt project.
  14
  15 Otherwise, you are unable to set netdev led triggers for (non-existent)
  16 netdevices, which has to be renamed. This is the case, for example, for
  17 ppp interfaces in openwrt.
  18
  19 Fixes: 06f502f57d0d ("leds: trigger: Introduce a NETDEV trigger")
  20 Fixes: 4cb6560514fa ("leds: trigger: netdev: fix refcnt leak on interface rename")
  21 Signed-off-by: Martin Schiller <ms@dev.tdt.de>
  22 ---
  23  drivers/leds/trigger/ledtrig-netdev.c | 5 ++++-
  24  1 file changed, 4 insertions(+), 1 deletion(-)
  25
  26 --- a/drivers/leds/trigger/ledtrig-netdev.c
  27 +++ b/drivers/leds/trigger/ledtrig-netdev.c
  28 @@ -299,10 +299,12 @@ static int netdev_trig_notify(struct not
  29                                                             notifier);
  30
  31         if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE
  32 -           && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER)
  33 +           && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER
  34 +           && evt != NETDEV_CHANGENAME)
  35                 return NOTIFY_DONE;
  36
  37         if (!(dev == trigger_data->net_dev ||
  38 +             (evt == NETDEV_CHANGENAME && !strcmp(dev->name, trigger_data->device_name)) ||
  39               (evt == NETDEV_REGISTER && !strcmp(dev->name, trigger_data->device_name))))
  40                 return NOTIFY_DONE;
  41
  42 @@ -312,6 +314,7 @@ static int netdev_trig_notify(struct not
  43
  44         clear_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode);
  45         switch (evt) {
  46 +       case NETDEV_CHANGENAME:
  47         case NETDEV_REGISTER:
  48                 if (trigger_data->net_dev)
  49                         dev_put(trigger_data->net_dev);