KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

linux/generic: update 2.6.36 kernel patches

Browse source 
SVN-Revision: 22834
This commit is contained in:
Alexandros C. Couloumbis 2010-08-29 18:33:06 +00:00
parent cf445bb48f
commit 67fd8d1fdc
2 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
target/linux/generic/patches-2.6.36/217-mini_fo_2.6.36_fixes.patch Normal file
View file

@ -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,
};

20
target/linux/generic/patches-2.6.36/402-ledtrig_netdev.patch
View file

@ -19,3 +19,23 @@
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
@@ -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);