diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2016-01-02 22:15:31 +0000 |
---|---|---|
committer | Rafał Miłecki <zajec5@gmail.com> | 2016-01-02 22:15:31 +0000 |
commit | 14b19c7d407793b4d40f459dc366e3471a5c007c (patch) | |
tree | 7ab28f794789d24d73bc8a9db37a73bdff8790f2 | |
parent | c72f3c757450e2d5ec8a9059ca62419376fed2a2 (diff) | |
download | upstream-14b19c7d407793b4d40f459dc366e3471a5c007c.tar.gz upstream-14b19c7d407793b4d40f459dc366e3471a5c007c.tar.bz2 upstream-14b19c7d407793b4d40f459dc366e3471a5c007c.zip |
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 <openwrt@kresin.me>
Backport of r48048
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48073 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r-- | target/linux/generic/files/drivers/leds/ledtrig-netdev.c | 5 |
1 files changed, 3 insertions, 2 deletions
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; |