linux/generic: update 2.6.36 kernel patches

SVN-Revision: 22834

diff --git a/target/linux/generic/patches-2.6.36/217-mini_fo_2.6.36_fixes.patch b/target/linux/generic/patches-2.6.36/217-mini_fo_2.6.36_fixes.patch
new file mode 100644 (file)
index 0000000..cae9547
--- /dev/null
+++ b/target/linux/generic/patches-2.6.36/217-mini_fo_2.6.36_fixes.patch
@@ -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,
+ };

diff --git a/target/linux/generic/patches-2.6.36/402-ledtrig_netdev.patch b/target/linux/generic/patches-2.6.36/402-ledtrig_netdev.patch
index 16e5756cf16285cf23965e5ff53a17650ab4de50..57f071ba7bdeb5067edaf8df9faffaebe2a85398 100644 (file)
--- a/target/linux/generic/patches-2.6.36/402-ledtrig_netdev.patch
+++ b/target/linux/generic/patches-2.6.36/402-ledtrig_netdev.patch
@@ -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);