831-ledtrig_netdev.patch 1.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243
  1. --- a/drivers/leds/Kconfig
  2. +++ b/drivers/leds/Kconfig
  3. @@ -443,4 +443,11 @@ config LEDS_TRIGGER_MORSE
  4. tristate "LED Morse Trigger"
  5. depends on LEDS_TRIGGERS
  6. +config LEDS_TRIGGER_NETDEV
  7. + tristate "LED Netdev Trigger"
  8. + depends on NET && LEDS_TRIGGERS
  9. + help
  10. + This allows LEDs to be controlled by network device activity.
  11. + If unsure, say Y.
  12. +
  13. endif # NEW_LEDS
  14. --- a/drivers/leds/Makefile
  15. +++ b/drivers/leds/Makefile
  16. @@ -53,3 +53,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) +=
  17. obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o
  18. obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
  19. obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o
  20. +obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o
  21. --- a/drivers/leds/ledtrig-netdev.c
  22. +++ b/drivers/leds/ledtrig-netdev.c
  23. @@ -307,8 +307,9 @@ done:
  24. static void netdev_trig_timer(unsigned long arg)
  25. {
  26. struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
  27. - const struct net_device_stats *dev_stats;
  28. + struct rtnl_link_stats64 *dev_stats;
  29. unsigned new_activity;
  30. + struct rtnl_link_stats64 temp;
  31. write_lock(&trigger_data->lock);
  32. @@ -318,7 +319,7 @@ static void netdev_trig_timer(unsigned l
  33. goto no_restart;
  34. }
  35. - dev_stats = dev_get_stats(trigger_data->net_dev);
  36. + dev_stats = dev_get_stats(trigger_data->net_dev, &temp);
  37. new_activity =
  38. ((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) +
  39. ((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0);