Home Explore Help
Sign In
RISCI_ATOM
/
librecmc-gitorious
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 4dadd9eb6d
Branches Tags
librecmc-gitori...
/
target
/
linux
/
generic
/
patches-3.8
/
831-ledtrig_netdev.patch

831-ledtrig_netdev.patch 1.6 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051 
  1. --- a/drivers/leds/Kconfig
    2. 

  2. +++ b/drivers/leds/Kconfig
    3. 

  3. @@ -565,4 +565,11 @@ config LEDS_TRIGGER_MORSE
    4. 

  4.  	tristate "LED Morse Trigger"
    5. 

  5.  	depends on LEDS_TRIGGERS
    6. 

  6.  
    7. 

  7. +config LEDS_TRIGGER_NETDEV
    8. 

  8. +	tristate "LED Netdev Trigger"
    9. 

  9. +	depends on NET && LEDS_TRIGGERS
    10. 

  10. +	help
    11. 

  11. +	  This allows LEDs to be controlled by network device activity.
    12. 

  12. +	  If unsure, say Y.
    13. 

  13. +
    14. 

  14.  endif # NEW_LEDS
    15. 

  15. --- a/drivers/leds/Makefile
    16. 

  16. +++ b/drivers/leds/Makefile
    17. 

  17. @@ -66,3 +66,4 @@ obj-$(CONFIG_LEDS_TRIGGER_CPU)		+= ledtr
    18. 

  18.  obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
    19. 

  19.  obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT)	+= ledtrig-transient.o
    20. 

  20.  obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
    21. 

  21. +obj-$(CONFIG_LEDS_TRIGGER_NETDEV)	+= ledtrig-netdev.o
    22. 

  22. --- a/drivers/leds/ledtrig-netdev.c
    23. 

  23. +++ b/drivers/leds/ledtrig-netdev.c
    24. 

  24. @@ -22,7 +22,6 @@
    25. 

  25.  #include <linux/list.h>
    26. 

  26.  #include <linux/spinlock.h>
    27. 

  27.  #include <linux/device.h>
    28. 

  28. -#include <linux/sysdev.h>
    29. 

  29.  #include <linux/netdevice.h>
    30. 

  30.  #include <linux/timer.h>
    31. 

  31.  #include <linux/ctype.h>
    32. 

  32. @@ -294,8 +293,9 @@ done:
    33. 

  33.  static void netdev_trig_timer(unsigned long arg)
    34. 

  34.  {
    35. 

  35.  	struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
    36. 

  36. -	const struct net_device_stats *dev_stats;
    37. 

  37. +	struct rtnl_link_stats64 *dev_stats;
    38. 

  38.  	unsigned new_activity;
    39. 

  39. +	struct rtnl_link_stats64 temp;
    40. 

  40.  
    41. 

  41.  	write_lock(&trigger_data->lock);
    42. 

  42.  
    43. 

  43. @@ -305,7 +305,7 @@ static void netdev_trig_timer(unsigned l
    44. 

  44.  		goto no_restart;
    45. 

  45.  	}
    46. 

  46.  
    47. 

  47. -	dev_stats = dev_get_stats(trigger_data->net_dev);
    48. 

  48. +	dev_stats = dev_get_stats(trigger_data->net_dev, &temp);
    49. 

  49.  	new_activity =
    50. 

  50.  		((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) +
    51. 

  51.  		((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0);
    52.