mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-25 07:48:58 +02:00
linux/generic: update 2.6.36 kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22834 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
0c97393cfb
commit
b27a17878e
@ -0,0 +1,22 @@
|
|||||||
|
--- a/fs/mini_fo/super.c
|
||||||
|
+++ b/fs/mini_fo/super.c
|
||||||
|
@@ -296,11 +296,19 @@ struct super_operations mini_fo_sops =
|
||||||
|
put_inode: mini_fo_put_inode,
|
||||||
|
#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
|
||||||
|
#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
|
||||||
|
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,35)
|
||||||
|
+ evict_inode: mini_fo_delete_inode,
|
||||||
|
+#else
|
||||||
|
delete_inode: mini_fo_delete_inode,
|
||||||
|
+#endif
|
||||||
|
#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
|
||||||
|
put_super: mini_fo_put_super,
|
||||||
|
statfs: mini_fo_statfs,
|
||||||
|
remount_fs: mini_fo_remount_fs,
|
||||||
|
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,35)
|
||||||
|
+ evict_inode: mini_fo_clear_inode,
|
||||||
|
+#else
|
||||||
|
clear_inode: mini_fo_clear_inode,
|
||||||
|
+#endif
|
||||||
|
umount_begin: mini_fo_umount_begin,
|
||||||
|
};
|
@ -19,3 +19,23 @@
|
|||||||
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
|
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o
|
obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o
|
||||||
+obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o
|
+obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o
|
||||||
|
|
||||||
|
--- a/drivers/leds/ledtrig-netdev.c
|
||||||
|
+++ b/drivers/leds/ledtrig-netdev.c
|
||||||
|
@@ -309,6 +309,7 @@ static void netdev_trig_timer(unsigned l
|
||||||
|
struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
|
||||||
|
const struct net_device_stats *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);
|
||||||
|
Loading…
Reference in New Issue
Block a user