diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2014-03-07 11:27:00 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2014-03-07 11:27:00 +0000 |
| commit | 2b43bb49dec4546cdca7e627b06e7682ae742591 (patch) | |
| tree | 0d58c3ccdefbe53983cda5399612b4727f0ee81d /target/linux/generic/patches-3.14/831-ledtrig_netdev.patch | |
| parent | 3be7023c9be4e1381699ce393638ad63565c9ac5 (diff) | |
| download | upstream-2b43bb49dec4546cdca7e627b06e7682ae742591.tar.gz upstream-2b43bb49dec4546cdca7e627b06e7682ae742591.tar.bz2 upstream-2b43bb49dec4546cdca7e627b06e7682ae742591.zip | |
add preliminary 3.14 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39789 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.14/831-ledtrig_netdev.patch')
| -rw-r--r-- | target/linux/generic/patches-3.14/831-ledtrig_netdev.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.14/831-ledtrig_netdev.patch b/target/linux/generic/patches-3.14/831-ledtrig_netdev.patch new file mode 100644 index 0000000000..6884346135 --- /dev/null +++ b/target/linux/generic/patches-3.14/831-ledtrig_netdev.patch @@ -0,0 +1,51 @@ +--- a/drivers/leds/trigger/Kconfig ++++ b/drivers/leds/trigger/Kconfig +@@ -112,4 +112,11 @@ config LEDS_TRIGGER_MORSE + tristate "LED Morse Trigger" + depends on LEDS_TRIGGERS + ++config LEDS_TRIGGER_NETDEV ++ tristate "LED Netdev Trigger" ++ depends on NET && LEDS_TRIGGERS ++ help ++ This allows LEDs to be controlled by network device activity. ++ If unsure, say Y. ++ + endif # LEDS_TRIGGERS +--- a/drivers/leds/Makefile ++++ b/drivers/leds/Makefile +@@ -61,3 +61,4 @@ obj-$(CONFIG_LEDS_DAC124S085) += leds-d + # LED Triggers + obj-$(CONFIG_LEDS_TRIGGERS) += trigger/ + obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o ++obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o +--- a/drivers/leds/ledtrig-netdev.c ++++ b/drivers/leds/ledtrig-netdev.c +@@ -22,7 +22,6 @@ + #include <linux/list.h> + #include <linux/spinlock.h> + #include <linux/device.h> +-#include <linux/sysdev.h> + #include <linux/netdevice.h> + #include <linux/timer.h> + #include <linux/ctype.h> +@@ -307,8 +306,9 @@ done: + static void netdev_trig_timer(unsigned long arg) + { + struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg; +- const struct net_device_stats *dev_stats; ++ struct rtnl_link_stats64 *dev_stats; + unsigned new_activity; ++ struct rtnl_link_stats64 temp; + + write_lock(&trigger_data->lock); + +@@ -318,7 +318,7 @@ static void netdev_trig_timer(unsigned l + goto no_restart; + } + +- dev_stats = dev_get_stats(trigger_data->net_dev); ++ dev_stats = dev_get_stats(trigger_data->net_dev, &temp); + new_activity = + ((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) + + ((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0); |