hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ledtrig-netdev: don't cancel work on events for different interfaces 

This fixes logic bug(in function netdev_trig_notify) introduced in
0b2991a8ed commit.
Events triggered by different interfaces were stopping work queue so it
wasn't working for tx/rx mode.

Signed-off-by: Sergey Sergeev <adron@yapic.net>
owl
Sergey Sergeev 2017-01-29 19:01:40 +03:00 committed by Felix Fietkau
parent 1533f1db92
commit 74ea99b01d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/generic/files/drivers/leds/ledtrig-netdev.c
View File

@ -267,13 +267,13 @@ static int netdev_trig_notify(struct notifier_block *nb,
if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER && evt != NETDEV_CHANGENAME) if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER && evt != NETDEV_CHANGENAME)
return NOTIFY_DONE; return NOTIFY_DONE;
if (strcmp(dev->name, trigger_data->device_name))
return NOTIFY_DONE;
cancel_delayed_work_sync(&trigger_data->work); cancel_delayed_work_sync(&trigger_data->work);
spin_lock_bh(&trigger_data->lock); spin_lock_bh(&trigger_data->lock);
if (strcmp(dev->name, trigger_data->device_name))
goto done;
if (evt == NETDEV_REGISTER || evt == NETDEV_CHANGENAME) { if (evt == NETDEV_REGISTER || evt == NETDEV_CHANGENAME) {
if (trigger_data->net_dev != NULL) if (trigger_data->net_dev != NULL)
dev_put(trigger_data->net_dev); dev_put(trigger_data->net_dev);