- fixes for 2.6.37

Changed files:
    kernel-inittmpfs.patch -> 1.7
    kernel-pom-ng-IPV4OPTSSTRIP.patch -> 1.3
    kernel-wrr.patch -> 1.9

diff --git a/kernel-inittmpfs.patch b/kernel-inittmpfs.patch
index 5f7d15c971d817c968ae5f87200cace55b6040b0..7a46cf67e239940c9ead8f3b2a5bebc7e17c447b 100644 (file)
--- a/kernel-inittmpfs.patch
+++ b/kernel-inittmpfs.patch
@@ -30,21 +30,31 @@ diff -ruw linux-2.6.30.orig/fs/Kconfig linux-2.6.30/fs/Kconfig
 diff -ruw linux-2.6.30.orig/fs/ramfs/inode.c linux-2.6.30/fs/ramfs/inode.c
 --- linux-2.6.30.orig/fs/ramfs/inode.c 2009-02-12 17:51:15.000000000 +0000
 +++ linux-2.6.30/fs/ramfs/inode.c      2009-02-13 11:30:30.000000000 +0000
-@@ -255,6 +255,13 @@
+@@ -255,17 +255,18 @@
        return err;
  }
  
++
+ struct dentry *ramfs_mount(struct file_system_type *fs_type,
+       int flags, const char *dev_name, void *data)
+ {
+       return mount_nodev(fs_type, flags, data, ramfs_fill_super);
+ }
+ 
+-static struct dentry *rootfs_mount(struct file_system_type *fs_type,
+-      int flags, const char *dev_name, void *data)
+-{
+-      return mount_nodev(fs_type, flags|MS_NOUSER, data, ramfs_fill_super);
+-}
 +static struct file_system_type ramfs_fs_type = {
 +      .name = "ramfs",
-+      .mount ramfs_mount,
++      .mount = ramfs_mount,
 +      .kill_sb = kill_litter_super,
 +};
-+
-+#ifndef CONFIG_TMPFS_ROOT
- struct dentry *ramfs_mount(struct file_system_type *fs_type,
-       int flags, const char *dev_name, void *data)
+ 
+ static void ramfs_kill_sb(struct super_block *sb)
  {
-@@ -273,30 +280,12 @@
+@@ -273,30 +274,19 @@
        kill_litter_super(sb);
  }
  
@@ -53,6 +63,13 @@ diff -ruw linux-2.6.30.orig/fs/ramfs/inode.c linux-2.6.30/fs/ramfs/inode.c
 -      .mount          = ramfs_mount,
 -      .kill_sb        = ramfs_kill_sb,
 -};
++#ifndef CONFIG_TMPFS_ROOT
++static struct dentry *rootfs_mount(struct file_system_type *fs_type,
++      int flags, const char *dev_name, void *data)
++{
++      return mount_nodev(fs_type, flags|MS_NOUSER, data, ramfs_fill_super);
++}
++
  static struct file_system_type rootfs_fs_type = {
        .name           = "rootfs",
        .mount          = rootfs_mount,
@@ -75,7 +92,7 @@ diff -ruw linux-2.6.30.orig/fs/ramfs/inode.c linux-2.6.30/fs/ramfs/inode.c
  int __init init_rootfs(void)
  {
        int err;
-@@ -316,5 +305,19 @@
+@@ -311,5 +301,19 @@
  
        return err;
  }
@@ -83,12 +100,12 @@ diff -ruw linux-2.6.30.orig/fs/ramfs/inode.c linux-2.6.30/fs/ramfs/inode.c
 +
 +static int __init init_ramfs_fs(void)
 +{
-+ return register_filesystem(&ramfs_fs_type);
++      return register_filesystem(&ramfs_fs_type);
 +}
 +
 +static void __exit exit_ramfs_fs(void)
 +{
-+ unregister_filesystem(&ramfs_fs_type);
++      unregister_filesystem(&ramfs_fs_type);
 +}
 +
 +module_init(init_ramfs_fs)

diff --git a/kernel-pom-ng-IPV4OPTSSTRIP.patch b/kernel-pom-ng-IPV4OPTSSTRIP.patch
index 1c72f3d038984337f818b015ca46fc28083f0254..98e9ffbcd12e2749bda877fd6671ce87d25a868e 100644 (file)
--- a/kernel-pom-ng-IPV4OPTSSTRIP.patch
+++ b/kernel-pom-ng-IPV4OPTSSTRIP.patch
@@ -72,7 +72,7 @@ diff -NurpP --minimal linux-2.6.21.b/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c linu
 +
 +      /* if no options in packet then nothing to clear. */
 +      if (iph->ihl * 4 == sizeof(struct iphdr))
-+              return IPT_CONTINUE;
++              return XT_CONTINUE;
 +
 +      /* else clear all options */
 +      memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
@@ -80,7 +80,7 @@ diff -NurpP --minimal linux-2.6.21.b/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c linu
 +      opt = &(IPCB(skb)->opt);
 +      opt->optlen = l;
 +
-+        return IPT_CONTINUE;
++        return XT_CONTINUE;
 +}
 +
 +static bool
@@ -98,7 +98,7 @@ diff -NurpP --minimal linux-2.6.21.b/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c linu
 +      return 1;
 +}
 +
-+static struct ipt_target ipt_ipv4optsstrip_reg = { 
++static struct xt_target ipt_ipv4optsstrip_reg = { 
 +      .name = "IPV4OPTSSTRIP",
 +      .target = target,
 +      .checkentry = checkentry,

diff --git a/kernel-wrr.patch b/kernel-wrr.patch
index 7da21a2017afaf6700cae85298a041f489f7b066..4a91016266d67d8b8dd0b8230a908559ab78d064 100644 (file)
--- a/kernel-wrr.patch
+++ b/kernel-wrr.patch
@@ -1083,7 +1083,7 @@ diff -urN linux-2.6.26.2.org/net/sched/wrr.c linux-2.6.26.2/net/sched/wrr.c
 +              weight_setdefault(&q->bands[i].class_modf.weight2);
 +              if (!crterr) {
 +                      struct Qdisc *child =
-+                          qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue, &pfifo_qdisc_ops, sch->handle);
++                          qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops, sch->handle);
 +                      if (child)
 +                              q->bands[i].que = child;
 +                      else {