Skip to content

Commit 5f820ed

Browse files
sch-mpavelmachek
authored andcommitted
leds: trigger: netdev: fix handling on interface rename
The NETDEV_CHANGENAME code is not "unneeded" like it is stated in commit 4cb6560 ("leds: trigger: netdev: fix refcnt leak on interface rename"). The event was accidentally misinterpreted equivalent to NETDEV_UNREGISTER, but should be equivalent to NETDEV_REGISTER. This was the case in the original code from the openwrt project. Otherwise, you are unable to set netdev led triggers for (non-existent) netdevices, which has to be renamed. This is the case, for example, for ppp interfaces in openwrt. Fixes: 06f502f ("leds: trigger: Introduce a NETDEV trigger") Fixes: 4cb6560 ("leds: trigger: netdev: fix refcnt leak on interface rename") Signed-off-by: Martin Schiller <[email protected]> Signed-off-by: Pavel Machek <[email protected]>
1 parent fc7b502 commit 5f820ed

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/leds/trigger/ledtrig-netdev.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,10 +302,12 @@ static int netdev_trig_notify(struct notifier_block *nb,
302302
container_of(nb, struct led_netdev_data, notifier);
303303

304304
if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE
305-
&& evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER)
305+
&& evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER
306+
&& evt != NETDEV_CHANGENAME)
306307
return NOTIFY_DONE;
307308

308309
if (!(dev == trigger_data->net_dev ||
310+
(evt == NETDEV_CHANGENAME && !strcmp(dev->name, trigger_data->device_name)) ||
309311
(evt == NETDEV_REGISTER && !strcmp(dev->name, trigger_data->device_name))))
310312
return NOTIFY_DONE;
311313

@@ -315,6 +317,7 @@ static int netdev_trig_notify(struct notifier_block *nb,
315317

316318
clear_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode);
317319
switch (evt) {
320+
case NETDEV_CHANGENAME:
318321
case NETDEV_REGISTER:
319322
if (trigger_data->net_dev)
320323
dev_put(trigger_data->net_dev);

0 commit comments

Comments
 (0)