From: John Crispin Date: Fri, 1 Jan 2016 21:19:41 +0000 (+0000) Subject: ledtrig-netdev: add support for renamed devices X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=df165974c32a6ad2499b815d9d9f72b250d622f8;p=openwrt%2Fstaging%2Fkaloz.git ledtrig-netdev: add support for renamed devices The ppp0 interface is renamed after the connection is established. Due to a missing NETDEV_REGISTER event, the ledtrig-netdev isn't aware of the renamed interface and literally ignores the device (no tx/rx indication, led isn't switched off with 'ifdown wan'). Signed-off-by: Mathias Kresin SVN-Revision: 48048 --- diff --git a/target/linux/generic/files/drivers/leds/ledtrig-netdev.c b/target/linux/generic/files/drivers/leds/ledtrig-netdev.c index 4e0fd667b0..5d0f95499b 100644 --- a/target/linux/generic/files/drivers/leds/ledtrig-netdev.c +++ b/target/linux/generic/files/drivers/leds/ledtrig-netdev.c @@ -265,7 +265,7 @@ static int netdev_trig_notify(struct notifier_block *nb, struct net_device *dev = netdev_notifier_info_to_dev((struct netdev_notifier_info *) dv); struct led_netdev_data *trigger_data = container_of(nb, struct led_netdev_data, notifier); - if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER) + if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER && evt != NETDEV_CHANGENAME) return NOTIFY_DONE; spin_lock_bh(&trigger_data->lock); @@ -274,9 +274,10 @@ static int netdev_trig_notify(struct notifier_block *nb, if (strcmp(dev->name, trigger_data->device_name)) goto done; - if (evt == NETDEV_REGISTER) { + if (evt == NETDEV_REGISTER || evt == NETDEV_CHANGENAME) { if (trigger_data->net_dev != NULL) dev_put(trigger_data->net_dev); + dev_hold(dev); trigger_data->net_dev = dev; trigger_data->link_up = 0;