packages: kernel/kernel-inittmpfs.patch, kernel/kernel-pom-ng-IPV4OPTSSTRIP...

[arekm]

Author: arekm                        Date: Thu Jan  6 11:12:50 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixes for 2.6.37

---- Files affected:
packages/kernel:
   kernel-inittmpfs.patch (1.6 -> 1.7) , kernel-pom-ng-IPV4OPTSSTRIP.patch (1.2 -> 1.3) , kernel-wrr.patch (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-inittmpfs.patch
diff -u packages/kernel/kernel-inittmpfs.patch:1.6 packages/kernel/kernel-inittmpfs.patch:1.7
--- packages/kernel/kernel-inittmpfs.patch:1.6	Wed Jan  5 21:08:47 2011
+++ packages/kernel/kernel-inittmpfs.patch	Thu Jan  6 12:12:44 2011
@@ -30,21 +30,31 @@
 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 @@
 -	.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 @@
  int __init init_rootfs(void)
  {
  	int err;
-@@ -316,5 +305,19 @@
+@@ -311,5 +301,19 @@
  
  	return err;
  }
@@ -83,12 +100,12 @@
 +
 +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)

================================================================
Index: packages/kernel/kernel-pom-ng-IPV4OPTSSTRIP.patch
diff -u packages/kernel/kernel-pom-ng-IPV4OPTSSTRIP.patch:1.2 packages/kernel/kernel-pom-ng-IPV4OPTSSTRIP.patch:1.3
--- packages/kernel/kernel-pom-ng-IPV4OPTSSTRIP.patch:1.2	Tue Mar 31 14:04:30 2009
+++ packages/kernel/kernel-pom-ng-IPV4OPTSSTRIP.patch	Thu Jan  6 12:12:44 2011
@@ -72,7 +72,7 @@
 +
 +	/* 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 @@
 +	opt = &(IPCB(skb)->opt);
 +	opt->optlen = l;
 +
-+        return IPT_CONTINUE;
++        return XT_CONTINUE;
 +}
 +
 +static bool
@@ -98,7 +98,7 @@
 +	return 1;
 +}
 +
-+static struct ipt_target ipt_ipv4optsstrip_reg = { 
++static struct xt_target ipt_ipv4optsstrip_reg = { 
 +	.name = "IPV4OPTSSTRIP",
 +	.target = target,
 +	.checkentry = checkentry,

================================================================
Index: packages/kernel/kernel-wrr.patch
diff -u packages/kernel/kernel-wrr.patch:1.8 packages/kernel/kernel-wrr.patch:1.9
--- packages/kernel/kernel-wrr.patch:1.8	Mon Mar  1 08:57:49 2010
+++ packages/kernel/kernel-wrr.patch	Thu Jan  6 12:12:44 2011
@@ -1083,7 +1083,7 @@
 +		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 {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-inittmpfs.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-pom-ng-IPV4OPTSSTRIP.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-wrr.patch?r1=1.8&r2=1.9&f=u