diff options
author | Jonas Gorski <jogo@openwrt.org> | 2011-08-09 12:19:43 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2011-08-09 12:19:43 +0000 |
commit | cf2070bd5b394d5c3fcfae577bd623a6e8a7f0c4 (patch) | |
tree | f0d9e62c746434dde7a45ed0debd3eb94b92dc65 /target/linux/generic/patches-3.1/831-ledtrig_netdev.patch | |
parent | a5f2fd63598414246a497e08a4433a0116f2f606 (diff) | |
download | upstream-cf2070bd5b394d5c3fcfae577bd623a6e8a7f0c4.tar.gz upstream-cf2070bd5b394d5c3fcfae577bd623a6e8a7f0c4.tar.bz2 upstream-cf2070bd5b394d5c3fcfae577bd623a6e8a7f0c4.zip |
linux: generic: add support for 3.1-rc1
SVN-Revision: 27940
Diffstat (limited to 'target/linux/generic/patches-3.1/831-ledtrig_netdev.patch')
-rw-r--r-- | target/linux/generic/patches-3.1/831-ledtrig_netdev.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.1/831-ledtrig_netdev.patch b/target/linux/generic/patches-3.1/831-ledtrig_netdev.patch new file mode 100644 index 0000000000..92811ccad1 --- /dev/null +++ b/target/linux/generic/patches-3.1/831-ledtrig_netdev.patch @@ -0,0 +1,43 @@ +--- a/drivers/leds/Kconfig ++++ b/drivers/leds/Kconfig +@@ -457,4 +457,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 # NEW_LEDS +--- a/drivers/leds/Makefile ++++ b/drivers/leds/Makefile +@@ -55,3 +55,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += + obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o + obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o + 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 +@@ -307,8 +307,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 +319,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); |