refresh kernel patches so that they apply cleanly
SVN-Revision: 7347
This commit is contained in:
		@@ -1,6 +1,6 @@
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/Kconfig linux-2.6.21.1-owrt/fs/Kconfig
 | 
			
		||||
--- linux-2.6.21.1/fs/Kconfig	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/Kconfig	2007-05-23 19:09:55.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/Kconfig linux-2.6.21.1.dev/fs/Kconfig
 | 
			
		||||
--- linux-2.6.21.1.old/fs/Kconfig	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/Kconfig	2007-05-26 19:00:37.121351760 +0200
 | 
			
		||||
@@ -1371,6 +1371,71 @@
 | 
			
		||||
 
 | 
			
		||||
 	  If unsure, say N.
 | 
			
		||||
@@ -73,9 +73,9 @@ diff -Nur linux-2.6.21.1/fs/Kconfig linux-2.6.21.1-owrt/fs/Kconfig
 | 
			
		||||
 config VXFS_FS
 | 
			
		||||
 	tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
 | 
			
		||||
 	depends on BLOCK
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/Makefile linux-2.6.21.1-owrt/fs/Makefile
 | 
			
		||||
--- linux-2.6.21.1/fs/Makefile	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/Makefile	2007-05-23 19:09:55.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/Makefile linux-2.6.21.1.dev/fs/Makefile
 | 
			
		||||
--- linux-2.6.21.1.old/fs/Makefile	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/Makefile	2007-05-26 19:00:37.121351760 +0200
 | 
			
		||||
@@ -68,6 +68,7 @@
 | 
			
		||||
 obj-$(CONFIG_JBD2)		+= jbd2/
 | 
			
		||||
 obj-$(CONFIG_EXT2_FS)		+= ext2/
 | 
			
		||||
@@ -84,9 +84,9 @@ diff -Nur linux-2.6.21.1/fs/Makefile linux-2.6.21.1-owrt/fs/Makefile
 | 
			
		||||
 obj-$(CONFIG_RAMFS)		+= ramfs/
 | 
			
		||||
 obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
 | 
			
		||||
 obj-$(CONFIG_CODA_FS)		+= coda/
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/squashfs/inode.c linux-2.6.21.1-owrt/fs/squashfs/inode.c
 | 
			
		||||
--- linux-2.6.21.1/fs/squashfs/inode.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/squashfs/inode.c	2007-05-23 19:52:20.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/squashfs/inode.c linux-2.6.21.1.dev/fs/squashfs/inode.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/squashfs/inode.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/squashfs/inode.c	2007-05-26 19:00:37.123351456 +0200
 | 
			
		||||
@@ -0,0 +1,2124 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * Squashfs - a compressed read only filesystem for Linux
 | 
			
		||||
@@ -2212,9 +2212,9 @@ diff -Nur linux-2.6.21.1/fs/squashfs/inode.c linux-2.6.21.1-owrt/fs/squashfs/ino
 | 
			
		||||
+MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem");
 | 
			
		||||
+MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>");
 | 
			
		||||
+MODULE_LICENSE("GPL");
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/squashfs/Makefile linux-2.6.21.1-owrt/fs/squashfs/Makefile
 | 
			
		||||
--- linux-2.6.21.1/fs/squashfs/Makefile	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/squashfs/Makefile	2007-05-23 19:09:55.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/squashfs/Makefile linux-2.6.21.1.dev/fs/squashfs/Makefile
 | 
			
		||||
--- linux-2.6.21.1.old/fs/squashfs/Makefile	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/squashfs/Makefile	2007-05-26 19:00:37.123351456 +0200
 | 
			
		||||
@@ -0,0 +1,7 @@
 | 
			
		||||
+#
 | 
			
		||||
+# Makefile for the linux squashfs routines.
 | 
			
		||||
@@ -2223,9 +2223,9 @@ diff -Nur linux-2.6.21.1/fs/squashfs/Makefile linux-2.6.21.1-owrt/fs/squashfs/Ma
 | 
			
		||||
+obj-$(CONFIG_SQUASHFS) += squashfs.o
 | 
			
		||||
+squashfs-y += inode.o
 | 
			
		||||
+squashfs-y += squashfs2_0.o
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/squashfs/squashfs2_0.c linux-2.6.21.1-owrt/fs/squashfs/squashfs2_0.c
 | 
			
		||||
--- linux-2.6.21.1/fs/squashfs/squashfs2_0.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/squashfs/squashfs2_0.c	2007-05-23 19:09:55.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/squashfs/squashfs2_0.c linux-2.6.21.1.dev/fs/squashfs/squashfs2_0.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/squashfs/squashfs2_0.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/squashfs/squashfs2_0.c	2007-05-26 19:00:37.125351152 +0200
 | 
			
		||||
@@ -0,0 +1,758 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * Squashfs - a compressed read only filesystem for Linux
 | 
			
		||||
@@ -2985,9 +2985,9 @@ diff -Nur linux-2.6.21.1/fs/squashfs/squashfs2_0.c linux-2.6.21.1-owrt/fs/squash
 | 
			
		||||
+
 | 
			
		||||
+	return 1;
 | 
			
		||||
+}
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/squashfs/squashfs.h linux-2.6.21.1-owrt/fs/squashfs/squashfs.h
 | 
			
		||||
--- linux-2.6.21.1/fs/squashfs/squashfs.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/squashfs/squashfs.h	2007-05-23 19:09:56.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/squashfs/squashfs.h linux-2.6.21.1.dev/fs/squashfs/squashfs.h
 | 
			
		||||
--- linux-2.6.21.1.old/fs/squashfs/squashfs.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/squashfs/squashfs.h	2007-05-26 19:00:37.125351152 +0200
 | 
			
		||||
@@ -0,0 +1,86 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * Squashfs - a compressed read only filesystem for Linux
 | 
			
		||||
@@ -3075,9 +3075,9 @@ diff -Nur linux-2.6.21.1/fs/squashfs/squashfs.h linux-2.6.21.1-owrt/fs/squashfs/
 | 
			
		||||
+	return 0;
 | 
			
		||||
+}
 | 
			
		||||
+#endif
 | 
			
		||||
diff -Nur linux-2.6.21.1/include/linux/squashfs_fs.h linux-2.6.21.1-owrt/include/linux/squashfs_fs.h
 | 
			
		||||
--- linux-2.6.21.1/include/linux/squashfs_fs.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/include/linux/squashfs_fs.h	2007-05-23 19:09:56.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/squashfs_fs.h linux-2.6.21.1.dev/include/linux/squashfs_fs.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/squashfs_fs.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/squashfs_fs.h	2007-05-26 19:00:37.143348416 +0200
 | 
			
		||||
@@ -0,0 +1,911 @@
 | 
			
		||||
+#ifndef SQUASHFS_FS
 | 
			
		||||
+#define SQUASHFS_FS
 | 
			
		||||
@@ -3990,9 +3990,9 @@ diff -Nur linux-2.6.21.1/include/linux/squashfs_fs.h linux-2.6.21.1-owrt/include
 | 
			
		||||
+
 | 
			
		||||
+#endif
 | 
			
		||||
+#endif
 | 
			
		||||
diff -Nur linux-2.6.21.1/include/linux/squashfs_fs_i.h linux-2.6.21.1-owrt/include/linux/squashfs_fs_i.h
 | 
			
		||||
--- linux-2.6.21.1/include/linux/squashfs_fs_i.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/include/linux/squashfs_fs_i.h	2007-05-23 19:09:56.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/squashfs_fs_i.h linux-2.6.21.1.dev/include/linux/squashfs_fs_i.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/squashfs_fs_i.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/squashfs_fs_i.h	2007-05-26 19:00:37.143348416 +0200
 | 
			
		||||
@@ -0,0 +1,45 @@
 | 
			
		||||
+#ifndef SQUASHFS_FS_I
 | 
			
		||||
+#define SQUASHFS_FS_I
 | 
			
		||||
@@ -4039,9 +4039,9 @@ diff -Nur linux-2.6.21.1/include/linux/squashfs_fs_i.h linux-2.6.21.1-owrt/inclu
 | 
			
		||||
+	struct inode	vfs_inode;
 | 
			
		||||
+};
 | 
			
		||||
+#endif
 | 
			
		||||
diff -Nur linux-2.6.21.1/include/linux/squashfs_fs_sb.h linux-2.6.21.1-owrt/include/linux/squashfs_fs_sb.h
 | 
			
		||||
--- linux-2.6.21.1/include/linux/squashfs_fs_sb.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/include/linux/squashfs_fs_sb.h	2007-05-23 19:09:56.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/squashfs_fs_sb.h linux-2.6.21.1.dev/include/linux/squashfs_fs_sb.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/squashfs_fs_sb.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/squashfs_fs_sb.h	2007-05-26 19:00:37.144348264 +0200
 | 
			
		||||
@@ -0,0 +1,74 @@
 | 
			
		||||
+#ifndef SQUASHFS_FS_SB
 | 
			
		||||
+#define SQUASHFS_FS_SB
 | 
			
		||||
@@ -4117,9 +4117,9 @@ diff -Nur linux-2.6.21.1/include/linux/squashfs_fs_sb.h linux-2.6.21.1-owrt/incl
 | 
			
		||||
+	int			(*read_fragment_index_table)(struct super_block *s);
 | 
			
		||||
+};
 | 
			
		||||
+#endif
 | 
			
		||||
diff -Nur linux-2.6.21.1/init/do_mounts_rd.c linux-2.6.21.1-owrt/init/do_mounts_rd.c
 | 
			
		||||
--- linux-2.6.21.1/init/do_mounts_rd.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1-owrt/init/do_mounts_rd.c	2007-05-23 19:09:56.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/init/do_mounts_rd.c linux-2.6.21.1.dev/init/do_mounts_rd.c
 | 
			
		||||
--- linux-2.6.21.1.old/init/do_mounts_rd.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/init/do_mounts_rd.c	2007-05-26 19:00:37.144348264 +0200
 | 
			
		||||
@@ -5,6 +5,7 @@
 | 
			
		||||
 #include <linux/ext2_fs.h>
 | 
			
		||||
 #include <linux/romfs_fs.h>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
diff -Nur linux-2.6.21.1/include/linux/LzmaDecode.h linux-2.6.21.1-owrt/include/linux/LzmaDecode.h
 | 
			
		||||
--- linux-2.6.21.1/include/linux/LzmaDecode.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/include/linux/LzmaDecode.h	2007-05-14 10:51:05.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/LzmaDecode.h linux-2.6.21.1.dev/include/linux/LzmaDecode.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/LzmaDecode.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/LzmaDecode.h	2007-05-26 19:03:45.705682584 +0200
 | 
			
		||||
@@ -0,0 +1,100 @@
 | 
			
		||||
+/*
 | 
			
		||||
+  LzmaDecode.h
 | 
			
		||||
@@ -102,9 +102,9 @@ diff -Nur linux-2.6.21.1/include/linux/LzmaDecode.h linux-2.6.21.1-owrt/include/
 | 
			
		||||
+    UInt32 *outSizeProcessed);
 | 
			
		||||
+
 | 
			
		||||
+#endif
 | 
			
		||||
diff -Nur linux-2.6.21.1/lib/LzmaDecode.c linux-2.6.21.1-owrt/lib/LzmaDecode.c
 | 
			
		||||
--- linux-2.6.21.1/lib/LzmaDecode.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/lib/LzmaDecode.c	2007-05-14 10:51:05.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/lib/LzmaDecode.c linux-2.6.21.1.dev/lib/LzmaDecode.c
 | 
			
		||||
--- linux-2.6.21.1.old/lib/LzmaDecode.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/lib/LzmaDecode.c	2007-05-26 19:03:45.706682432 +0200
 | 
			
		||||
@@ -0,0 +1,663 @@
 | 
			
		||||
+/*
 | 
			
		||||
+  LzmaDecode.c
 | 
			
		||||
@@ -769,9 +769,9 @@ diff -Nur linux-2.6.21.1/lib/LzmaDecode.c linux-2.6.21.1-owrt/lib/LzmaDecode.c
 | 
			
		||||
+  *outSizeProcessed = nowPos;
 | 
			
		||||
+  return LZMA_RESULT_OK;
 | 
			
		||||
+}
 | 
			
		||||
diff -Nur linux-2.6.21.1/lib/Makefile linux-2.6.21.1-owrt/lib/Makefile
 | 
			
		||||
--- linux-2.6.21.1/lib/Makefile	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1-owrt/lib/Makefile	2007-05-14 10:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/lib/Makefile linux-2.6.21.1.dev/lib/Makefile
 | 
			
		||||
--- linux-2.6.21.1.old/lib/Makefile	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/lib/Makefile	2007-05-26 19:03:45.721680152 +0200
 | 
			
		||||
@@ -12,7 +12,7 @@
 | 
			
		||||
 
 | 
			
		||||
 lib-y	+= kobject.o kref.o kobject_uevent.o klist.o
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/squashfs/inode.c linux-2.6.19.dev/fs/squashfs/inode.c
 | 
			
		||||
--- linux-2.6.19.old/fs/squashfs/inode.c	2006-12-14 03:13:20.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/squashfs/inode.c	2006-12-14 03:13:20.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/squashfs/inode.c linux-2.6.21.1.dev/fs/squashfs/inode.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/squashfs/inode.c	2007-05-26 19:03:45.499713896 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/squashfs/inode.c	2007-05-26 19:07:27.951896024 +0200
 | 
			
		||||
@@ -4,6 +4,9 @@
 | 
			
		||||
  * Copyright (c) 2002, 2003, 2004, 2005, 2006
 | 
			
		||||
  * Phillip Lougher <phillip@lougher.org.uk>
 | 
			
		||||
@@ -106,4 +106,3 @@ diff -urN linux-2.6.19.old/fs/squashfs/inode.c linux-2.6.19.dev/fs/squashfs/inod
 | 
			
		||||
 	unregister_filesystem(&squashfs_fs_type);
 | 
			
		||||
 	destroy_inodecache();
 | 
			
		||||
 }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
diff -urN linux-2.6.19.old/Makefile linux-2.6.19.dev/Makefile
 | 
			
		||||
--- linux-2.6.19.old/Makefile	2006-11-29 22:57:37.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/Makefile	2006-12-14 03:13:23.000000000 +0100
 | 
			
		||||
@@ -513,6 +513,9 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/Makefile linux-2.6.21.1.dev/Makefile
 | 
			
		||||
--- linux-2.6.21.1.old/Makefile	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/Makefile	2007-05-26 19:14:22.967804016 +0200
 | 
			
		||||
@@ -507,6 +507,9 @@
 | 
			
		||||
 NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
 | 
			
		||||
 CHECKFLAGS     += $(NOSTDINC_FLAGS)
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
diff -urN linux-2.6.19.old/include/asm-mips/system.h linux-2.6.19.dev/include/asm-mips/system.h
 | 
			
		||||
--- linux-2.6.19.old/include/asm-mips/system.h	2006-11-29 22:57:37.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/include/asm-mips/system.h	2006-12-14 03:13:28.000000000 +0100
 | 
			
		||||
@@ -311,7 +311,7 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/asm-mips/system.h linux-2.6.21.1.dev/include/asm-mips/system.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/asm-mips/system.h	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/asm-mips/system.h	2007-05-26 19:26:30.870146040 +0200
 | 
			
		||||
@@ -188,7 +188,7 @@
 | 
			
		||||
    if something tries to do an invalid xchg().  */
 | 
			
		||||
 extern void __xchg_called_with_bad_pointer(void);
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
@@ -1,15 +1,15 @@
 | 
			
		||||
diff -urN linux-2.6.19.old/drivers/mtd/chips/cfi_cmdset_0002.c linux-2.6.19.dev/drivers/mtd/chips/cfi_cmdset_0002.c
 | 
			
		||||
--- linux-2.6.19.old/drivers/mtd/chips/cfi_cmdset_0002.c	2006-11-29 22:57:37.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/drivers/mtd/chips/cfi_cmdset_0002.c	2006-12-14 03:13:30.000000000 +0100
 | 
			
		||||
@@ -50,6 +50,7 @@
 | 
			
		||||
 #define SST49LF004B	        0x0060
 | 
			
		||||
diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0002.c linux-2.6.21.1.dev/drivers/mtd/chips/cfi_cmdset_0002.c
 | 
			
		||||
--- linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0002.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/drivers/mtd/chips/cfi_cmdset_0002.c	2007-05-26 19:30:01.049193968 +0200
 | 
			
		||||
@@ -51,6 +51,7 @@
 | 
			
		||||
 #define SST49LF040B	        0x0050
 | 
			
		||||
 #define SST49LF008A		0x005a
 | 
			
		||||
 #define AT49BV6416		0x00d6
 | 
			
		||||
+#define MANUFACTURER_SAMSUNG	0x00ec
 | 
			
		||||
 
 | 
			
		||||
 static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
 | 
			
		||||
 static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
 | 
			
		||||
@@ -293,12 +294,19 @@
 | 
			
		||||
@@ -294,12 +295,19 @@
 | 
			
		||||
 
 | 
			
		||||
 		if (extp->MajorVersion != '1' ||
 | 
			
		||||
 		    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,7 @@
 | 
			
		||||
--- linux.old/drivers/mtd/chips/cfi_cmdset_0001.c	2007-02-13 02:41:50.816650352 +0100
 | 
			
		||||
+++ linux.dev/drivers/mtd/chips/cfi_cmdset_0001.c	2007-02-13 02:42:13.782159064 +0100
 | 
			
		||||
@@ -908,7 +908,7 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.21.1.dev/drivers/mtd/chips/cfi_cmdset_0001.c
 | 
			
		||||
--- linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0001.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/drivers/mtd/chips/cfi_cmdset_0001.c	2007-05-26 19:40:46.809023552 +0200
 | 
			
		||||
@@ -919,7 +919,7 @@
 | 
			
		||||
 
 | 
			
		||||
 static int __xipram xip_wait_for_operation(
 | 
			
		||||
 		struct map_info *map, struct flchip *chip,
 | 
			
		||||
@@ -9,7 +10,7 @@
 | 
			
		||||
 {
 | 
			
		||||
 	struct cfi_private *cfi = map->fldrv_priv;
 | 
			
		||||
 	struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
 | 
			
		||||
@@ -917,7 +917,7 @@
 | 
			
		||||
@@ -928,7 +928,7 @@
 | 
			
		||||
 	flstate_t oldstate, newstate;
 | 
			
		||||
 
 | 
			
		||||
        	start = xip_currtime();
 | 
			
		||||
@@ -18,7 +19,7 @@
 | 
			
		||||
 	if (usec == 0)
 | 
			
		||||
 		usec = 500000;
 | 
			
		||||
 	done = 0;
 | 
			
		||||
@@ -1027,8 +1027,8 @@
 | 
			
		||||
@@ -1038,8 +1038,8 @@
 | 
			
		||||
 #define XIP_INVAL_CACHED_RANGE(map, from, size)  \
 | 
			
		||||
 	INVALIDATE_CACHED_RANGE(map, from, size)
 | 
			
		||||
 
 | 
			
		||||
@@ -29,7 +30,7 @@
 | 
			
		||||
 
 | 
			
		||||
 #else
 | 
			
		||||
 
 | 
			
		||||
@@ -1040,65 +1040,65 @@
 | 
			
		||||
@@ -1051,65 +1051,65 @@
 | 
			
		||||
 static int inval_cache_and_wait_for_operation(
 | 
			
		||||
 		struct map_info *map, struct flchip *chip,
 | 
			
		||||
 		unsigned long cmd_adr, unsigned long inval_adr, int inval_len,
 | 
			
		||||
@@ -130,7 +131,7 @@
 | 
			
		||||
 	/* Done and happy. */
 | 
			
		||||
  	chip->state = FL_STATUS;
 | 
			
		||||
 	return 0;
 | 
			
		||||
@@ -1107,7 +1107,8 @@
 | 
			
		||||
@@ -1118,7 +1118,8 @@
 | 
			
		||||
 #endif
 | 
			
		||||
 
 | 
			
		||||
 #define WAIT_TIMEOUT(map, chip, adr, udelay) \
 | 
			
		||||
@@ -140,7 +141,7 @@
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
 static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len)
 | 
			
		||||
@@ -1331,7 +1332,7 @@
 | 
			
		||||
@@ -1342,7 +1343,7 @@
 | 
			
		||||
 
 | 
			
		||||
 	ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
 | 
			
		||||
 				   adr, map_bankwidth(map),
 | 
			
		||||
@@ -149,7 +150,7 @@
 | 
			
		||||
 	if (ret) {
 | 
			
		||||
 		xip_enable(map, chip, adr);
 | 
			
		||||
 		printk(KERN_ERR "%s: word write error (status timeout)\n", map->name);
 | 
			
		||||
@@ -1568,7 +1569,7 @@
 | 
			
		||||
@@ -1579,7 +1580,7 @@
 | 
			
		||||
 
 | 
			
		||||
 	ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,
 | 
			
		||||
 				   adr, len,
 | 
			
		||||
@@ -158,7 +159,7 @@
 | 
			
		||||
 	if (ret) {
 | 
			
		||||
 		map_write(map, CMD(0x70), cmd_adr);
 | 
			
		||||
 		chip->state = FL_STATUS;
 | 
			
		||||
@@ -1703,7 +1704,7 @@
 | 
			
		||||
@@ -1714,7 +1715,7 @@
 | 
			
		||||
 
 | 
			
		||||
 	ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
 | 
			
		||||
 				   adr, len,
 | 
			
		||||
 
 | 
			
		||||
@@ -1,14 +1,14 @@
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/squashfs/Makefile linux-2.6.19.dev/fs/squashfs/Makefile
 | 
			
		||||
--- linux-2.6.19.old/fs/squashfs/Makefile	2006-12-14 03:13:22.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/squashfs/Makefile	2006-12-14 03:13:31.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/squashfs/Makefile linux-2.6.21.1.dev/fs/squashfs/Makefile
 | 
			
		||||
--- linux-2.6.21.1.old/fs/squashfs/Makefile	2007-05-26 19:03:45.499713896 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/squashfs/Makefile	2007-05-26 19:43:37.064140840 +0200
 | 
			
		||||
@@ -4,4 +4,3 @@
 | 
			
		||||
 
 | 
			
		||||
 obj-$(CONFIG_SQUASHFS) += squashfs.o
 | 
			
		||||
 squashfs-y += inode.o
 | 
			
		||||
-squashfs-y += squashfs2_0.o
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/squashfs/squashfs.h linux-2.6.19.dev/fs/squashfs/squashfs.h
 | 
			
		||||
--- linux-2.6.19.old/fs/squashfs/squashfs.h	2006-12-14 03:13:20.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/squashfs/squashfs.h	2006-12-14 03:13:31.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/squashfs/squashfs.h linux-2.6.21.1.dev/fs/squashfs/squashfs.h
 | 
			
		||||
--- linux-2.6.21.1.old/fs/squashfs/squashfs.h	2007-05-26 19:03:45.500713744 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/squashfs/squashfs.h	2007-05-26 19:43:37.075139168 +0200
 | 
			
		||||
@@ -24,6 +24,9 @@
 | 
			
		||||
 #ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
 | 
			
		||||
 #undef CONFIG_SQUASHFS_1_0_COMPATIBILITY
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
diff -urN linux-2.6.19.old/arch/mips/kernel/head.S linux-2.6.19.dev/arch/mips/kernel/head.S
 | 
			
		||||
--- linux-2.6.19.old/arch/mips/kernel/head.S	2006-11-29 22:57:37.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/arch/mips/kernel/head.S	2006-12-14 03:13:33.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/arch/mips/kernel/head.S linux-2.6.21.1.dev/arch/mips/kernel/head.S
 | 
			
		||||
--- linux-2.6.21.1.old/arch/mips/kernel/head.S	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/arch/mips/kernel/head.S	2007-05-26 19:46:49.061952736 +0200
 | 
			
		||||
@@ -129,6 +129,10 @@
 | 
			
		||||
 #endif
 | 
			
		||||
 	.endm
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
diff -Nur linux-2.6.17/arch/mips/mm/tlbex.c linux-2.6.17-owrt/arch/mips/mm/tlbex.c
 | 
			
		||||
--- linux-2.6.17/arch/mips/mm/tlbex.c	2006-06-18 03:49:35.000000000 +0200
 | 
			
		||||
+++ linux-2.6.17-owrt/arch/mips/mm/tlbex.c	2006-06-18 12:48:27.000000000 +0200
 | 
			
		||||
@@ -876,7 +876,6 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/arch/mips/mm/tlbex.c linux-2.6.21.1.dev/arch/mips/mm/tlbex.c
 | 
			
		||||
--- linux-2.6.21.1.old/arch/mips/mm/tlbex.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/arch/mips/mm/tlbex.c	2007-05-26 19:50:19.046030304 +0200
 | 
			
		||||
@@ -887,7 +887,6 @@
 | 
			
		||||
 	case CPU_R10000:
 | 
			
		||||
 	case CPU_R12000:
 | 
			
		||||
 	case CPU_R14000:
 | 
			
		||||
@@ -9,7 +9,7 @@ diff -Nur linux-2.6.17/arch/mips/mm/tlbex.c linux-2.6.17-owrt/arch/mips/mm/tlbex
 | 
			
		||||
 	case CPU_SB1:
 | 
			
		||||
 	case CPU_SB1A:
 | 
			
		||||
 	case CPU_4KSC:
 | 
			
		||||
@@ -904,6 +903,7 @@
 | 
			
		||||
@@ -915,6 +914,7 @@
 | 
			
		||||
 		tlbw(p);
 | 
			
		||||
 		break;
 | 
			
		||||
 
 | 
			
		||||
@@ -17,4 +17,3 @@ diff -Nur linux-2.6.17/arch/mips/mm/tlbex.c linux-2.6.17-owrt/arch/mips/mm/tlbex
 | 
			
		||||
 	case CPU_4KEC:
 | 
			
		||||
 	case CPU_24K:
 | 
			
		||||
 	case CPU_34K:
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,17 @@
 | 
			
		||||
--- linux-2.6.21.1/arch/mips/Kconfig	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1-owrt/arch/mips/Kconfig	2007-05-24 13:51:13.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/arch/mips/defconfig linux-2.6.21.1.dev/arch/mips/defconfig
 | 
			
		||||
--- linux-2.6.21.1.old/arch/mips/defconfig	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/arch/mips/defconfig	2007-05-26 19:55:17.542651920 +0200
 | 
			
		||||
@@ -69,6 +69,7 @@
 | 
			
		||||
 CONFIG_GENERIC_HWEIGHT=y
 | 
			
		||||
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 | 
			
		||||
 CONFIG_GENERIC_TIME=y
 | 
			
		||||
+CONFIG_GENERIC_GPIO=n
 | 
			
		||||
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 | 
			
		||||
 # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
 | 
			
		||||
 CONFIG_ARC=y
 | 
			
		||||
diff -urN linux-2.6.21.1.old/arch/mips/Kconfig linux-2.6.21.1.dev/arch/mips/Kconfig
 | 
			
		||||
--- linux-2.6.21.1.old/arch/mips/Kconfig	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/arch/mips/Kconfig	2007-05-26 19:55:17.500658304 +0200
 | 
			
		||||
@@ -869,6 +869,10 @@
 | 
			
		||||
 	bool
 | 
			
		||||
 	default y
 | 
			
		||||
@@ -11,8 +23,9 @@
 | 
			
		||||
 config SCHED_NO_NO_OMIT_FRAME_POINTER
 | 
			
		||||
 	bool
 | 
			
		||||
 	default y
 | 
			
		||||
--- linux-2.6.21.1/include/asm-mips/gpio.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/include/asm-mips/gpio.h	2007-05-24 13:51:13.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/asm-mips/gpio.h linux-2.6.21.1.dev/include/asm-mips/gpio.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/asm-mips/gpio.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/asm-mips/gpio.h	2007-05-26 19:55:17.500658304 +0200
 | 
			
		||||
@@ -0,0 +1,6 @@
 | 
			
		||||
+#ifndef _ASM_MIPS_GPIO_H
 | 
			
		||||
+#define _ASM_MIPS_GPIO_H
 | 
			
		||||
@@ -20,13 +33,3 @@
 | 
			
		||||
+#include <gpio.h>
 | 
			
		||||
+
 | 
			
		||||
+#endif /* _ASM_MIPS_GPIO_H */
 | 
			
		||||
--- linux-2.6.21.1/arch/mips/defconfig	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1-owrt/arch/mips/defconfig	2007-05-24 14:37:52.000000000 +0200
 | 
			
		||||
@@ -71,6 +71,7 @@
 | 
			
		||||
 CONFIG_GENERIC_HWEIGHT=y
 | 
			
		||||
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 | 
			
		||||
 CONFIG_GENERIC_TIME=y
 | 
			
		||||
+CONFIG_GENERIC_GPIO=n
 | 
			
		||||
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 | 
			
		||||
 # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
 | 
			
		||||
 CONFIG_ARC=y
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
diff -Nur linux-2.6.21.1/drivers/mtd/Kconfig linux-2.6.21.1-owrt/drivers/mtd/Kconfig
 | 
			
		||||
--- linux-2.6.21.1/drivers/mtd/Kconfig	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1-owrt/drivers/mtd/Kconfig	2007-05-14 10:59:59.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/drivers/mtd/Kconfig linux-2.6.21.1.dev/drivers/mtd/Kconfig
 | 
			
		||||
--- linux-2.6.21.1.old/drivers/mtd/Kconfig	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/drivers/mtd/Kconfig	2007-05-26 19:58:42.320520952 +0200
 | 
			
		||||
@@ -49,6 +49,11 @@
 | 
			
		||||
 	  devices. Partitioning on NFTL 'devices' is a different - that's the
 | 
			
		||||
 	  'normal' form of partitioning used on a block device.
 | 
			
		||||
@@ -13,9 +13,9 @@ diff -Nur linux-2.6.21.1/drivers/mtd/Kconfig linux-2.6.21.1-owrt/drivers/mtd/Kco
 | 
			
		||||
 config MTD_REDBOOT_PARTS
 | 
			
		||||
 	tristate "RedBoot partition table parsing"
 | 
			
		||||
 	depends on MTD_PARTITIONS
 | 
			
		||||
diff -Nur linux-2.6.21.1/drivers/mtd/mtdpart.c linux-2.6.21.1-owrt/drivers/mtd/mtdpart.c
 | 
			
		||||
--- linux-2.6.21.1/drivers/mtd/mtdpart.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1-owrt/drivers/mtd/mtdpart.c	2007-05-14 11:18:56.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/drivers/mtd/mtdpart.c linux-2.6.21.1.dev/drivers/mtd/mtdpart.c
 | 
			
		||||
--- linux-2.6.21.1.old/drivers/mtd/mtdpart.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/drivers/mtd/mtdpart.c	2007-05-26 19:58:42.331519280 +0200
 | 
			
		||||
@@ -20,6 +20,8 @@
 | 
			
		||||
 #include <linux/mtd/mtd.h>
 | 
			
		||||
 #include <linux/mtd/partitions.h>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,6 @@
 | 
			
		||||
--- linux.old/drivers/mtd/devices/block2mtd.c	2007-03-02 01:00:13.866987272 +0100
 | 
			
		||||
+++ linux.dev/drivers/mtd/devices/block2mtd.c	2007-03-02 02:03:45.558522080 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c linux-2.6.21.1.dev/drivers/mtd/devices/block2mtd.c
 | 
			
		||||
--- linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/drivers/mtd/devices/block2mtd.c	2007-05-26 20:06:13.547923960 +0200
 | 
			
		||||
@@ -16,6 +16,7 @@
 | 
			
		||||
 #include <linux/list.h>
 | 
			
		||||
 #include <linux/init.h>
 | 
			
		||||
@@ -8,7 +9,7 @@
 | 
			
		||||
 #include <linux/buffer_head.h>
 | 
			
		||||
 #include <linux/mutex.h>
 | 
			
		||||
 #include <linux/mount.h>
 | 
			
		||||
@@ -287,10 +288,11 @@
 | 
			
		||||
@@ -288,10 +289,11 @@
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
 /* FIXME: ensure that mtd->size % erase_size == 0 */
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
diff -urN linux.old/include/linux/netfilter_ipv4/ip_conntrack.h linux.dev/include/linux/netfilter_ipv4/ip_conntrack.h
 | 
			
		||||
--- linux.old/include/linux/netfilter_ipv4/ip_conntrack.h	2007-01-01 05:17:07.000000000 +0100
 | 
			
		||||
+++ linux.dev/include/linux/netfilter_ipv4/ip_conntrack.h	2007-01-01 05:18:48.000000000 +0100
 | 
			
		||||
@@ -127,6 +127,15 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_conntrack.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_conntrack.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_conntrack.h	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_conntrack.h	2007-05-26 20:13:52.648130120 +0200
 | 
			
		||||
@@ -128,6 +128,15 @@
 | 
			
		||||
 	/* Traversed often, so hopefully in different cacheline to top */
 | 
			
		||||
 	/* These are my tuples; original and reply */
 | 
			
		||||
 	struct ip_conntrack_tuple_hash tuplehash[IP_CT_DIR_MAX];
 | 
			
		||||
@@ -17,9 +17,9 @@ diff -urN linux.old/include/linux/netfilter_ipv4/ip_conntrack.h linux.dev/includ
 | 
			
		||||
 };
 | 
			
		||||
 
 | 
			
		||||
 struct ip_conntrack_expect
 | 
			
		||||
diff -urN linux.old/include/linux/netfilter_ipv4/ipt_layer7.h linux.dev/include/linux/netfilter_ipv4/ipt_layer7.h
 | 
			
		||||
--- linux.old/include/linux/netfilter_ipv4/ipt_layer7.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux.dev/include/linux/netfilter_ipv4/ipt_layer7.h	2007-01-01 05:18:48.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_layer7.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_layer7.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_layer7.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_layer7.h	2007-05-26 20:13:52.648130120 +0200
 | 
			
		||||
@@ -0,0 +1,26 @@
 | 
			
		||||
+/*
 | 
			
		||||
+  By Matthew Strait <quadong@users.sf.net>, Dec 2003.
 | 
			
		||||
@@ -47,9 +47,9 @@ diff -urN linux.old/include/linux/netfilter_ipv4/ipt_layer7.h linux.dev/include/
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+#endif /* _IPT_LAYER7_H */
 | 
			
		||||
diff -urN linux.old/net/ipv4/netfilter/ip_conntrack_core.c linux.dev/net/ipv4/netfilter/ip_conntrack_core.c
 | 
			
		||||
--- linux.old/net/ipv4/netfilter/ip_conntrack_core.c	2007-01-01 05:17:07.000000000 +0100
 | 
			
		||||
+++ linux.dev/net/ipv4/netfilter/ip_conntrack_core.c	2007-01-01 05:18:48.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ip_conntrack_core.c linux-2.6.21.1.dev/net/ipv4/netfilter/ip_conntrack_core.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/ip_conntrack_core.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/ip_conntrack_core.c	2007-05-26 20:13:52.649129968 +0200
 | 
			
		||||
@@ -337,6 +337,13 @@
 | 
			
		||||
 	 * too. */
 | 
			
		||||
 	ip_ct_remove_expectations(ct);
 | 
			
		||||
@@ -64,10 +64,10 @@ diff -urN linux.old/net/ipv4/netfilter/ip_conntrack_core.c linux.dev/net/ipv4/ne
 | 
			
		||||
 	/* We overload first tuple to link into unconfirmed list. */
 | 
			
		||||
 	if (!is_confirmed(ct)) {
 | 
			
		||||
 		BUG_ON(list_empty(&ct->tuplehash[IP_CT_DIR_ORIGINAL].list));
 | 
			
		||||
diff -urN linux.old/net/ipv4/netfilter/ip_conntrack_standalone.c linux.dev/net/ipv4/netfilter/ip_conntrack_standalone.c
 | 
			
		||||
--- linux.old/net/ipv4/netfilter/ip_conntrack_standalone.c	2007-01-01 05:17:07.000000000 +0100
 | 
			
		||||
+++ linux.dev/net/ipv4/netfilter/ip_conntrack_standalone.c	2007-01-01 05:18:48.000000000 +0100
 | 
			
		||||
@@ -192,6 +192,12 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ip_conntrack_standalone.c linux-2.6.21.1.dev/net/ipv4/netfilter/ip_conntrack_standalone.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/ip_conntrack_standalone.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/ip_conntrack_standalone.c	2007-05-26 20:13:52.649129968 +0200
 | 
			
		||||
@@ -188,6 +188,12 @@
 | 
			
		||||
 		return -ENOSPC;
 | 
			
		||||
 #endif
 | 
			
		||||
 
 | 
			
		||||
@@ -80,9 +80,9 @@ diff -urN linux.old/net/ipv4/netfilter/ip_conntrack_standalone.c linux.dev/net/i
 | 
			
		||||
 	if (seq_printf(s, "use=%u\n", atomic_read(&conntrack->ct_general.use)))
 | 
			
		||||
 		return -ENOSPC;
 | 
			
		||||
 
 | 
			
		||||
diff -urN linux.old/net/ipv4/netfilter/ipt_layer7.c linux.dev/net/ipv4/netfilter/ipt_layer7.c
 | 
			
		||||
--- linux.old/net/ipv4/netfilter/ipt_layer7.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux.dev/net/ipv4/netfilter/ipt_layer7.c	2007-01-01 05:18:48.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ipt_layer7.c linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_layer7.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/ipt_layer7.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_layer7.c	2007-05-26 20:13:52.650129816 +0200
 | 
			
		||||
@@ -0,0 +1,573 @@
 | 
			
		||||
+/*
 | 
			
		||||
+  Kernel module to match application layer (OSI layer 7) data in connections.
 | 
			
		||||
@@ -657,10 +657,10 @@ diff -urN linux.old/net/ipv4/netfilter/ipt_layer7.c linux.dev/net/ipv4/netfilter
 | 
			
		||||
+
 | 
			
		||||
+module_init(ipt_layer7_init);
 | 
			
		||||
+module_exit(ipt_layer7_fini);
 | 
			
		||||
diff -urN linux.old/net/ipv4/netfilter/Kconfig linux.dev/net/ipv4/netfilter/Kconfig
 | 
			
		||||
--- linux.old/net/ipv4/netfilter/Kconfig	2007-01-01 05:17:07.000000000 +0100
 | 
			
		||||
+++ linux.dev/net/ipv4/netfilter/Kconfig	2007-01-01 05:18:48.000000000 +0100
 | 
			
		||||
@@ -248,6 +248,24 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig	2007-05-26 20:13:52.650129816 +0200
 | 
			
		||||
@@ -245,6 +245,24 @@
 | 
			
		||||
 
 | 
			
		||||
 	  To compile it as a module, choose M here.  If unsure, say N.
 | 
			
		||||
 
 | 
			
		||||
@@ -685,10 +685,10 @@ diff -urN linux.old/net/ipv4/netfilter/Kconfig linux.dev/net/ipv4/netfilter/Kcon
 | 
			
		||||
 config IP_NF_MATCH_TOS
 | 
			
		||||
 	tristate "TOS match support"
 | 
			
		||||
 	depends on IP_NF_IPTABLES
 | 
			
		||||
diff -urN linux.old/net/ipv4/netfilter/Makefile linux.dev/net/ipv4/netfilter/Makefile
 | 
			
		||||
--- linux.old/net/ipv4/netfilter/Makefile	2007-01-01 05:17:07.000000000 +0100
 | 
			
		||||
+++ linux.dev/net/ipv4/netfilter/Makefile	2007-01-01 05:18:48.000000000 +0100
 | 
			
		||||
@@ -63,6 +63,8 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Makefile linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/Makefile	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile	2007-05-26 20:13:52.651129664 +0200
 | 
			
		||||
@@ -92,6 +92,8 @@
 | 
			
		||||
 obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
 | 
			
		||||
 obj-$(CONFIG_IP_NF_MATCH_ADDRTYPE) += ipt_addrtype.o
 | 
			
		||||
 
 | 
			
		||||
@@ -697,9 +697,9 @@ diff -urN linux.old/net/ipv4/netfilter/Makefile linux.dev/net/ipv4/netfilter/Mak
 | 
			
		||||
 # targets
 | 
			
		||||
 obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
 | 
			
		||||
 obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
 | 
			
		||||
diff -urN linux.old/net/ipv4/netfilter/regexp/regexp.c linux.dev/net/ipv4/netfilter/regexp/regexp.c
 | 
			
		||||
--- linux.old/net/ipv4/netfilter/regexp/regexp.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux.dev/net/ipv4/netfilter/regexp/regexp.c	2007-01-01 05:18:48.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/regexp/regexp.c linux-2.6.21.1.dev/net/ipv4/netfilter/regexp/regexp.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/regexp/regexp.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/regexp/regexp.c	2007-05-26 20:13:52.652129512 +0200
 | 
			
		||||
@@ -0,0 +1,1197 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * regcomp and regexec -- regsub and regerror are elsewhere
 | 
			
		||||
@@ -1898,9 +1898,9 @@ diff -urN linux.old/net/ipv4/netfilter/regexp/regexp.c linux.dev/net/ipv4/netfil
 | 
			
		||||
+#endif
 | 
			
		||||
+
 | 
			
		||||
+
 | 
			
		||||
diff -urN linux.old/net/ipv4/netfilter/regexp/regexp.h linux.dev/net/ipv4/netfilter/regexp/regexp.h
 | 
			
		||||
--- linux.old/net/ipv4/netfilter/regexp/regexp.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux.dev/net/ipv4/netfilter/regexp/regexp.h	2007-01-01 05:18:48.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/regexp/regexp.h linux-2.6.21.1.dev/net/ipv4/netfilter/regexp/regexp.h
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/regexp/regexp.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/regexp/regexp.h	2007-05-26 20:13:52.652129512 +0200
 | 
			
		||||
@@ -0,0 +1,41 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * Definitions etc. for regexp(3) routines.
 | 
			
		||||
@@ -1943,18 +1943,18 @@ diff -urN linux.old/net/ipv4/netfilter/regexp/regexp.h linux.dev/net/ipv4/netfil
 | 
			
		||||
+void regerror(char *s);
 | 
			
		||||
+
 | 
			
		||||
+#endif
 | 
			
		||||
diff -urN linux.old/net/ipv4/netfilter/regexp/regmagic.h linux.dev/net/ipv4/netfilter/regexp/regmagic.h
 | 
			
		||||
--- linux.old/net/ipv4/netfilter/regexp/regmagic.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux.dev/net/ipv4/netfilter/regexp/regmagic.h	2007-01-01 05:18:48.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/regexp/regmagic.h linux-2.6.21.1.dev/net/ipv4/netfilter/regexp/regmagic.h
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/regexp/regmagic.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/regexp/regmagic.h	2007-05-26 20:13:52.652129512 +0200
 | 
			
		||||
@@ -0,0 +1,5 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * The first byte of the regexp internal "program" is actually this magic
 | 
			
		||||
+ * number; the start node begins in the second byte.
 | 
			
		||||
+ */
 | 
			
		||||
+#define	MAGIC	0234
 | 
			
		||||
diff -urN linux.old/net/ipv4/netfilter/regexp/regsub.c linux.dev/net/ipv4/netfilter/regexp/regsub.c
 | 
			
		||||
--- linux.old/net/ipv4/netfilter/regexp/regsub.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux.dev/net/ipv4/netfilter/regexp/regsub.c	2007-01-01 05:18:48.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/regexp/regsub.c linux-2.6.21.1.dev/net/ipv4/netfilter/regexp/regsub.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/regexp/regsub.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/regexp/regsub.c	2007-05-26 20:13:52.653129360 +0200
 | 
			
		||||
@@ -0,0 +1,95 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * regsub
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
diff -ur linux.dev/include/linux/netfilter_ipv4/ipt_layer7.h linux.dev2/include/linux/netfilter_ipv4/ipt_layer7.h
 | 
			
		||||
--- linux.dev/include/linux/netfilter_ipv4/ipt_layer7.h	2007-01-01 05:18:48.000000000 +0100
 | 
			
		||||
+++ linux.dev2/include/linux/netfilter_ipv4/ipt_layer7.h	2007-01-01 05:30:46.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_layer7.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_layer7.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_layer7.h	2007-05-26 20:17:47.624408296 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_layer7.h	2007-05-26 20:17:48.729240336 +0200
 | 
			
		||||
@@ -21,6 +21,7 @@
 | 
			
		||||
     char protocol[MAX_PROTOCOL_LEN];
 | 
			
		||||
     char invert:1;
 | 
			
		||||
@@ -9,9 +9,9 @@ diff -ur linux.dev/include/linux/netfilter_ipv4/ipt_layer7.h linux.dev2/include/
 | 
			
		||||
 };
 | 
			
		||||
 
 | 
			
		||||
 #endif /* _IPT_LAYER7_H */
 | 
			
		||||
diff -ur linux.dev/net/ipv4/netfilter/ipt_layer7.c linux.dev2/net/ipv4/netfilter/ipt_layer7.c
 | 
			
		||||
--- linux.dev/net/ipv4/netfilter/ipt_layer7.c	2007-01-01 05:18:48.000000000 +0100
 | 
			
		||||
+++ linux.dev2/net/ipv4/netfilter/ipt_layer7.c	2007-01-01 05:30:46.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ipt_layer7.c linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_layer7.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/ipt_layer7.c	2007-05-26 20:17:47.626407992 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_layer7.c	2007-05-26 20:17:48.729240336 +0200
 | 
			
		||||
@@ -296,33 +296,34 @@
 | 
			
		||||
 	}
 | 
			
		||||
 }
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
diff -urN linux-2.6.19.old/include/linux/netfilter_ipv4/ipt_ipp2p.h linux-2.6.19.dev/include/linux/netfilter_ipv4/ipt_ipp2p.h
 | 
			
		||||
--- linux-2.6.19.old/include/linux/netfilter_ipv4/ipt_ipp2p.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/include/linux/netfilter_ipv4/ipt_ipp2p.h	2006-12-14 03:13:39.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_ipp2p.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_ipp2p.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_ipp2p.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_ipp2p.h	2007-05-26 20:21:54.586864296 +0200
 | 
			
		||||
@@ -0,0 +1,31 @@
 | 
			
		||||
+#ifndef __IPT_IPP2P_H
 | 
			
		||||
+#define __IPT_IPP2P_H
 | 
			
		||||
@@ -33,9 +33,9 @@ diff -urN linux-2.6.19.old/include/linux/netfilter_ipv4/ipt_ipp2p.h linux-2.6.19
 | 
			
		||||
+#define IPP2P_MUTE		(1 << 14)
 | 
			
		||||
+#define IPP2P_WASTE		(1 << 15)
 | 
			
		||||
+#define IPP2P_XDCC		(1 << 16)
 | 
			
		||||
diff -urN linux-2.6.19.old/net/ipv4/netfilter/ipt_ipp2p.c linux-2.6.19.dev/net/ipv4/netfilter/ipt_ipp2p.c
 | 
			
		||||
--- linux-2.6.19.old/net/ipv4/netfilter/ipt_ipp2p.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/net/ipv4/netfilter/ipt_ipp2p.c	2006-12-14 03:13:39.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ipt_ipp2p.c linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_ipp2p.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/ipt_ipp2p.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_ipp2p.c	2007-05-26 20:21:54.587864144 +0200
 | 
			
		||||
@@ -0,0 +1,881 @@
 | 
			
		||||
+#if defined(MODVERSIONS)
 | 
			
		||||
+#include <linux/modversions.h>
 | 
			
		||||
@@ -918,12 +918,12 @@ diff -urN linux-2.6.19.old/net/ipv4/netfilter/ipt_ipp2p.c linux-2.6.19.dev/net/i
 | 
			
		||||
+module_exit(fini);
 | 
			
		||||
+
 | 
			
		||||
+
 | 
			
		||||
diff -urN linux-2.6.19.old/net/ipv4/netfilter/Kconfig linux-2.6.19.dev/net/ipv4/netfilter/Kconfig
 | 
			
		||||
--- linux-2.6.19.old/net/ipv4/netfilter/Kconfig	2006-12-14 03:13:39.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/net/ipv4/netfilter/Kconfig	2006-12-14 03:13:39.000000000 +0100
 | 
			
		||||
@@ -248,6 +248,12 @@
 | 
			
		||||
 
 | 
			
		||||
 	  To compile it as a module, choose M here.  If unsure, say N.
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig	2007-05-26 20:17:47.626407992 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig	2007-05-26 20:21:54.587864144 +0200
 | 
			
		||||
@@ -263,6 +263,12 @@
 | 
			
		||||
 	help
 | 
			
		||||
 	  Say Y to get lots of debugging output.
 | 
			
		||||
 
 | 
			
		||||
+config IP_NF_MATCH_IPP2P
 | 
			
		||||
+	tristate "IPP2P"
 | 
			
		||||
@@ -934,10 +934,10 @@ diff -urN linux-2.6.19.old/net/ipv4/netfilter/Kconfig linux-2.6.19.dev/net/ipv4/
 | 
			
		||||
 config IP_NF_MATCH_TOS
 | 
			
		||||
 	tristate "TOS match support"
 | 
			
		||||
 	depends on IP_NF_IPTABLES
 | 
			
		||||
diff -urN linux-2.6.19.old/net/ipv4/netfilter/Makefile linux-2.6.19.dev/net/ipv4/netfilter/Makefile
 | 
			
		||||
--- linux-2.6.19.old/net/ipv4/netfilter/Makefile	2006-12-14 03:13:39.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/net/ipv4/netfilter/Makefile	2006-12-14 03:13:39.000000000 +0100
 | 
			
		||||
@@ -62,7 +62,7 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Makefile linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/Makefile	2007-05-26 20:17:47.638406168 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile	2007-05-26 20:21:54.588863992 +0200
 | 
			
		||||
@@ -91,7 +91,7 @@
 | 
			
		||||
 obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o
 | 
			
		||||
 obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
 | 
			
		||||
 obj-$(CONFIG_IP_NF_MATCH_ADDRTYPE) += ipt_addrtype.o
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
diff -Nur linux-2.6.21.1/include/net/xfrmudp.h linux-2.6.21.1-owrt/include/net/xfrmudp.h
 | 
			
		||||
--- linux-2.6.21.1/include/net/xfrmudp.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/include/net/xfrmudp.h	2007-05-14 11:26:11.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/net/xfrmudp.h linux-2.6.21.1.dev/include/net/xfrmudp.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/net/xfrmudp.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/net/xfrmudp.h	2007-05-26 20:24:53.933599448 +0200
 | 
			
		||||
@@ -0,0 +1,10 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * pointer to function for type that xfrm4_input wants, to permit
 | 
			
		||||
@@ -12,9 +12,9 @@ diff -Nur linux-2.6.21.1/include/net/xfrmudp.h linux-2.6.21.1-owrt/include/net/x
 | 
			
		||||
+extern int udp4_register_esp_rcvencap(xfrm4_rcv_encap_t func
 | 
			
		||||
+				      , xfrm4_rcv_encap_t *oldfunc);
 | 
			
		||||
+extern int udp4_unregister_esp_rcvencap(xfrm4_rcv_encap_t func);
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/ipv4/Kconfig linux-2.6.21.1-owrt/net/ipv4/Kconfig
 | 
			
		||||
--- linux-2.6.21.1/net/ipv4/Kconfig	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/ipv4/Kconfig	2007-05-14 11:26:11.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/Kconfig linux-2.6.21.1.dev/net/ipv4/Kconfig
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/Kconfig	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/Kconfig	2007-05-26 20:24:53.965594584 +0200
 | 
			
		||||
@@ -266,6 +266,12 @@
 | 
			
		||||
 	  Network), but can be distributed all over the Internet. If you want
 | 
			
		||||
 	  to do that, say Y here and to "IP multicast routing" below.
 | 
			
		||||
@@ -28,9 +28,9 @@ diff -Nur linux-2.6.21.1/net/ipv4/Kconfig linux-2.6.21.1-owrt/net/ipv4/Kconfig
 | 
			
		||||
 config IP_MROUTE
 | 
			
		||||
 	bool "IP: multicast routing"
 | 
			
		||||
 	depends on IP_MULTICAST
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/ipv4/udp.c linux-2.6.21.1-owrt/net/ipv4/udp.c
 | 
			
		||||
--- linux-2.6.21.1/net/ipv4/udp.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/ipv4/udp.c	2007-05-14 11:42:44.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/udp.c linux-2.6.21.1.dev/net/ipv4/udp.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/udp.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/udp.c	2007-05-26 20:24:53.966594432 +0200
 | 
			
		||||
@@ -101,12 +101,15 @@
 | 
			
		||||
 #include <net/route.h>
 | 
			
		||||
 #include <net/checksum.h>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set.h linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ip_set.h
 | 
			
		||||
--- linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ip_set.h	2007-05-23 23:04:36.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_set.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_set.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_set.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_set.h	2007-05-26 20:27:51.931539648 +0200
 | 
			
		||||
@@ -0,0 +1,498 @@
 | 
			
		||||
+#ifndef _IP_SET_H
 | 
			
		||||
+#define _IP_SET_H
 | 
			
		||||
@@ -500,9 +500,9 @@ diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set.h linux-2.6.21.1-ow
 | 
			
		||||
+#endif				/* __KERNEL__ */
 | 
			
		||||
+
 | 
			
		||||
+#endif /*_IP_SET_H*/
 | 
			
		||||
diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_iphash.h linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ip_set_iphash.h
 | 
			
		||||
--- linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_iphash.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ip_set_iphash.h	2007-05-23 23:04:36.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_set_iphash.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_set_iphash.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_set_iphash.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_set_iphash.h	2007-05-26 20:27:51.932539496 +0200
 | 
			
		||||
@@ -0,0 +1,30 @@
 | 
			
		||||
+#ifndef __IP_SET_IPHASH_H
 | 
			
		||||
+#define __IP_SET_IPHASH_H
 | 
			
		||||
@@ -534,9 +534,9 @@ diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_iphash.h linux-2.6.
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+#endif	/* __IP_SET_IPHASH_H */
 | 
			
		||||
diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_ipmap.h linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ip_set_ipmap.h
 | 
			
		||||
--- linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_ipmap.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ip_set_ipmap.h	2007-05-23 23:04:36.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_set_ipmap.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_set_ipmap.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_set_ipmap.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_set_ipmap.h	2007-05-26 20:27:51.932539496 +0200
 | 
			
		||||
@@ -0,0 +1,56 @@
 | 
			
		||||
+#ifndef __IP_SET_IPMAP_H
 | 
			
		||||
+#define __IP_SET_IPMAP_H
 | 
			
		||||
@@ -594,9 +594,9 @@ diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_ipmap.h linux-2.6.2
 | 
			
		||||
+}
 | 
			
		||||
+	
 | 
			
		||||
+#endif /* __IP_SET_IPMAP_H */
 | 
			
		||||
diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_ipporthash.h linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ip_set_ipporthash.h
 | 
			
		||||
--- linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_ipporthash.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ip_set_ipporthash.h	2007-05-23 23:04:36.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_set_ipporthash.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_set_ipporthash.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_set_ipporthash.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_set_ipporthash.h	2007-05-26 20:27:51.932539496 +0200
 | 
			
		||||
@@ -0,0 +1,34 @@
 | 
			
		||||
+#ifndef __IP_SET_IPPORTHASH_H
 | 
			
		||||
+#define __IP_SET_IPPORTHASH_H
 | 
			
		||||
@@ -632,9 +632,9 @@ diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_ipporthash.h linux-
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+#endif	/* __IP_SET_IPPORTHASH_H */
 | 
			
		||||
diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_iptree.h linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ip_set_iptree.h
 | 
			
		||||
--- linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_iptree.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ip_set_iptree.h	2007-05-23 23:04:36.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_set_iptree.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_set_iptree.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_set_iptree.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_set_iptree.h	2007-05-26 20:27:51.932539496 +0200
 | 
			
		||||
@@ -0,0 +1,40 @@
 | 
			
		||||
+#ifndef __IP_SET_IPTREE_H
 | 
			
		||||
+#define __IP_SET_IPTREE_H
 | 
			
		||||
@@ -676,9 +676,9 @@ diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_iptree.h linux-2.6.
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+#endif	/* __IP_SET_IPTREE_H */
 | 
			
		||||
diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_jhash.h linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ip_set_jhash.h
 | 
			
		||||
--- linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_jhash.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ip_set_jhash.h	2007-05-23 23:04:36.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_set_jhash.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_set_jhash.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_set_jhash.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_set_jhash.h	2007-05-26 20:27:51.932539496 +0200
 | 
			
		||||
@@ -0,0 +1,148 @@
 | 
			
		||||
+#ifndef _LINUX_IPSET_JHASH_H
 | 
			
		||||
+#define _LINUX_IPSET_JHASH_H
 | 
			
		||||
@@ -828,9 +828,9 @@ diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_jhash.h linux-2.6.2
 | 
			
		||||
+}
 | 
			
		||||
+
 | 
			
		||||
+#endif /* _LINUX_IPSET_JHASH_H */
 | 
			
		||||
diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_macipmap.h linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ip_set_macipmap.h
 | 
			
		||||
--- linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_macipmap.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ip_set_macipmap.h	2007-05-23 23:04:36.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_set_macipmap.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_set_macipmap.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_set_macipmap.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_set_macipmap.h	2007-05-26 20:27:51.933539344 +0200
 | 
			
		||||
@@ -0,0 +1,38 @@
 | 
			
		||||
+#ifndef __IP_SET_MACIPMAP_H
 | 
			
		||||
+#define __IP_SET_MACIPMAP_H
 | 
			
		||||
@@ -870,9 +870,9 @@ diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_macipmap.h linux-2.
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+#endif	/* __IP_SET_MACIPMAP_H */
 | 
			
		||||
diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_malloc.h linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ip_set_malloc.h
 | 
			
		||||
--- linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_malloc.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ip_set_malloc.h	2007-05-23 23:04:36.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_set_malloc.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_set_malloc.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_set_malloc.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_set_malloc.h	2007-05-26 20:27:51.933539344 +0200
 | 
			
		||||
@@ -0,0 +1,116 @@
 | 
			
		||||
+#ifndef _IP_SET_MALLOC_H
 | 
			
		||||
+#define _IP_SET_MALLOC_H
 | 
			
		||||
@@ -990,9 +990,9 @@ diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_malloc.h linux-2.6.
 | 
			
		||||
+#endif				/* __KERNEL__ */
 | 
			
		||||
+
 | 
			
		||||
+#endif /*_IP_SET_MALLOC_H*/
 | 
			
		||||
diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_nethash.h linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ip_set_nethash.h
 | 
			
		||||
--- linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_nethash.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ip_set_nethash.h	2007-05-23 23:04:36.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_set_nethash.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_set_nethash.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_set_nethash.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_set_nethash.h	2007-05-26 20:27:51.933539344 +0200
 | 
			
		||||
@@ -0,0 +1,55 @@
 | 
			
		||||
+#ifndef __IP_SET_NETHASH_H
 | 
			
		||||
+#define __IP_SET_NETHASH_H
 | 
			
		||||
@@ -1049,9 +1049,9 @@ diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_nethash.h linux-2.6
 | 
			
		||||
+}
 | 
			
		||||
+
 | 
			
		||||
+#endif	/* __IP_SET_NETHASH_H */
 | 
			
		||||
diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_portmap.h linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ip_set_portmap.h
 | 
			
		||||
--- linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_portmap.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ip_set_portmap.h	2007-05-23 23:04:36.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_set_portmap.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_set_portmap.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_set_portmap.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_set_portmap.h	2007-05-26 20:27:51.933539344 +0200
 | 
			
		||||
@@ -0,0 +1,25 @@
 | 
			
		||||
+#ifndef __IP_SET_PORTMAP_H
 | 
			
		||||
+#define __IP_SET_PORTMAP_H
 | 
			
		||||
@@ -1078,9 +1078,9 @@ diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ip_set_portmap.h linux-2.6
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+#endif /* __IP_SET_PORTMAP_H */
 | 
			
		||||
diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ipt_set.h linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ipt_set.h
 | 
			
		||||
--- linux-2.6.21.1/include/linux/netfilter_ipv4/ipt_set.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ipt_set.h	2007-05-23 23:04:36.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_set.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_set.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_set.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_set.h	2007-05-26 20:27:51.934539192 +0200
 | 
			
		||||
@@ -0,0 +1,21 @@
 | 
			
		||||
+#ifndef _IPT_SET_H
 | 
			
		||||
+#define _IPT_SET_H
 | 
			
		||||
@@ -1103,9 +1103,9 @@ diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ipt_set.h linux-2.6.21.1-o
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+#endif /*_IPT_SET_H*/
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ip_set.c linux-2.6.21.1-owrt/net/ipv4/netfilter/ip_set.c
 | 
			
		||||
--- linux-2.6.21.1/net/ipv4/netfilter/ip_set.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/ipv4/netfilter/ip_set.c	2007-05-23 23:04:36.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ip_set.c linux-2.6.21.1.dev/net/ipv4/netfilter/ip_set.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/ip_set.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/ip_set.c	2007-05-26 20:27:51.947537216 +0200
 | 
			
		||||
@@ -0,0 +1,2001 @@
 | 
			
		||||
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
 | 
			
		||||
+ *                         Patrick Schaaf <bof@bof.de>
 | 
			
		||||
@@ -3108,9 +3108,9 @@ diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ip_set.c linux-2.6.21.1-owrt/net/ipv
 | 
			
		||||
+
 | 
			
		||||
+module_init(init);
 | 
			
		||||
+module_exit(fini);
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ip_set_iphash.c linux-2.6.21.1-owrt/net/ipv4/netfilter/ip_set_iphash.c
 | 
			
		||||
--- linux-2.6.21.1/net/ipv4/netfilter/ip_set_iphash.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/ipv4/netfilter/ip_set_iphash.c	2007-05-23 23:04:36.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ip_set_iphash.c linux-2.6.21.1.dev/net/ipv4/netfilter/ip_set_iphash.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/ip_set_iphash.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/ip_set_iphash.c	2007-05-26 20:27:51.947537216 +0200
 | 
			
		||||
@@ -0,0 +1,413 @@
 | 
			
		||||
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 | 
			
		||||
+ *
 | 
			
		||||
@@ -3525,9 +3525,9 @@ diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ip_set_iphash.c linux-2.6.21.1-owrt/
 | 
			
		||||
+
 | 
			
		||||
+module_init(init);
 | 
			
		||||
+module_exit(fini);
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ip_set_ipmap.c linux-2.6.21.1-owrt/net/ipv4/netfilter/ip_set_ipmap.c
 | 
			
		||||
--- linux-2.6.21.1/net/ipv4/netfilter/ip_set_ipmap.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/ipv4/netfilter/ip_set_ipmap.c	2007-05-23 23:04:36.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ip_set_ipmap.c linux-2.6.21.1.dev/net/ipv4/netfilter/ip_set_ipmap.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/ip_set_ipmap.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/ip_set_ipmap.c	2007-05-26 20:27:51.948537064 +0200
 | 
			
		||||
@@ -0,0 +1,327 @@
 | 
			
		||||
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
 | 
			
		||||
+ *                         Patrick Schaaf <bof@bof.de>
 | 
			
		||||
@@ -3856,9 +3856,9 @@ diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ip_set_ipmap.c linux-2.6.21.1-owrt/n
 | 
			
		||||
+
 | 
			
		||||
+module_init(init);
 | 
			
		||||
+module_exit(fini);
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ip_set_ipporthash.c linux-2.6.21.1-owrt/net/ipv4/netfilter/ip_set_ipporthash.c
 | 
			
		||||
--- linux-2.6.21.1/net/ipv4/netfilter/ip_set_ipporthash.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/ipv4/netfilter/ip_set_ipporthash.c	2007-05-23 23:04:36.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ip_set_ipporthash.c linux-2.6.21.1.dev/net/ipv4/netfilter/ip_set_ipporthash.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/ip_set_ipporthash.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/ip_set_ipporthash.c	2007-05-26 20:27:51.949536912 +0200
 | 
			
		||||
@@ -0,0 +1,535 @@
 | 
			
		||||
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 | 
			
		||||
+ *
 | 
			
		||||
@@ -4395,9 +4395,9 @@ diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ip_set_ipporthash.c linux-2.6.21.1-o
 | 
			
		||||
+
 | 
			
		||||
+module_init(init);
 | 
			
		||||
+module_exit(fini);
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ip_set_iptree.c linux-2.6.21.1-owrt/net/ipv4/netfilter/ip_set_iptree.c
 | 
			
		||||
--- linux-2.6.21.1/net/ipv4/netfilter/ip_set_iptree.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/ipv4/netfilter/ip_set_iptree.c	2007-05-23 23:04:36.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ip_set_iptree.c linux-2.6.21.1.dev/net/ipv4/netfilter/ip_set_iptree.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/ip_set_iptree.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/ip_set_iptree.c	2007-05-26 20:27:51.949536912 +0200
 | 
			
		||||
@@ -0,0 +1,565 @@
 | 
			
		||||
+/* Copyright (C) 2005 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 | 
			
		||||
+ *
 | 
			
		||||
@@ -4964,9 +4964,9 @@ diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ip_set_iptree.c linux-2.6.21.1-owrt/
 | 
			
		||||
+
 | 
			
		||||
+module_init(init);
 | 
			
		||||
+module_exit(fini);
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ip_set_macipmap.c linux-2.6.21.1-owrt/net/ipv4/netfilter/ip_set_macipmap.c
 | 
			
		||||
--- linux-2.6.21.1/net/ipv4/netfilter/ip_set_macipmap.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/ipv4/netfilter/ip_set_macipmap.c	2007-05-23 23:04:36.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ip_set_macipmap.c linux-2.6.21.1.dev/net/ipv4/netfilter/ip_set_macipmap.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/ip_set_macipmap.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/ip_set_macipmap.c	2007-05-26 20:27:51.950536760 +0200
 | 
			
		||||
@@ -0,0 +1,353 @@
 | 
			
		||||
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
 | 
			
		||||
+ *                         Patrick Schaaf <bof@bof.de>
 | 
			
		||||
@@ -5321,9 +5321,9 @@ diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ip_set_macipmap.c linux-2.6.21.1-owr
 | 
			
		||||
+
 | 
			
		||||
+module_init(init);
 | 
			
		||||
+module_exit(fini);
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ip_set_nethash.c linux-2.6.21.1-owrt/net/ipv4/netfilter/ip_set_nethash.c
 | 
			
		||||
--- linux-2.6.21.1/net/ipv4/netfilter/ip_set_nethash.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/ipv4/netfilter/ip_set_nethash.c	2007-05-23 23:04:36.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ip_set_nethash.c linux-2.6.21.1.dev/net/ipv4/netfilter/ip_set_nethash.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/ip_set_nethash.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/ip_set_nethash.c	2007-05-26 20:27:51.950536760 +0200
 | 
			
		||||
@@ -0,0 +1,481 @@
 | 
			
		||||
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 | 
			
		||||
+ *
 | 
			
		||||
@@ -5806,9 +5806,9 @@ diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ip_set_nethash.c linux-2.6.21.1-owrt
 | 
			
		||||
+
 | 
			
		||||
+module_init(init);
 | 
			
		||||
+module_exit(fini);
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ip_set_portmap.c linux-2.6.21.1-owrt/net/ipv4/netfilter/ip_set_portmap.c
 | 
			
		||||
--- linux-2.6.21.1/net/ipv4/netfilter/ip_set_portmap.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/ipv4/netfilter/ip_set_portmap.c	2007-05-23 23:04:36.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ip_set_portmap.c linux-2.6.21.1.dev/net/ipv4/netfilter/ip_set_portmap.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/ip_set_portmap.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/ip_set_portmap.c	2007-05-26 20:27:51.951536608 +0200
 | 
			
		||||
@@ -0,0 +1,334 @@
 | 
			
		||||
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 | 
			
		||||
+ *
 | 
			
		||||
@@ -6144,9 +6144,9 @@ diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ip_set_portmap.c linux-2.6.21.1-owrt
 | 
			
		||||
+
 | 
			
		||||
+module_init(init);
 | 
			
		||||
+module_exit(fini);
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ipt_set.c linux-2.6.21.1-owrt/net/ipv4/netfilter/ipt_set.c
 | 
			
		||||
--- linux-2.6.21.1/net/ipv4/netfilter/ipt_set.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/ipv4/netfilter/ipt_set.c	2007-05-23 23:04:36.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ipt_set.c linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_set.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/ipt_set.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_set.c	2007-05-26 20:27:51.951536608 +0200
 | 
			
		||||
@@ -0,0 +1,142 @@
 | 
			
		||||
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
 | 
			
		||||
+ *                         Patrick Schaaf <bof@bof.de>
 | 
			
		||||
@@ -6290,9 +6290,9 @@ diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ipt_set.c linux-2.6.21.1-owrt/net/ip
 | 
			
		||||
+
 | 
			
		||||
+module_init(ipt_ipset_init);
 | 
			
		||||
+module_exit(ipt_ipset_fini);
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ipt_SET.c linux-2.6.21.1-owrt/net/ipv4/netfilter/ipt_SET.c
 | 
			
		||||
--- linux-2.6.21.1/net/ipv4/netfilter/ipt_SET.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/ipv4/netfilter/ipt_SET.c	2007-05-23 23:04:36.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ipt_SET.c linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_SET.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/ipt_SET.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_SET.c	2007-05-26 20:27:51.952536456 +0200
 | 
			
		||||
@@ -0,0 +1,160 @@
 | 
			
		||||
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
 | 
			
		||||
+ *                         Patrick Schaaf <bof@bof.de>
 | 
			
		||||
@@ -6454,12 +6454,12 @@ diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ipt_SET.c linux-2.6.21.1-owrt/net/ip
 | 
			
		||||
+
 | 
			
		||||
+module_init(ipt_SET_init);
 | 
			
		||||
+module_exit(ipt_SET_fini);
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/ipv4/netfilter/Kconfig linux-2.6.21.1-owrt/net/ipv4/netfilter/Kconfig
 | 
			
		||||
--- linux-2.6.21.1/net/ipv4/netfilter/Kconfig	2007-05-23 20:34:11.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/ipv4/netfilter/Kconfig	2007-05-23 23:04:36.000000000 +0200
 | 
			
		||||
@@ -674,5 +674,114 @@
 | 
			
		||||
 	  Documentation/modules.txt.  The module will be called ipt_ROUTE.o.
 | 
			
		||||
 	  If unsure, say `N'.
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig	2007-05-26 20:24:53.749627416 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig	2007-05-26 20:27:51.952536456 +0200
 | 
			
		||||
@@ -681,5 +681,114 @@
 | 
			
		||||
 	  Allows altering the ARP packet payload: source and destination
 | 
			
		||||
 	  hardware and network addresses.
 | 
			
		||||
 
 | 
			
		||||
+config IP_NF_SET
 | 
			
		||||
+	tristate "IP set support"
 | 
			
		||||
@@ -6572,18 +6572,18 @@ diff -Nur linux-2.6.21.1/net/ipv4/netfilter/Kconfig linux-2.6.21.1-owrt/net/ipv4
 | 
			
		||||
+
 | 
			
		||||
 endmenu
 | 
			
		||||
 
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/ipv4/netfilter/Makefile linux-2.6.21.1-owrt/net/ipv4/netfilter/Makefile
 | 
			
		||||
--- linux-2.6.21.1/net/ipv4/netfilter/Makefile	2007-05-23 20:34:11.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/ipv4/netfilter/Makefile	2007-05-23 23:04:36.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Makefile linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/Makefile	2007-05-26 20:24:53.750627264 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile	2007-05-26 20:27:51.953536304 +0200
 | 
			
		||||
@@ -90,6 +90,7 @@
 | 
			
		||||
 obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o
 | 
			
		||||
 obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o
 | 
			
		||||
 obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
 | 
			
		||||
+obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o
 | 
			
		||||
 obj-$(CONFIG_IP_NF_MATCH_ADDRTYPE) += ipt_addrtype.o
 | 
			
		||||
 
 | 
			
		||||
 # targets
 | 
			
		||||
@@ -106,6 +107,17 @@
 | 
			
		||||
 obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
 | 
			
		||||
 obj-$(CONFIG_IP_NF_MATCH_LAYER7) += ipt_layer7.o
 | 
			
		||||
@@ -107,6 +108,17 @@
 | 
			
		||||
 obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
 | 
			
		||||
 obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
 | 
			
		||||
 obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
diff -urN linux-2.6.19.old/include/linux/netfilter_ipv4/ipt_time.h linux-2.6.19.dev/include/linux/netfilter_ipv4/ipt_time.h
 | 
			
		||||
--- linux-2.6.19.old/include/linux/netfilter_ipv4/ipt_time.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/include/linux/netfilter_ipv4/ipt_time.h	2006-12-14 03:13:45.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_time.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_time.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_time.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_time.h	2007-05-26 20:31:03.596402160 +0200
 | 
			
		||||
@@ -0,0 +1,18 @@
 | 
			
		||||
+#ifndef __ipt_time_h_included__
 | 
			
		||||
+#define __ipt_time_h_included__
 | 
			
		||||
@@ -20,9 +20,9 @@ diff -urN linux-2.6.19.old/include/linux/netfilter_ipv4/ipt_time.h linux-2.6.19.
 | 
			
		||||
+
 | 
			
		||||
+
 | 
			
		||||
+#endif /* __ipt_time_h_included__ */
 | 
			
		||||
diff -urN linux-2.6.19.old/net/ipv4/netfilter/ipt_time.c linux-2.6.19.dev/net/ipv4/netfilter/ipt_time.c
 | 
			
		||||
--- linux-2.6.19.old/net/ipv4/netfilter/ipt_time.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/net/ipv4/netfilter/ipt_time.c	2006-12-14 03:13:45.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ipt_time.c linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_time.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/ipt_time.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_time.c	2007-05-26 20:31:03.596402160 +0200
 | 
			
		||||
@@ -0,0 +1,178 @@
 | 
			
		||||
+/*
 | 
			
		||||
+  This is a module which is used for time matching
 | 
			
		||||
@@ -202,10 +202,10 @@ diff -urN linux-2.6.19.old/net/ipv4/netfilter/ipt_time.c linux-2.6.19.dev/net/ip
 | 
			
		||||
+	r->tm_mon=i;
 | 
			
		||||
+	r->tm_mday=work-__spm[i]+1;
 | 
			
		||||
+}
 | 
			
		||||
diff -urN linux-2.6.19.old/net/ipv4/netfilter/Kconfig linux-2.6.19.dev/net/ipv4/netfilter/Kconfig
 | 
			
		||||
--- linux-2.6.19.old/net/ipv4/netfilter/Kconfig	2006-12-14 03:13:45.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/net/ipv4/netfilter/Kconfig	2006-12-14 03:13:45.000000000 +0100
 | 
			
		||||
@@ -263,6 +263,22 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig	2007-05-26 20:31:03.452424048 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig	2007-05-26 20:31:03.597402008 +0200
 | 
			
		||||
@@ -278,6 +278,22 @@
 | 
			
		||||
 
 | 
			
		||||
 	  To compile it as a module, choose M here.  If unsure, say N.
 | 
			
		||||
 
 | 
			
		||||
@@ -228,10 +228,10 @@ diff -urN linux-2.6.19.old/net/ipv4/netfilter/Kconfig linux-2.6.19.dev/net/ipv4/
 | 
			
		||||
 config IP_NF_MATCH_RECENT
 | 
			
		||||
 	tristate "recent match support"
 | 
			
		||||
 	depends on IP_NF_IPTABLES
 | 
			
		||||
diff -urN linux-2.6.19.old/net/ipv4/netfilter/Makefile linux-2.6.19.dev/net/ipv4/netfilter/Makefile
 | 
			
		||||
--- linux-2.6.19.old/net/ipv4/netfilter/Makefile	2006-12-14 03:13:45.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/net/ipv4/netfilter/Makefile	2006-12-14 03:13:45.000000000 +0100
 | 
			
		||||
@@ -58,6 +58,7 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Makefile linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/Makefile	2007-05-26 20:31:03.452424048 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile	2007-05-26 20:31:03.597402008 +0200
 | 
			
		||||
@@ -86,6 +86,7 @@
 | 
			
		||||
 obj-$(CONFIG_IP_NF_MATCH_IPRANGE) += ipt_iprange.o
 | 
			
		||||
 obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_owner.o
 | 
			
		||||
 obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,6 @@
 | 
			
		||||
--- linux-2.6.20-original/drivers/net/imq.c	1970-01-01 02:00:00.000000000 +0200
 | 
			
		||||
+++ linux-2.6.20/drivers/net/imq.c	2007-02-12 23:55:04.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/drivers/net/imq.c linux-2.6.21.1.dev/drivers/net/imq.c
 | 
			
		||||
--- linux-2.6.21.1.old/drivers/net/imq.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/drivers/net/imq.c	2007-05-26 20:34:15.180276984 +0200
 | 
			
		||||
@@ -0,0 +1,402 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ *             Pseudo-driver for the intermediate queue device.
 | 
			
		||||
@@ -403,8 +404,9 @@
 | 
			
		||||
+MODULE_AUTHOR("http://www.linuximq.net");
 | 
			
		||||
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
 | 
			
		||||
+MODULE_LICENSE("GPL");
 | 
			
		||||
--- linux-2.6.20-original/drivers/net/Kconfig	2007-02-04 20:44:54.000000000 +0200
 | 
			
		||||
+++ linux-2.6.20/drivers/net/Kconfig	2007-02-12 23:55:04.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/drivers/net/Kconfig linux-2.6.21.1.dev/drivers/net/Kconfig
 | 
			
		||||
--- linux-2.6.21.1.old/drivers/net/Kconfig	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/drivers/net/Kconfig	2007-05-26 20:34:15.193275008 +0200
 | 
			
		||||
@@ -96,6 +96,129 @@
 | 
			
		||||
 	  To compile this driver as a module, choose M here: the module
 | 
			
		||||
 	  will be called eql.  If unsure, say N.
 | 
			
		||||
@@ -535,8 +537,9 @@
 | 
			
		||||
 config TUN
 | 
			
		||||
 	tristate "Universal TUN/TAP device driver support"
 | 
			
		||||
 	select CRC32
 | 
			
		||||
--- linux-2.6.20-original/drivers/net/Makefile	2007-02-04 20:44:54.000000000 +0200
 | 
			
		||||
+++ linux-2.6.20/drivers/net/Makefile	2007-02-12 23:55:04.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/drivers/net/Makefile linux-2.6.21.1.dev/drivers/net/Makefile
 | 
			
		||||
--- linux-2.6.21.1.old/drivers/net/Makefile	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/drivers/net/Makefile	2007-05-26 20:34:15.194274856 +0200
 | 
			
		||||
@@ -124,6 +124,7 @@
 | 
			
		||||
 obj-$(CONFIG_SLHC) += slhc.o
 | 
			
		||||
 
 | 
			
		||||
@@ -545,8 +548,9 @@
 | 
			
		||||
 obj-$(CONFIG_IFB) += ifb.o
 | 
			
		||||
 obj-$(CONFIG_DE600) += de600.o
 | 
			
		||||
 obj-$(CONFIG_DE620) += de620.o
 | 
			
		||||
--- linux-2.6.20-original/include/linux/imq.h	1970-01-01 02:00:00.000000000 +0200
 | 
			
		||||
+++ linux-2.6.20/include/linux/imq.h	2007-02-12 23:55:04.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/imq.h linux-2.6.21.1.dev/include/linux/imq.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/imq.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/imq.h	2007-05-26 20:34:15.458234728 +0200
 | 
			
		||||
@@ -0,0 +1,9 @@
 | 
			
		||||
+#ifndef _IMQ_H
 | 
			
		||||
+#define _IMQ_H
 | 
			
		||||
@@ -557,8 +561,9 @@
 | 
			
		||||
+#define IMQ_F_ENQUEUE  0x80
 | 
			
		||||
+
 | 
			
		||||
+#endif /* _IMQ_H */
 | 
			
		||||
--- linux-2.6.20-original/include/linux/netfilter_ipv4/ipt_IMQ.h	1970-01-01 02:00:00.000000000 +0200
 | 
			
		||||
+++ linux-2.6.20/include/linux/netfilter_ipv4/ipt_IMQ.h	2007-02-12 23:55:04.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_IMQ.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_IMQ.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_IMQ.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_IMQ.h	2007-05-26 20:34:15.458234728 +0200
 | 
			
		||||
@@ -0,0 +1,8 @@
 | 
			
		||||
+#ifndef _IPT_IMQ_H
 | 
			
		||||
+#define _IPT_IMQ_H
 | 
			
		||||
@@ -568,8 +573,9 @@
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+#endif /* _IPT_IMQ_H */
 | 
			
		||||
--- linux-2.6.20-original/include/linux/netfilter_ipv6/ip6t_IMQ.h	1970-01-01 02:00:00.000000000 +0200
 | 
			
		||||
+++ linux-2.6.20/include/linux/netfilter_ipv6/ip6t_IMQ.h	2007-02-12 23:55:04.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-2.6.21.1.dev/include/linux/netfilter_ipv6/ip6t_IMQ.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter_ipv6/ip6t_IMQ.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv6/ip6t_IMQ.h	2007-05-26 20:34:15.495229104 +0200
 | 
			
		||||
@@ -0,0 +1,8 @@
 | 
			
		||||
+#ifndef _IP6T_IMQ_H
 | 
			
		||||
+#define _IP6T_IMQ_H
 | 
			
		||||
@@ -579,9 +585,10 @@
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+#endif /* _IP6T_IMQ_H */
 | 
			
		||||
--- linux-2.6.20-original/include/linux/skbuff.h	2007-02-04 20:44:54.000000000 +0200
 | 
			
		||||
+++ linux-2.6.20/include/linux/skbuff.h	2007-02-12 23:55:04.000000000 +0200
 | 
			
		||||
@@ -293,6 +293,10 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/skbuff.h linux-2.6.21.1.dev/include/linux/skbuff.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/skbuff.h	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/skbuff.h	2007-05-26 20:34:15.496228952 +0200
 | 
			
		||||
@@ -294,6 +294,10 @@
 | 
			
		||||
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
 | 
			
		||||
 	struct sk_buff		*nfct_reasm;
 | 
			
		||||
 #endif
 | 
			
		||||
@@ -592,8 +599,9 @@
 | 
			
		||||
 #ifdef CONFIG_BRIDGE_NETFILTER
 | 
			
		||||
 	struct nf_bridge_info	*nf_bridge;
 | 
			
		||||
 #endif
 | 
			
		||||
--- linux-2.6.20-original/net/core/dev.c	2007-02-04 20:44:54.000000000 +0200
 | 
			
		||||
+++ linux-2.6.20/net/core/dev.c	2007-02-12 23:55:04.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/core/dev.c linux-2.6.21.1.dev/net/core/dev.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/core/dev.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/core/dev.c	2007-05-26 20:34:15.497228800 +0200
 | 
			
		||||
@@ -94,6 +94,9 @@
 | 
			
		||||
 #include <linux/skbuff.h>
 | 
			
		||||
 #include <net/sock.h>
 | 
			
		||||
@@ -604,7 +612,7 @@
 | 
			
		||||
 #include <linux/proc_fs.h>
 | 
			
		||||
 #include <linux/seq_file.h>
 | 
			
		||||
 #include <linux/stat.h>
 | 
			
		||||
@@ -1343,7 +1346,11 @@
 | 
			
		||||
@@ -1340,7 +1343,11 @@
 | 
			
		||||
 int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 | 
			
		||||
 {
 | 
			
		||||
 	if (likely(!skb->next)) {
 | 
			
		||||
@@ -617,9 +625,10 @@
 | 
			
		||||
 			dev_queue_xmit_nit(skb, dev);
 | 
			
		||||
 
 | 
			
		||||
 		if (netif_needs_gso(dev, skb)) {
 | 
			
		||||
--- linux-2.6.20-original/net/core/skbuff.c	2007-02-04 20:44:54.000000000 +0200
 | 
			
		||||
+++ linux-2.6.20/net/core/skbuff.c	2007-02-12 23:55:04.000000000 +0200
 | 
			
		||||
@@ -485,6 +485,10 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/core/skbuff.c linux-2.6.21.1.dev/net/core/skbuff.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/core/skbuff.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/core/skbuff.c	2007-05-26 20:34:15.498228648 +0200
 | 
			
		||||
@@ -430,6 +430,10 @@
 | 
			
		||||
 	C(nfct_reasm);
 | 
			
		||||
 	nf_conntrack_get_reasm(skb->nfct_reasm);
 | 
			
		||||
 #endif
 | 
			
		||||
@@ -630,7 +639,7 @@
 | 
			
		||||
 #ifdef CONFIG_BRIDGE_NETFILTER
 | 
			
		||||
 	C(nf_bridge);
 | 
			
		||||
 	nf_bridge_get(skb->nf_bridge);
 | 
			
		||||
@@ -549,6 +553,10 @@
 | 
			
		||||
@@ -494,6 +498,10 @@
 | 
			
		||||
 #if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)
 | 
			
		||||
 	new->ipvs_property = old->ipvs_property;
 | 
			
		||||
 #endif
 | 
			
		||||
@@ -641,8 +650,9 @@
 | 
			
		||||
 #ifdef CONFIG_BRIDGE_NETFILTER
 | 
			
		||||
 	new->nf_bridge	= old->nf_bridge;
 | 
			
		||||
 	nf_bridge_get(old->nf_bridge);
 | 
			
		||||
--- linux-2.6.20-original/net/ipv4/netfilter/ipt_IMQ.c	1970-01-01 02:00:00.000000000 +0200
 | 
			
		||||
+++ linux-2.6.20/net/ipv4/netfilter/ipt_IMQ.c	2007-02-12 23:55:04.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ipt_IMQ.c linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_IMQ.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/ipt_IMQ.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_IMQ.c	2007-05-26 20:34:15.498228648 +0200
 | 
			
		||||
@@ -0,0 +1,71 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * This target marks packets to be enqueued to an imq device
 | 
			
		||||
@@ -715,9 +725,10 @@
 | 
			
		||||
+MODULE_AUTHOR("http://www.linuximq.net");
 | 
			
		||||
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
 | 
			
		||||
+MODULE_LICENSE("GPL");
 | 
			
		||||
--- linux-2.6.20-original/net/ipv4/netfilter/Kconfig	2007-02-04 20:44:54.000000000 +0200
 | 
			
		||||
+++ linux-2.6.20/net/ipv4/netfilter/Kconfig	2007-02-12 23:55:04.000000000 +0200
 | 
			
		||||
@@ -591,6 +591,17 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig	2007-05-26 20:34:13.929467136 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig	2007-05-26 20:34:15.498228648 +0200
 | 
			
		||||
@@ -605,6 +605,17 @@
 | 
			
		||||
 
 | 
			
		||||
 	  To compile it as a module, choose M here.  If unsure, say N.
 | 
			
		||||
 
 | 
			
		||||
@@ -735,9 +746,10 @@
 | 
			
		||||
 config IP_NF_TARGET_TOS
 | 
			
		||||
 	tristate "TOS target support"
 | 
			
		||||
 	depends on IP_NF_MANGLE
 | 
			
		||||
--- linux-2.6.20-original/net/ipv4/netfilter/Makefile	2007-02-04 20:44:54.000000000 +0200
 | 
			
		||||
+++ linux-2.6.20/net/ipv4/netfilter/Makefile	2007-02-12 23:55:04.000000000 +0200
 | 
			
		||||
@@ -96,6 +96,7 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Makefile linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/Makefile	2007-05-26 20:34:13.930466984 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile	2007-05-26 20:34:15.499228496 +0200
 | 
			
		||||
@@ -100,6 +100,7 @@
 | 
			
		||||
 obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
 | 
			
		||||
 obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
 | 
			
		||||
 obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
 | 
			
		||||
@@ -745,8 +757,9 @@
 | 
			
		||||
 obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
 | 
			
		||||
 obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
 | 
			
		||||
 obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
 | 
			
		||||
--- linux-2.6.20-original/net/ipv6/netfilter/ip6t_IMQ.c	1970-01-01 02:00:00.000000000 +0200
 | 
			
		||||
+++ linux-2.6.20/net/ipv6/netfilter/ip6t_IMQ.c	2007-02-12 23:55:04.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/ip6t_IMQ.c linux-2.6.21.1.dev/net/ipv6/netfilter/ip6t_IMQ.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv6/netfilter/ip6t_IMQ.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv6/netfilter/ip6t_IMQ.c	2007-05-26 20:34:15.531223632 +0200
 | 
			
		||||
@@ -0,0 +1,71 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * This target marks packets to be enqueued to an imq device
 | 
			
		||||
@@ -819,9 +832,10 @@
 | 
			
		||||
+MODULE_AUTHOR("http://www.linuximq.net");
 | 
			
		||||
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
 | 
			
		||||
+MODULE_LICENSE("GPL");
 | 
			
		||||
--- linux-2.6.20-original/net/ipv6/netfilter/Kconfig	2007-02-04 20:44:54.000000000 +0200
 | 
			
		||||
+++ linux-2.6.20/net/ipv6/netfilter/Kconfig	2007-02-12 23:55:04.000000000 +0200
 | 
			
		||||
@@ -164,6 +164,15 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv6/netfilter/Kconfig
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv6/netfilter/Kconfig	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv6/netfilter/Kconfig	2007-05-26 20:34:15.531223632 +0200
 | 
			
		||||
@@ -173,6 +173,15 @@
 | 
			
		||||
 
 | 
			
		||||
 	  To compile it as a module, choose M here.  If unsure, say N.
 | 
			
		||||
 
 | 
			
		||||
@@ -837,8 +851,9 @@
 | 
			
		||||
 config IP6_NF_TARGET_HL
 | 
			
		||||
 	tristate  'HL (hoplimit) target support'
 | 
			
		||||
 	depends on IP6_NF_MANGLE
 | 
			
		||||
--- linux-2.6.20-original/net/ipv6/netfilter/Makefile	2007-02-04 20:44:54.000000000 +0200
 | 
			
		||||
+++ linux-2.6.20/net/ipv6/netfilter/Makefile	2007-02-12 23:55:04.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/Makefile linux-2.6.21.1.dev/net/ipv6/netfilter/Makefile
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv6/netfilter/Makefile	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv6/netfilter/Makefile	2007-05-26 20:34:15.558219528 +0200
 | 
			
		||||
@@ -13,6 +13,7 @@
 | 
			
		||||
 obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t_owner.o
 | 
			
		||||
 obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
 | 
			
		||||
@@ -847,8 +862,9 @@
 | 
			
		||||
 obj-$(CONFIG_IP6_NF_TARGET_HL) += ip6t_HL.o
 | 
			
		||||
 obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
 | 
			
		||||
 obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o
 | 
			
		||||
--- linux-2.6.20-original/net/sched/sch_generic.c	2007-02-04 20:44:54.000000000 +0200
 | 
			
		||||
+++ linux-2.6.20/net/sched/sch_generic.c	2007-02-12 23:55:04.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/sched/sch_generic.c linux-2.6.21.1.dev/net/sched/sch_generic.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/sched/sch_generic.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/sched/sch_generic.c	2007-05-26 20:34:15.599213296 +0200
 | 
			
		||||
@@ -87,7 +87,6 @@
 | 
			
		||||
 
 | 
			
		||||
    NOTE: Called under dev->queue_lock with locally disabled BH.
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ipt_ROUTE.h linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ipt_ROUTE.h
 | 
			
		||||
--- linux-2.6.21.1/include/linux/netfilter_ipv4/ipt_ROUTE.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ipt_ROUTE.h	2007-05-23 20:32:22.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_ROUTE.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_ROUTE.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_ROUTE.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_ROUTE.h	2007-05-26 20:37:08.971856648 +0200
 | 
			
		||||
@@ -0,0 +1,23 @@
 | 
			
		||||
+/* Header file for iptables ipt_ROUTE target
 | 
			
		||||
+ *
 | 
			
		||||
@@ -25,9 +25,9 @@ diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ipt_ROUTE.h linux-2.6.21.1
 | 
			
		||||
+#define IPT_ROUTE_TEE             0x02
 | 
			
		||||
+
 | 
			
		||||
+#endif /*_IPT_ROUTE_H_target*/
 | 
			
		||||
diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv6/ip6t_ROUTE.h linux-2.6.21.1-owrt/include/linux/netfilter_ipv6/ip6t_ROUTE.h
 | 
			
		||||
--- linux-2.6.21.1/include/linux/netfilter_ipv6/ip6t_ROUTE.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/include/linux/netfilter_ipv6/ip6t_ROUTE.h	2007-05-23 20:32:22.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv6/ip6t_ROUTE.h linux-2.6.21.1.dev/include/linux/netfilter_ipv6/ip6t_ROUTE.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter_ipv6/ip6t_ROUTE.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv6/ip6t_ROUTE.h	2007-05-26 20:37:09.001852088 +0200
 | 
			
		||||
@@ -0,0 +1,23 @@
 | 
			
		||||
+/* Header file for iptables ip6t_ROUTE target
 | 
			
		||||
+ *
 | 
			
		||||
@@ -52,9 +52,9 @@ diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv6/ip6t_ROUTE.h linux-2.6.21.
 | 
			
		||||
+#define IP6T_ROUTE_TEE             0x02
 | 
			
		||||
+
 | 
			
		||||
+#endif /*_IP6T_ROUTE_H_target*/
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ipt_ROUTE.c linux-2.6.21.1-owrt/net/ipv4/netfilter/ipt_ROUTE.c
 | 
			
		||||
--- linux-2.6.21.1/net/ipv4/netfilter/ipt_ROUTE.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/ipv4/netfilter/ipt_ROUTE.c	2007-05-23 20:32:22.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ipt_ROUTE.c linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_ROUTE.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/ipt_ROUTE.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_ROUTE.c	2007-05-26 20:37:09.001852088 +0200
 | 
			
		||||
@@ -0,0 +1,483 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * This implements the ROUTE target, which enables you to setup unusual
 | 
			
		||||
@@ -539,12 +539,12 @@ diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ipt_ROUTE.c linux-2.6.21.1-owrt/net/
 | 
			
		||||
+
 | 
			
		||||
+module_init(init);
 | 
			
		||||
+module_exit(fini);
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/ipv4/netfilter/Kconfig linux-2.6.21.1-owrt/net/ipv4/netfilter/Kconfig
 | 
			
		||||
--- linux-2.6.21.1/net/ipv4/netfilter/Kconfig	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/ipv4/netfilter/Kconfig	2007-05-23 20:32:22.000000000 +0200
 | 
			
		||||
@@ -657,5 +657,22 @@
 | 
			
		||||
 	  Allows altering the ARP packet payload: source and destination
 | 
			
		||||
 	  hardware and network addresses.
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig	2007-05-26 20:37:08.734892672 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig	2007-05-26 20:37:09.002851936 +0200
 | 
			
		||||
@@ -817,5 +817,22 @@
 | 
			
		||||
 	  To compile it as a module, choose M here.  If unsure, say N.
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
+config IP_NF_TARGET_ROUTE
 | 
			
		||||
+	tristate  'ROUTE target support'
 | 
			
		||||
@@ -565,20 +565,20 @@ diff -Nur linux-2.6.21.1/net/ipv4/netfilter/Kconfig linux-2.6.21.1-owrt/net/ipv4
 | 
			
		||||
+
 | 
			
		||||
 endmenu
 | 
			
		||||
 
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/ipv4/netfilter/Makefile linux-2.6.21.1-owrt/net/ipv4/netfilter/Makefile
 | 
			
		||||
--- linux-2.6.21.1/net/ipv4/netfilter/Makefile	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/ipv4/netfilter/Makefile	2007-05-23 20:32:22.000000000 +0200
 | 
			
		||||
@@ -98,6 +98,7 @@
 | 
			
		||||
 obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Makefile linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/netfilter/Makefile	2007-05-26 20:37:08.735892520 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile	2007-05-26 20:37:09.002851936 +0200
 | 
			
		||||
@@ -103,6 +103,7 @@
 | 
			
		||||
 obj-$(CONFIG_IP_NF_TARGET_IMQ) += ipt_IMQ.o
 | 
			
		||||
 obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
 | 
			
		||||
 obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
 | 
			
		||||
+obj-$(CONFIG_IP_NF_TARGET_ROUTE) += ipt_ROUTE.o
 | 
			
		||||
 obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
 | 
			
		||||
 obj-$(CONFIG_IP_NF_TARGET_SAME) += ipt_SAME.o
 | 
			
		||||
 obj-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += ip_nat_snmp_basic.o
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/ipv6/ipv6_syms.c linux-2.6.21.1-owrt/net/ipv6/ipv6_syms.c
 | 
			
		||||
--- linux-2.6.21.1/net/ipv6/ipv6_syms.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/ipv6/ipv6_syms.c	2007-05-23 20:32:22.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv6/ipv6_syms.c linux-2.6.21.1.dev/net/ipv6/ipv6_syms.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv6/ipv6_syms.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv6/ipv6_syms.c	2007-05-26 20:37:09.002851936 +0200
 | 
			
		||||
@@ -10,6 +10,7 @@
 | 
			
		||||
 EXPORT_SYMBOL(icmpv6_statistics);
 | 
			
		||||
 EXPORT_SYMBOL(icmpv6_err_convert);
 | 
			
		||||
@@ -587,9 +587,9 @@ diff -Nur linux-2.6.21.1/net/ipv6/ipv6_syms.c linux-2.6.21.1-owrt/net/ipv6/ipv6_
 | 
			
		||||
 EXPORT_SYMBOL(register_inet6addr_notifier);
 | 
			
		||||
 EXPORT_SYMBOL(unregister_inet6addr_notifier);
 | 
			
		||||
 EXPORT_SYMBOL(ip6_route_output);
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/ipv6/netfilter/ip6t_ROUTE.c linux-2.6.21.1-owrt/net/ipv6/netfilter/ip6t_ROUTE.c
 | 
			
		||||
--- linux-2.6.21.1/net/ipv6/netfilter/ip6t_ROUTE.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/ipv6/netfilter/ip6t_ROUTE.c	2007-05-23 20:32:22.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/ip6t_ROUTE.c linux-2.6.21.1.dev/net/ipv6/netfilter/ip6t_ROUTE.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv6/netfilter/ip6t_ROUTE.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv6/netfilter/ip6t_ROUTE.c	2007-05-26 20:37:09.003851784 +0200
 | 
			
		||||
@@ -0,0 +1,330 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * This implements the ROUTE v6 target, which enables you to setup unusual
 | 
			
		||||
@@ -921,10 +921,10 @@ diff -Nur linux-2.6.21.1/net/ipv6/netfilter/ip6t_ROUTE.c linux-2.6.21.1-owrt/net
 | 
			
		||||
+module_init(init);
 | 
			
		||||
+module_exit(fini);
 | 
			
		||||
+MODULE_LICENSE("GPL");
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/ipv6/netfilter/Kconfig linux-2.6.21.1-owrt/net/ipv6/netfilter/Kconfig
 | 
			
		||||
--- linux-2.6.21.1/net/ipv6/netfilter/Kconfig	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/ipv6/netfilter/Kconfig	2007-05-23 20:32:22.000000000 +0200
 | 
			
		||||
@@ -200,5 +200,18 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv6/netfilter/Kconfig
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv6/netfilter/Kconfig	2007-05-26 20:37:08.809881272 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv6/netfilter/Kconfig	2007-05-26 20:37:09.003851784 +0200
 | 
			
		||||
@@ -209,5 +209,18 @@
 | 
			
		||||
 	  If you want to compile it as a module, say M here and read
 | 
			
		||||
 	  <file:Documentation/modules.txt>.  If unsure, say `N'.
 | 
			
		||||
 
 | 
			
		||||
@@ -943,10 +943,10 @@ diff -Nur linux-2.6.21.1/net/ipv6/netfilter/Kconfig linux-2.6.21.1-owrt/net/ipv6
 | 
			
		||||
+
 | 
			
		||||
 endmenu
 | 
			
		||||
 
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/ipv6/netfilter/Makefile linux-2.6.21.1-owrt/net/ipv6/netfilter/Makefile
 | 
			
		||||
--- linux-2.6.21.1/net/ipv6/netfilter/Makefile	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/ipv6/netfilter/Makefile	2007-05-23 20:32:22.000000000 +0200
 | 
			
		||||
@@ -19,6 +19,7 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/Makefile linux-2.6.21.1.dev/net/ipv6/netfilter/Makefile
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv6/netfilter/Makefile	2007-05-26 20:37:08.809881272 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv6/netfilter/Makefile	2007-05-26 20:37:09.003851784 +0200
 | 
			
		||||
@@ -20,6 +20,7 @@
 | 
			
		||||
 obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o
 | 
			
		||||
 obj-$(CONFIG_IP6_NF_MATCH_HL) += ip6t_hl.o
 | 
			
		||||
 obj-$(CONFIG_IP6_NF_TARGET_REJECT) += ip6t_REJECT.o
 | 
			
		||||
 
 | 
			
		||||
@@ -1,15 +1,15 @@
 | 
			
		||||
diff -Nur linux-2.6.21.1/include/linux/netfilter/oot_conntrack.h linux-2.6.21.1-owrt/include/linux/netfilter/oot_conntrack.h
 | 
			
		||||
--- linux-2.6.21.1/include/linux/netfilter/oot_conntrack.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/include/linux/netfilter/oot_conntrack.h	2007-05-14 14:18:54.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter/oot_conntrack.h linux-2.6.21.1.dev/include/linux/netfilter/oot_conntrack.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter/oot_conntrack.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter/oot_conntrack.h	2007-05-26 20:40:10.922195992 +0200
 | 
			
		||||
@@ -0,0 +1,5 @@
 | 
			
		||||
+#if defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE)
 | 
			
		||||
+#	include <linux/netfilter_ipv4/ip_conntrack.h>
 | 
			
		||||
+#else /* linux-2.6.20+ */
 | 
			
		||||
+#	include <net/netfilter/nf_nat_rule.h>
 | 
			
		||||
+#endif
 | 
			
		||||
diff -Nur linux-2.6.21.1/include/linux/netfilter/oot_trans.h linux-2.6.21.1-owrt/include/linux/netfilter/oot_trans.h
 | 
			
		||||
--- linux-2.6.21.1/include/linux/netfilter/oot_trans.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/include/linux/netfilter/oot_trans.h	2007-05-14 14:18:54.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter/oot_trans.h linux-2.6.21.1.dev/include/linux/netfilter/oot_trans.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter/oot_trans.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter/oot_trans.h	2007-05-26 20:40:10.940193256 +0200
 | 
			
		||||
@@ -0,0 +1,14 @@
 | 
			
		||||
+/* Out of tree workarounds */
 | 
			
		||||
+#include <linux/version.h>
 | 
			
		||||
@@ -25,9 +25,9 @@ diff -Nur linux-2.6.21.1/include/linux/netfilter/oot_trans.h linux-2.6.21.1-owrt
 | 
			
		||||
+#	define tcp_v4_check(tcph, tcph_sz, s, d, csp) \
 | 
			
		||||
+		tcp_v4_check((tcph_sz), (s), (d), (csp))
 | 
			
		||||
+#endif
 | 
			
		||||
diff -Nur linux-2.6.21.1/include/linux/netfilter/xt_CHAOS.h linux-2.6.21.1-owrt/include/linux/netfilter/xt_CHAOS.h
 | 
			
		||||
--- linux-2.6.21.1/include/linux/netfilter/xt_CHAOS.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/include/linux/netfilter/xt_CHAOS.h	2007-05-14 14:18:54.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter/xt_CHAOS.h linux-2.6.21.1.dev/include/linux/netfilter/xt_CHAOS.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter/xt_CHAOS.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter/xt_CHAOS.h	2007-05-26 20:40:10.940193256 +0200
 | 
			
		||||
@@ -0,0 +1,14 @@
 | 
			
		||||
+#ifndef _LINUX_XT_CHAOS_H
 | 
			
		||||
+#define _LINUX_XT_CHAOS_H 1
 | 
			
		||||
@@ -43,9 +43,9 @@ diff -Nur linux-2.6.21.1/include/linux/netfilter/xt_CHAOS.h linux-2.6.21.1-owrt/
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+#endif /* _LINUX_XT_CHAOS_H */
 | 
			
		||||
diff -Nur linux-2.6.21.1/include/linux/netfilter/xt_portscan.h linux-2.6.21.1-owrt/include/linux/netfilter/xt_portscan.h
 | 
			
		||||
--- linux-2.6.21.1/include/linux/netfilter/xt_portscan.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/include/linux/netfilter/xt_portscan.h	2007-05-14 14:18:54.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter/xt_portscan.h linux-2.6.21.1.dev/include/linux/netfilter/xt_portscan.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter/xt_portscan.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter/xt_portscan.h	2007-05-26 20:40:10.940193256 +0200
 | 
			
		||||
@@ -0,0 +1,8 @@
 | 
			
		||||
+#ifndef _LINUX_XT_PORTSCAN_H
 | 
			
		||||
+#define _LINUX_XT_PORTSCAN_H 1
 | 
			
		||||
@@ -55,9 +55,9 @@ diff -Nur linux-2.6.21.1/include/linux/netfilter/xt_portscan.h linux-2.6.21.1-ow
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+#endif /* _LINUX_XT_PORTSCAN_H */
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/netfilter/find_match.c linux-2.6.21.1-owrt/net/netfilter/find_match.c
 | 
			
		||||
--- linux-2.6.21.1/net/netfilter/find_match.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/netfilter/find_match.c	2007-05-14 14:18:54.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/netfilter/find_match.c linux-2.6.21.1.dev/net/netfilter/find_match.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/netfilter/find_match.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/netfilter/find_match.c	2007-05-26 20:40:10.970188696 +0200
 | 
			
		||||
@@ -0,0 +1,39 @@
 | 
			
		||||
+/*
 | 
			
		||||
+    xt_request_find_match
 | 
			
		||||
@@ -98,9 +98,9 @@ diff -Nur linux-2.6.21.1/net/netfilter/find_match.c linux-2.6.21.1-owrt/net/netf
 | 
			
		||||
+
 | 
			
		||||
+/* In case it goes into mainline, let this out-of-tree package compile */
 | 
			
		||||
+#define xt_request_find_match xt_request_find_match_lo
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/netfilter/Kconfig linux-2.6.21.1-owrt/net/netfilter/Kconfig
 | 
			
		||||
--- linux-2.6.21.1/net/netfilter/Kconfig	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/netfilter/Kconfig	2007-05-14 14:30:47.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/netfilter/Kconfig linux-2.6.21.1.dev/net/netfilter/Kconfig
 | 
			
		||||
--- linux-2.6.21.1.old/net/netfilter/Kconfig	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/netfilter/Kconfig	2007-05-26 20:40:11.003183680 +0200
 | 
			
		||||
@@ -287,6 +287,14 @@
 | 
			
		||||
 
 | 
			
		||||
 # alphabetically ordered list of targets
 | 
			
		||||
@@ -146,9 +146,9 @@ diff -Nur linux-2.6.21.1/net/netfilter/Kconfig linux-2.6.21.1-owrt/net/netfilter
 | 
			
		||||
 config NETFILTER_XT_MATCH_MULTIPORT
 | 
			
		||||
 	tristate "Multiple port match support"
 | 
			
		||||
 	depends on NETFILTER_XTABLES
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/netfilter/Makefile linux-2.6.21.1-owrt/net/netfilter/Makefile
 | 
			
		||||
--- linux-2.6.21.1/net/netfilter/Makefile	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/netfilter/Makefile	2007-05-14 14:30:47.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/netfilter/Makefile linux-2.6.21.1.dev/net/netfilter/Makefile
 | 
			
		||||
--- linux-2.6.21.1.old/net/netfilter/Makefile	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/netfilter/Makefile	2007-05-26 20:40:11.003183680 +0200
 | 
			
		||||
@@ -37,8 +37,10 @@
 | 
			
		||||
 obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
 | 
			
		||||
 
 | 
			
		||||
@@ -168,9 +168,9 @@ diff -Nur linux-2.6.21.1/net/netfilter/Makefile linux-2.6.21.1-owrt/net/netfilte
 | 
			
		||||
 obj-$(CONFIG_NETFILTER_XT_MATCH_PKTTYPE) += xt_pkttype.o
 | 
			
		||||
 obj-$(CONFIG_NETFILTER_XT_MATCH_QUOTA) += xt_quota.o
 | 
			
		||||
 obj-$(CONFIG_NETFILTER_XT_MATCH_REALM) += xt_realm.o
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/netfilter/xt_CHAOS.c linux-2.6.21.1-owrt/net/netfilter/xt_CHAOS.c
 | 
			
		||||
--- linux-2.6.21.1/net/netfilter/xt_CHAOS.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/netfilter/xt_CHAOS.c	2007-05-14 14:36:58.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/netfilter/xt_CHAOS.c linux-2.6.21.1.dev/net/netfilter/xt_CHAOS.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/netfilter/xt_CHAOS.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/netfilter/xt_CHAOS.c	2007-05-26 20:40:11.004183528 +0200
 | 
			
		||||
@@ -0,0 +1,204 @@
 | 
			
		||||
+/*
 | 
			
		||||
+	CHAOS target for netfilter
 | 
			
		||||
@@ -376,9 +376,9 @@ diff -Nur linux-2.6.21.1/net/netfilter/xt_CHAOS.c linux-2.6.21.1-owrt/net/netfil
 | 
			
		||||
+MODULE_DESCRIPTION("netfilter CHAOS target");
 | 
			
		||||
+MODULE_LICENSE("GPL");
 | 
			
		||||
+MODULE_ALIAS("ipt_CHAOS");
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/netfilter/xt_DELUDE.c linux-2.6.21.1-owrt/net/netfilter/xt_DELUDE.c
 | 
			
		||||
--- linux-2.6.21.1/net/netfilter/xt_DELUDE.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/netfilter/xt_DELUDE.c	2007-05-14 14:53:12.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/netfilter/xt_DELUDE.c linux-2.6.21.1.dev/net/netfilter/xt_DELUDE.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/netfilter/xt_DELUDE.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/netfilter/xt_DELUDE.c	2007-05-26 20:40:11.004183528 +0200
 | 
			
		||||
@@ -0,0 +1,288 @@
 | 
			
		||||
+/*
 | 
			
		||||
+	DELUDE target
 | 
			
		||||
@@ -668,9 +668,9 @@ diff -Nur linux-2.6.21.1/net/netfilter/xt_DELUDE.c linux-2.6.21.1-owrt/net/netfi
 | 
			
		||||
+MODULE_DESCRIPTION("netfilter DELUDE target");
 | 
			
		||||
+MODULE_LICENSE("GPL");
 | 
			
		||||
+MODULE_ALIAS("ipt_DELUDE");
 | 
			
		||||
diff -Nur linux-2.6.21.1/net/netfilter/xt_portscan.c linux-2.6.21.1-owrt/net/netfilter/xt_portscan.c
 | 
			
		||||
--- linux-2.6.21.1/net/netfilter/xt_portscan.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/net/netfilter/xt_portscan.c	2007-05-14 14:37:35.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/netfilter/xt_portscan.c linux-2.6.21.1.dev/net/netfilter/xt_portscan.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/netfilter/xt_portscan.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/netfilter/xt_portscan.c	2007-05-26 20:40:11.004183528 +0200
 | 
			
		||||
@@ -0,0 +1,272 @@
 | 
			
		||||
+/*
 | 
			
		||||
+	portscan match for netfilter
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
diff -Naur linux-2.6.20.orig/include/linux/pkt_sched.h linux-2.6.20/include/linux/pkt_sched.h
 | 
			
		||||
--- linux-2.6.20.orig/include/linux/pkt_sched.h	2007-02-04 10:44:54.000000000 -0800
 | 
			
		||||
+++ linux-2.6.20/include/linux/pkt_sched.h	2007-02-14 23:58:41.000000000 -0800
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/pkt_sched.h linux-2.6.21.1.dev/include/linux/pkt_sched.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/pkt_sched.h	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/pkt_sched.h	2007-05-26 20:43:12.530587320 +0200
 | 
			
		||||
@@ -146,8 +146,40 @@
 | 
			
		||||
  *
 | 
			
		||||
  *	The only reason for this is efficiency, it is possible
 | 
			
		||||
@@ -42,9 +42,9 @@ diff -Naur linux-2.6.20.orig/include/linux/pkt_sched.h linux-2.6.20/include/linu
 | 
			
		||||
 /* RED section */
 | 
			
		||||
 
 | 
			
		||||
 enum
 | 
			
		||||
diff -Naur linux-2.6.20.orig/net/sched/Kconfig linux-2.6.20/net/sched/Kconfig
 | 
			
		||||
--- linux-2.6.20.orig/net/sched/Kconfig	2007-02-04 10:44:54.000000000 -0800
 | 
			
		||||
+++ linux-2.6.20/net/sched/Kconfig	2007-02-14 23:58:41.000000000 -0800
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/sched/Kconfig linux-2.6.21.1.dev/net/sched/Kconfig
 | 
			
		||||
--- linux-2.6.21.1.old/net/sched/Kconfig	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/sched/Kconfig	2007-05-26 20:43:12.572580936 +0200
 | 
			
		||||
@@ -189,6 +189,26 @@
 | 
			
		||||
 	  To compile this code as a module, choose M here: the
 | 
			
		||||
 	  module will be called sch_sfq.
 | 
			
		||||
@@ -72,10 +72,10 @@ diff -Naur linux-2.6.20.orig/net/sched/Kconfig linux-2.6.20/net/sched/Kconfig
 | 
			
		||||
 config NET_SCH_TEQL
 | 
			
		||||
 	tristate "True Link Equalizer (TEQL)"
 | 
			
		||||
 	---help---
 | 
			
		||||
diff -Naur linux-2.6.20.orig/net/sched/Makefile linux-2.6.20/net/sched/Makefile
 | 
			
		||||
--- linux-2.6.20.orig/net/sched/Makefile	2007-02-04 10:44:54.000000000 -0800
 | 
			
		||||
+++ linux-2.6.20/net/sched/Makefile	2007-02-14 23:58:41.000000000 -0800
 | 
			
		||||
@@ -24,6 +24,7 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/sched/Makefile linux-2.6.21.1.dev/net/sched/Makefile
 | 
			
		||||
--- linux-2.6.21.1.old/net/sched/Makefile	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/sched/Makefile	2007-05-26 20:43:12.577580176 +0200
 | 
			
		||||
@@ -23,6 +23,7 @@
 | 
			
		||||
 obj-$(CONFIG_NET_SCH_INGRESS)	+= sch_ingress.o 
 | 
			
		||||
 obj-$(CONFIG_NET_SCH_DSMARK)	+= sch_dsmark.o
 | 
			
		||||
 obj-$(CONFIG_NET_SCH_SFQ)	+= sch_sfq.o
 | 
			
		||||
@@ -83,9 +83,9 @@ diff -Naur linux-2.6.20.orig/net/sched/Makefile linux-2.6.20/net/sched/Makefile
 | 
			
		||||
 obj-$(CONFIG_NET_SCH_TBF)	+= sch_tbf.o
 | 
			
		||||
 obj-$(CONFIG_NET_SCH_TEQL)	+= sch_teql.o
 | 
			
		||||
 obj-$(CONFIG_NET_SCH_PRIO)	+= sch_prio.o
 | 
			
		||||
diff -Naur linux-2.6.20.orig/net/sched/sch_esfq.c linux-2.6.20/net/sched/sch_esfq.c
 | 
			
		||||
--- linux-2.6.20.orig/net/sched/sch_esfq.c	1969-12-31 16:00:00.000000000 -0800
 | 
			
		||||
+++ linux-2.6.20/net/sched/sch_esfq.c	2007-02-15 00:19:56.000000000 -0800
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/sched/sch_esfq.c linux-2.6.21.1.dev/net/sched/sch_esfq.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/sched/sch_esfq.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/sched/sch_esfq.c	2007-05-26 20:43:12.578580024 +0200
 | 
			
		||||
@@ -0,0 +1,704 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * net/sched/sch_esfq.c	Extended Stochastic Fairness Queueing discipline.
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
diff -urN linux-2.6.21.1/include/linux/netfilter_ipv4/ip_nat.h linux-2.6.21.1.new/include/linux/netfilter_ipv4/ip_nat.h
 | 
			
		||||
--- linux-2.6.21.1/include/linux/netfilter_ipv4/ip_nat.h	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.new/include/linux/netfilter_ipv4/ip_nat.h	2007-05-14 12:57:39.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_nat.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_nat.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_nat.h	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_nat.h	2007-05-26 20:46:11.801334024 +0200
 | 
			
		||||
@@ -64,6 +64,13 @@
 | 
			
		||||
 
 | 
			
		||||
 struct ip_conntrack;
 | 
			
		||||
@@ -15,9 +15,9 @@ diff -urN linux-2.6.21.1/include/linux/netfilter_ipv4/ip_nat.h linux-2.6.21.1.ne
 | 
			
		||||
 /* Set up the info structure to map into this range. */
 | 
			
		||||
 extern unsigned int ip_nat_setup_info(struct ip_conntrack *conntrack,
 | 
			
		||||
 				      const struct ip_nat_range *range,
 | 
			
		||||
diff -urN linux-2.6.21.1/include/linux/rtnetlink.h linux-2.6.21.1.new/include/linux/rtnetlink.h
 | 
			
		||||
--- linux-2.6.21.1/include/linux/rtnetlink.h	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.new/include/linux/rtnetlink.h	2007-05-14 12:57:39.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/rtnetlink.h linux-2.6.21.1.dev/include/linux/rtnetlink.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/rtnetlink.h	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/rtnetlink.h	2007-05-26 20:46:11.883321560 +0200
 | 
			
		||||
@@ -293,6 +293,8 @@
 | 
			
		||||
 #define RTNH_F_DEAD		1	/* Nexthop is dead (used by multipath)	*/
 | 
			
		||||
 #define RTNH_F_PERVASIVE	2	/* Do recursive gateway lookup	*/
 | 
			
		||||
@@ -27,9 +27,9 @@ diff -urN linux-2.6.21.1/include/linux/rtnetlink.h linux-2.6.21.1.new/include/li
 | 
			
		||||
 
 | 
			
		||||
 /* Macros to handle hexthops */
 | 
			
		||||
 
 | 
			
		||||
diff -urN linux-2.6.21.1/include/net/flow.h linux-2.6.21.1.new/include/net/flow.h
 | 
			
		||||
--- linux-2.6.21.1/include/net/flow.h	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.new/include/net/flow.h	2007-05-14 13:00:27.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/net/flow.h linux-2.6.21.1.dev/include/net/flow.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/net/flow.h	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/net/flow.h	2007-05-26 20:46:11.922315632 +0200
 | 
			
		||||
@@ -19,6 +19,8 @@
 | 
			
		||||
 		struct {
 | 
			
		||||
 			__be32			daddr;
 | 
			
		||||
@@ -48,9 +48,9 @@ diff -urN linux-2.6.21.1/include/net/flow.h linux-2.6.21.1.new/include/net/flow.
 | 
			
		||||
 #define fl4_tos		nl_u.ip4_u.tos
 | 
			
		||||
 #define fl4_scope	nl_u.ip4_u.scope
 | 
			
		||||
 
 | 
			
		||||
diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
 | 
			
		||||
--- linux-2.6.21.1/net/ipv4/route.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.new/net/ipv4/route.c	2007-05-14 13:09:24.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.c
 | 
			
		||||
--- linux-2.6.21.1.old/net/ipv4/route.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/net/ipv4/route.c	2007-05-26 20:46:11.967308792 +0200
 | 
			
		||||
@@ -1208,6 +1208,7 @@
 | 
			
		||||
 
 | 
			
		||||
 				/* Gateway is different ... */
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
diff -urN linux-2.6.19.old/arch/mips/Makefile linux-2.6.19.dev/arch/mips/Makefile
 | 
			
		||||
--- linux-2.6.19.old/arch/mips/Makefile	2006-11-29 22:57:37.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/arch/mips/Makefile	2006-12-14 03:13:55.000000000 +0100
 | 
			
		||||
@@ -600,6 +600,9 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/arch/mips/Makefile linux-2.6.21.1.dev/arch/mips/Makefile
 | 
			
		||||
--- linux-2.6.21.1.old/arch/mips/Makefile	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/arch/mips/Makefile	2007-05-26 20:49:09.358341256 +0200
 | 
			
		||||
@@ -605,6 +605,9 @@
 | 
			
		||||
 core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/common/
 | 
			
		||||
 load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/jffs2/build.c linux-2.6.19.dev/fs/jffs2/build.c
 | 
			
		||||
--- linux-2.6.19.old/fs/jffs2/build.c	2006-11-29 22:57:37.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/jffs2/build.c	2006-12-14 03:13:57.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/jffs2/build.c linux-2.6.21.1.dev/fs/jffs2/build.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/jffs2/build.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/jffs2/build.c	2007-05-26 20:52:04.425726968 +0200
 | 
			
		||||
@@ -107,6 +107,17 @@
 | 
			
		||||
 	dbg_fsbuild("scanned flash completely\n");
 | 
			
		||||
 	jffs2_dbg_dump_block_lists_nolock(c);
 | 
			
		||||
@@ -19,10 +19,10 @@ diff -urN linux-2.6.19.old/fs/jffs2/build.c linux-2.6.19.dev/fs/jffs2/build.c
 | 
			
		||||
 	dbg_fsbuild("pass 1 starting\n");
 | 
			
		||||
 	c->flags |= JFFS2_SB_FLAG_BUILDING;
 | 
			
		||||
 	/* Now scan the directory tree, increasing nlink according to every dirent found. */
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/jffs2/scan.c linux-2.6.19.dev/fs/jffs2/scan.c
 | 
			
		||||
--- linux-2.6.19.old/fs/jffs2/scan.c	2006-11-29 22:57:37.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/jffs2/scan.c	2006-12-14 03:13:57.000000000 +0100
 | 
			
		||||
@@ -141,9 +141,12 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/jffs2/scan.c linux-2.6.21.1.dev/fs/jffs2/scan.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/jffs2/scan.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/jffs2/scan.c	2007-05-26 20:52:04.491716936 +0200
 | 
			
		||||
@@ -143,9 +143,12 @@
 | 
			
		||||
 
 | 
			
		||||
 		/* reset summary info for next eraseblock scan */
 | 
			
		||||
 		jffs2_sum_reset_collected(s);
 | 
			
		||||
@@ -38,7 +38,7 @@ diff -urN linux-2.6.19.old/fs/jffs2/scan.c linux-2.6.19.dev/fs/jffs2/scan.c
 | 
			
		||||
 
 | 
			
		||||
 		if (ret < 0)
 | 
			
		||||
 			goto out;
 | 
			
		||||
@@ -540,6 +543,17 @@
 | 
			
		||||
@@ -546,6 +549,17 @@
 | 
			
		||||
 			return err;
 | 
			
		||||
 	}
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
diff -urN linux-2.6.19.old/include/asm-powerpc/segment.h linux-2.6.19.dev/include/asm-powerpc/segment.h
 | 
			
		||||
--- linux-2.6.19.old/include/asm-powerpc/segment.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/include/asm-powerpc/segment.h	2006-12-14 03:13:59.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/asm-powerpc/segment.h linux-2.6.21.1.dev/include/asm-powerpc/segment.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/asm-powerpc/segment.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/asm-powerpc/segment.h	2007-05-26 20:55:12.738099136 +0200
 | 
			
		||||
@@ -0,0 +1,6 @@
 | 
			
		||||
+#ifndef _ASM_SEGMENT_H
 | 
			
		||||
+#define _ASM_SEGMENT_H
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
diff -urN linux-2.6.19.old/drivers/net/r8169.c linux-2.6.19.dev/drivers/net/r8169.c
 | 
			
		||||
--- linux-2.6.19.old/drivers/net/r8169.c	2006-11-29 22:57:37.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/drivers/net/r8169.c	2006-12-14 03:14:01.000000000 +0100
 | 
			
		||||
@@ -491,7 +491,7 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/drivers/net/r8169.c linux-2.6.21.1.dev/drivers/net/r8169.c
 | 
			
		||||
--- linux-2.6.21.1.old/drivers/net/r8169.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/drivers/net/r8169.c	2007-05-26 20:58:17.370030816 +0200
 | 
			
		||||
@@ -494,7 +494,7 @@
 | 
			
		||||
 #endif
 | 
			
		||||
 
 | 
			
		||||
 static const u16 rtl8169_intr_mask =
 | 
			
		||||
@@ -10,7 +10,7 @@ diff -urN linux-2.6.19.old/drivers/net/r8169.c linux-2.6.19.dev/drivers/net/r816
 | 
			
		||||
 static const u16 rtl8169_napi_event =
 | 
			
		||||
 	RxOK | RxOverflow | RxFIFOOver | TxOK | TxErr;
 | 
			
		||||
 static const unsigned int rtl8169_rx_config =
 | 
			
		||||
@@ -2584,10 +2584,12 @@
 | 
			
		||||
@@ -2652,10 +2652,12 @@
 | 
			
		||||
 		if (!(status & rtl8169_intr_mask))
 | 
			
		||||
 			break;
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/Kconfig linux-2.6.19.dev/fs/Kconfig
 | 
			
		||||
--- linux-2.6.19.old/fs/Kconfig	2006-12-14 03:13:20.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/Kconfig	2006-12-14 03:14:03.000000000 +0100
 | 
			
		||||
@@ -468,6 +468,9 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/Kconfig linux-2.6.21.1.dev/fs/Kconfig
 | 
			
		||||
--- linux-2.6.21.1.old/fs/Kconfig	2007-05-26 19:03:45.497714200 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/Kconfig	2007-05-26 21:01:26.154331240 +0200
 | 
			
		||||
@@ -461,6 +461,9 @@
 | 
			
		||||
 	  This option will enlarge your kernel, but it allows debugging of
 | 
			
		||||
 	  ocfs2 filesystem issues.
 | 
			
		||||
 
 | 
			
		||||
@@ -11,10 +11,10 @@ diff -urN linux-2.6.19.old/fs/Kconfig linux-2.6.19.dev/fs/Kconfig
 | 
			
		||||
 config MINIX_FS
 | 
			
		||||
 	tristate "Minix fs support"
 | 
			
		||||
 	help
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/Makefile linux-2.6.19.dev/fs/Makefile
 | 
			
		||||
--- linux-2.6.19.old/fs/Makefile	2006-12-14 03:13:20.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/Makefile	2006-12-14 03:14:03.000000000 +0100
 | 
			
		||||
@@ -71,6 +71,7 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/Makefile linux-2.6.21.1.dev/fs/Makefile
 | 
			
		||||
--- linux-2.6.21.1.old/fs/Makefile	2007-05-26 19:03:45.497714200 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/Makefile	2007-05-26 21:01:26.160330328 +0200
 | 
			
		||||
@@ -72,6 +72,7 @@
 | 
			
		||||
 obj-$(CONFIG_RAMFS)		+= ramfs/
 | 
			
		||||
 obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
 | 
			
		||||
 obj-$(CONFIG_CODA_FS)		+= coda/
 | 
			
		||||
@@ -22,9 +22,9 @@ diff -urN linux-2.6.19.old/fs/Makefile linux-2.6.19.dev/fs/Makefile
 | 
			
		||||
 obj-$(CONFIG_MINIX_FS)		+= minix/
 | 
			
		||||
 obj-$(CONFIG_FAT_FS)		+= fat/
 | 
			
		||||
 obj-$(CONFIG_MSDOS_FS)		+= msdos/
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/mini_fo/aux.c linux-2.6.19.dev/fs/mini_fo/aux.c
 | 
			
		||||
--- linux-2.6.19.old/fs/mini_fo/aux.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/mini_fo/aux.c	2006-12-14 03:14:03.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/mini_fo/aux.c linux-2.6.21.1.dev/fs/mini_fo/aux.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/mini_fo/aux.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/mini_fo/aux.c	2007-05-26 21:01:26.160330328 +0200
 | 
			
		||||
@@ -0,0 +1,580 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * Copyright (c) 1997-2003 Erez Zadok
 | 
			
		||||
@@ -606,9 +606,9 @@ diff -urN linux-2.6.19.old/fs/mini_fo/aux.c linux-2.6.19.dev/fs/mini_fo/aux.c
 | 
			
		||||
+
 | 
			
		||||
+#endif /* unused */
 | 
			
		||||
+
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/mini_fo/ChangeLog linux-2.6.19.dev/fs/mini_fo/ChangeLog
 | 
			
		||||
--- linux-2.6.19.old/fs/mini_fo/ChangeLog	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/mini_fo/ChangeLog	2006-12-14 03:14:03.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/mini_fo/ChangeLog linux-2.6.21.1.dev/fs/mini_fo/ChangeLog
 | 
			
		||||
--- linux-2.6.21.1.old/fs/mini_fo/ChangeLog	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/mini_fo/ChangeLog	2007-05-26 21:01:26.161330176 +0200
 | 
			
		||||
@@ -0,0 +1,281 @@
 | 
			
		||||
+2006-01-24  Markus Klotzbuecher  <mk@mary.denx.de>
 | 
			
		||||
+
 | 
			
		||||
@@ -891,9 +891,9 @@ diff -urN linux-2.6.19.old/fs/mini_fo/ChangeLog linux-2.6.19.dev/fs/mini_fo/Chan
 | 
			
		||||
+	* Implementation of mini_fo_mknod and mini_fo_rename, support
 | 
			
		||||
+          for device files.
 | 
			
		||||
+	
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/mini_fo/dentry.c linux-2.6.19.dev/fs/mini_fo/dentry.c
 | 
			
		||||
--- linux-2.6.19.old/fs/mini_fo/dentry.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/mini_fo/dentry.c	2006-12-14 03:14:03.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/mini_fo/dentry.c linux-2.6.21.1.dev/fs/mini_fo/dentry.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/mini_fo/dentry.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/mini_fo/dentry.c	2007-05-26 21:01:26.161330176 +0200
 | 
			
		||||
@@ -0,0 +1,244 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * Copyright (c) 1997-2003 Erez Zadok
 | 
			
		||||
@@ -1139,9 +1139,9 @@ diff -urN linux-2.6.19.old/fs/mini_fo/dentry.c linux-2.6.19.dev/fs/mini_fo/dentr
 | 
			
		||||
+	d_delete:		mini_fo_d_delete,
 | 
			
		||||
+	d_iput:		mini_fo_d_iput,
 | 
			
		||||
+};
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/mini_fo/file.c linux-2.6.19.dev/fs/mini_fo/file.c
 | 
			
		||||
--- linux-2.6.19.old/fs/mini_fo/file.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/mini_fo/file.c	2006-12-14 03:14:03.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/mini_fo/file.c linux-2.6.21.1.dev/fs/mini_fo/file.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/mini_fo/file.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/mini_fo/file.c	2007-05-26 21:01:26.162330024 +0200
 | 
			
		||||
@@ -0,0 +1,713 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * Copyright (c) 1997-2003 Erez Zadok
 | 
			
		||||
@@ -1856,9 +1856,9 @@ diff -urN linux-2.6.19.old/fs/mini_fo/file.c linux-2.6.19.dev/fs/mini_fo/file.c
 | 
			
		||||
+		/* not implemented: sendpage */
 | 
			
		||||
+		/* not implemented: get_unmapped_area */
 | 
			
		||||
+	};
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/mini_fo/fist.h linux-2.6.19.dev/fs/mini_fo/fist.h
 | 
			
		||||
--- linux-2.6.19.old/fs/mini_fo/fist.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/mini_fo/fist.h	2006-12-14 03:14:03.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/mini_fo/fist.h linux-2.6.21.1.dev/fs/mini_fo/fist.h
 | 
			
		||||
--- linux-2.6.21.1.old/fs/mini_fo/fist.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/mini_fo/fist.h	2007-05-26 21:01:26.162330024 +0200
 | 
			
		||||
@@ -0,0 +1,252 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * Copyright (c) 1997-2003 Erez Zadok
 | 
			
		||||
@@ -2112,9 +2112,9 @@ diff -urN linux-2.6.19.old/fs/mini_fo/fist.h linux-2.6.19.dev/fs/mini_fo/fist.h
 | 
			
		||||
+# define FIST_IOCTL_SET_DEBUG_VALUE	_IOW(0x15, 2, int)
 | 
			
		||||
+
 | 
			
		||||
+#endif /* not __FIST_H_ */
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/mini_fo/inode.c linux-2.6.19.dev/fs/mini_fo/inode.c
 | 
			
		||||
--- linux-2.6.19.old/fs/mini_fo/inode.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/mini_fo/inode.c	2006-12-14 03:14:03.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/mini_fo/inode.c linux-2.6.21.1.dev/fs/mini_fo/inode.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/mini_fo/inode.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/mini_fo/inode.c	2007-05-26 21:01:26.164329720 +0200
 | 
			
		||||
@@ -0,0 +1,1573 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * Copyright (c) 1997-2003 Erez Zadok
 | 
			
		||||
@@ -3689,9 +3689,9 @@ diff -urN linux-2.6.19.old/fs/mini_fo/inode.c linux-2.6.19.dev/fs/mini_fo/inode.
 | 
			
		||||
+		removexattr:    mini_fo_removexattr
 | 
			
		||||
+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
 | 
			
		||||
+	};
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/mini_fo/main.c linux-2.6.19.dev/fs/mini_fo/main.c
 | 
			
		||||
--- linux-2.6.19.old/fs/mini_fo/main.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/mini_fo/main.c	2006-12-14 03:14:03.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/mini_fo/main.c linux-2.6.21.1.dev/fs/mini_fo/main.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/mini_fo/main.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/mini_fo/main.c	2007-05-26 21:01:26.164329720 +0200
 | 
			
		||||
@@ -0,0 +1,423 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * Copyright (c) 1997-2003 Erez Zadok
 | 
			
		||||
@@ -4116,9 +4116,9 @@ diff -urN linux-2.6.19.old/fs/mini_fo/main.c linux-2.6.19.dev/fs/mini_fo/main.c
 | 
			
		||||
+
 | 
			
		||||
+module_init(init_mini_fo_fs)
 | 
			
		||||
+module_exit(exit_mini_fo_fs)
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/mini_fo/Makefile linux-2.6.19.dev/fs/mini_fo/Makefile
 | 
			
		||||
--- linux-2.6.19.old/fs/mini_fo/Makefile	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/mini_fo/Makefile	2006-12-14 03:14:03.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/mini_fo/Makefile linux-2.6.21.1.dev/fs/mini_fo/Makefile
 | 
			
		||||
--- linux-2.6.21.1.old/fs/mini_fo/Makefile	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/mini_fo/Makefile	2007-05-26 21:01:26.164329720 +0200
 | 
			
		||||
@@ -0,0 +1,17 @@
 | 
			
		||||
+#
 | 
			
		||||
+# Makefile for mini_fo 2.4 and 2.6 Linux kernels
 | 
			
		||||
@@ -4137,9 +4137,9 @@ diff -urN linux-2.6.19.old/fs/mini_fo/Makefile linux-2.6.19.dev/fs/mini_fo/Makef
 | 
			
		||||
+# dependencies
 | 
			
		||||
+${mini_fo-objs}: mini_fo.h fist.h
 | 
			
		||||
+
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/mini_fo/meta.c linux-2.6.19.dev/fs/mini_fo/meta.c
 | 
			
		||||
--- linux-2.6.19.old/fs/mini_fo/meta.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/mini_fo/meta.c	2006-12-14 03:14:03.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/mini_fo/meta.c linux-2.6.21.1.dev/fs/mini_fo/meta.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/mini_fo/meta.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/mini_fo/meta.c	2007-05-26 21:01:26.166329416 +0200
 | 
			
		||||
@@ -0,0 +1,1000 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
 | 
			
		||||
@@ -5141,9 +5141,9 @@ diff -urN linux-2.6.19.old/fs/mini_fo/meta.c linux-2.6.19.dev/fs/mini_fo/meta.c
 | 
			
		||||
+	return 0;
 | 
			
		||||
+}
 | 
			
		||||
+
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/mini_fo/mini_fo.h linux-2.6.19.dev/fs/mini_fo/mini_fo.h
 | 
			
		||||
--- linux-2.6.19.old/fs/mini_fo/mini_fo.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/mini_fo/mini_fo.h	2006-12-14 03:14:03.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/mini_fo/mini_fo.h linux-2.6.21.1.dev/fs/mini_fo/mini_fo.h
 | 
			
		||||
--- linux-2.6.21.1.old/fs/mini_fo/mini_fo.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/mini_fo/mini_fo.h	2007-05-26 21:01:26.167329264 +0200
 | 
			
		||||
@@ -0,0 +1,510 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * Copyright (c) 1997-2003 Erez Zadok
 | 
			
		||||
@@ -5655,9 +5655,9 @@ diff -urN linux-2.6.19.old/fs/mini_fo/mini_fo.h linux-2.6.19.dev/fs/mini_fo/mini
 | 
			
		||||
+/* ioctls */
 | 
			
		||||
+
 | 
			
		||||
+#endif	/* not __MINI_FO_H_ */
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/mini_fo/mini_fo-merge linux-2.6.19.dev/fs/mini_fo/mini_fo-merge
 | 
			
		||||
--- linux-2.6.19.old/fs/mini_fo/mini_fo-merge	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/mini_fo/mini_fo-merge	2006-12-14 03:14:03.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/mini_fo/mini_fo-merge linux-2.6.21.1.dev/fs/mini_fo/mini_fo-merge
 | 
			
		||||
--- linux-2.6.21.1.old/fs/mini_fo/mini_fo-merge	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/mini_fo/mini_fo-merge	2007-05-26 21:01:26.167329264 +0200
 | 
			
		||||
@@ -0,0 +1,180 @@
 | 
			
		||||
+#!/bin/bash
 | 
			
		||||
+#
 | 
			
		||||
@@ -5839,9 +5839,9 @@ diff -urN linux-2.6.19.old/fs/mini_fo/mini_fo-merge linux-2.6.19.dev/fs/mini_fo/
 | 
			
		||||
+#rm $TMP/$SKIP_DEL_LIST 
 | 
			
		||||
+
 | 
			
		||||
+echo "Done!"
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/mini_fo/mini_fo-overlay linux-2.6.19.dev/fs/mini_fo/mini_fo-overlay
 | 
			
		||||
--- linux-2.6.19.old/fs/mini_fo/mini_fo-overlay	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/mini_fo/mini_fo-overlay	2006-12-14 03:14:03.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/mini_fo/mini_fo-overlay linux-2.6.21.1.dev/fs/mini_fo/mini_fo-overlay
 | 
			
		||||
--- linux-2.6.21.1.old/fs/mini_fo/mini_fo-overlay	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/mini_fo/mini_fo-overlay	2007-05-26 21:01:26.167329264 +0200
 | 
			
		||||
@@ -0,0 +1,130 @@
 | 
			
		||||
+#!/bin/bash
 | 
			
		||||
+#
 | 
			
		||||
@@ -5973,9 +5973,9 @@ diff -urN linux-2.6.19.old/fs/mini_fo/mini_fo-overlay linux-2.6.19.dev/fs/mini_f
 | 
			
		||||
+if [ $? -ne 0 ]; then
 | 
			
		||||
+    echo "Error, mounting failed, maybe no permisson to mount?"
 | 
			
		||||
+fi
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/mini_fo/mmap.c linux-2.6.19.dev/fs/mini_fo/mmap.c
 | 
			
		||||
--- linux-2.6.19.old/fs/mini_fo/mmap.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/mini_fo/mmap.c	2006-12-14 03:14:03.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/mini_fo/mmap.c linux-2.6.21.1.dev/fs/mini_fo/mmap.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/mini_fo/mmap.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/mini_fo/mmap.c	2007-05-26 21:01:26.168329112 +0200
 | 
			
		||||
@@ -0,0 +1,637 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * Copyright (c) 1997-2003 Erez Zadok
 | 
			
		||||
@@ -6614,9 +6614,9 @@ diff -urN linux-2.6.19.old/fs/mini_fo/mmap.c linux-2.6.19.dev/fs/mini_fo/mmap.c
 | 
			
		||||
+	print_exit_status(err);
 | 
			
		||||
+	return err;
 | 
			
		||||
+}
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/mini_fo/README linux-2.6.19.dev/fs/mini_fo/README
 | 
			
		||||
--- linux-2.6.19.old/fs/mini_fo/README	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/mini_fo/README	2006-12-14 03:14:03.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/mini_fo/README linux-2.6.21.1.dev/fs/mini_fo/README
 | 
			
		||||
--- linux-2.6.21.1.old/fs/mini_fo/README	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/mini_fo/README	2007-05-26 21:01:26.168329112 +0200
 | 
			
		||||
@@ -0,0 +1,163 @@
 | 
			
		||||
+README for the mini_fo overlay file system
 | 
			
		||||
+=========================================
 | 
			
		||||
@@ -6781,9 +6781,9 @@ diff -urN linux-2.6.19.old/fs/mini_fo/README linux-2.6.19.dev/fs/mini_fo/README
 | 
			
		||||
+2 of the License, or (at your option) any later version.
 | 
			
		||||
+
 | 
			
		||||
+
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/mini_fo/RELEASE_NOTES linux-2.6.19.dev/fs/mini_fo/RELEASE_NOTES
 | 
			
		||||
--- linux-2.6.19.old/fs/mini_fo/RELEASE_NOTES	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/mini_fo/RELEASE_NOTES	2006-12-14 03:14:03.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/mini_fo/RELEASE_NOTES linux-2.6.21.1.dev/fs/mini_fo/RELEASE_NOTES
 | 
			
		||||
--- linux-2.6.21.1.old/fs/mini_fo/RELEASE_NOTES	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/mini_fo/RELEASE_NOTES	2007-05-26 21:01:26.168329112 +0200
 | 
			
		||||
@@ -0,0 +1,111 @@
 | 
			
		||||
+Release:	mini_fo-0.6.1 (v0-6-1)
 | 
			
		||||
+Date:		21.09.2005
 | 
			
		||||
@@ -6896,9 +6896,9 @@ diff -urN linux-2.6.19.old/fs/mini_fo/RELEASE_NOTES linux-2.6.19.dev/fs/mini_fo/
 | 
			
		||||
+original state. I hope to fix this someday. Please note that this does
 | 
			
		||||
+not effect the special hard links '.' and '..', that are handled
 | 
			
		||||
+seperately by the lower fs.
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/mini_fo/state.c linux-2.6.19.dev/fs/mini_fo/state.c
 | 
			
		||||
--- linux-2.6.19.old/fs/mini_fo/state.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/mini_fo/state.c	2006-12-14 03:14:03.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/mini_fo/state.c linux-2.6.21.1.dev/fs/mini_fo/state.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/mini_fo/state.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/mini_fo/state.c	2007-05-26 21:01:26.169328960 +0200
 | 
			
		||||
@@ -0,0 +1,620 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
 | 
			
		||||
@@ -7520,9 +7520,9 @@ diff -urN linux-2.6.19.old/fs/mini_fo/state.c linux-2.6.19.dev/fs/mini_fo/state.
 | 
			
		||||
+	return err;
 | 
			
		||||
+}
 | 
			
		||||
+
 | 
			
		||||
diff -urN linux-2.6.19.old/fs/mini_fo/super.c linux-2.6.19.dev/fs/mini_fo/super.c
 | 
			
		||||
--- linux-2.6.19.old/fs/mini_fo/super.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/fs/mini_fo/super.c	2006-12-14 03:14:03.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/mini_fo/super.c linux-2.6.21.1.dev/fs/mini_fo/super.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/mini_fo/super.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/mini_fo/super.c	2007-05-26 21:01:26.169328960 +0200
 | 
			
		||||
@@ -0,0 +1,281 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * Copyright (c) 1997-2003 Erez Zadok
 | 
			
		||||
 
 | 
			
		||||
@@ -1,11 +1,12 @@
 | 
			
		||||
--- linux.old/include/linux/netdevice.h	2006-12-30 18:49:37.916951328 +0100
 | 
			
		||||
+++ linux.dev/include/linux/netdevice.h	2006-12-30 18:49:49.573179312 +0100
 | 
			
		||||
@@ -526,6 +526,8 @@
 | 
			
		||||
 	struct class_device	class_dev;
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/netdevice.h linux-2.6.21.1.dev/include/linux/netdevice.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/netdevice.h	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/netdevice.h	2007-05-26 21:04:21.537668920 +0200
 | 
			
		||||
@@ -532,6 +532,8 @@
 | 
			
		||||
 	struct device		dev;
 | 
			
		||||
 	/* space for optional statistics and wireless sysfs groups */
 | 
			
		||||
 	struct attribute_group  *sysfs_groups[3];
 | 
			
		||||
+	
 | 
			
		||||
+	void *ieee80211_ptr;
 | 
			
		||||
 };
 | 
			
		||||
 #define to_net_dev(d) container_of(d, struct net_device, dev)
 | 
			
		||||
 
 | 
			
		||||
 #define	NETDEV_ALIGN		32
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,7 @@
 | 
			
		||||
--- linux.old/drivers/mtd/devices/block2mtd.c	2007-02-01 20:13:47.147274772 +0100
 | 
			
		||||
+++ linux/drivers/mtd/devices/block2mtd.c	2007-02-01 20:19:59.753034993 +0100
 | 
			
		||||
@@ -40,7 +40,7 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c linux-2.6.21.1.dev/drivers/mtd/devices/block2mtd.c
 | 
			
		||||
--- linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c	2007-05-26 20:13:39.192175736 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/drivers/mtd/devices/block2mtd.c	2007-05-26 21:07:17.921854448 +0200
 | 
			
		||||
@@ -41,7 +41,7 @@
 | 
			
		||||
 static LIST_HEAD(blkmtd_device_list);
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,7 @@
 | 
			
		||||
--- linux.dev/drivers/mtd/devices/block2mtd.c.old	2007-02-18 14:08:59.519952312 +0100
 | 
			
		||||
+++ linux.dev/drivers/mtd/devices/block2mtd.c	2007-02-18 14:09:04.219237912 +0100
 | 
			
		||||
@@ -111,7 +111,7 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c linux-2.6.21.1.dev/drivers/mtd/devices/block2mtd.c
 | 
			
		||||
--- linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c	2007-05-26 21:10:15.776816384 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/drivers/mtd/devices/block2mtd.c	2007-05-26 21:10:16.513704360 +0200
 | 
			
		||||
@@ -112,7 +112,7 @@
 | 
			
		||||
 		if (IS_ERR(page))
 | 
			
		||||
 			return PTR_ERR(page);
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/Kconfig linux-2.6.21.1-owrt/fs/Kconfig
 | 
			
		||||
--- linux-2.6.21.1/fs/Kconfig	2007-05-14 10:49:47.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/Kconfig	2007-05-14 11:53:15.000000000 +0200
 | 
			
		||||
@@ -1189,6 +1189,8 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/Kconfig linux-2.6.21.1.dev/fs/Kconfig
 | 
			
		||||
--- linux-2.6.21.1.old/fs/Kconfig	2007-05-26 21:04:21.321701752 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/Kconfig	2007-05-26 21:13:40.641672192 +0200
 | 
			
		||||
@@ -1192,6 +1192,8 @@
 | 
			
		||||
 	  To compile the EFS file system support as a module, choose M here: the
 | 
			
		||||
 	  module will be called efs.
 | 
			
		||||
 
 | 
			
		||||
@@ -10,17 +10,17 @@ diff -Nur linux-2.6.21.1/fs/Kconfig linux-2.6.21.1-owrt/fs/Kconfig
 | 
			
		||||
 config JFFS2_FS
 | 
			
		||||
 	tristate "Journalling Flash File System v2 (JFFS2) support"
 | 
			
		||||
 	select CRC32
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/Makefile linux-2.6.21.1-owrt/fs/Makefile
 | 
			
		||||
--- linux-2.6.21.1/fs/Makefile	2007-05-14 10:49:47.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/Makefile	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
@@ -115,3 +115,4 @@
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/Makefile linux-2.6.21.1.dev/fs/Makefile
 | 
			
		||||
--- linux-2.6.21.1.old/fs/Makefile	2007-05-26 21:04:21.321701752 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/Makefile	2007-05-26 21:13:40.641672192 +0200
 | 
			
		||||
@@ -116,3 +116,4 @@
 | 
			
		||||
 obj-$(CONFIG_DEBUG_FS)		+= debugfs/
 | 
			
		||||
 obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
 | 
			
		||||
 obj-$(CONFIG_GFS2_FS)           += gfs2/
 | 
			
		||||
+obj-$(CONFIG_YAFFS_FS)		+= yaffs2/
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/devextras.h linux-2.6.21.1-owrt/fs/yaffs2/devextras.h
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/devextras.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/devextras.h	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/devextras.h linux-2.6.21.1.dev/fs/yaffs2/devextras.h
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/devextras.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/devextras.h	2007-05-26 21:13:40.683665808 +0200
 | 
			
		||||
@@ -0,0 +1,265 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * YAFFS: Yet another FFS. A NAND-flash specific file system. 
 | 
			
		||||
@@ -287,9 +287,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/devextras.h linux-2.6.21.1-owrt/fs/yaffs2/dev
 | 
			
		||||
+#endif
 | 
			
		||||
+
 | 
			
		||||
+#endif
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/Kconfig linux-2.6.21.1-owrt/fs/yaffs2/Kconfig
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/Kconfig	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/Kconfig	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/Kconfig linux-2.6.21.1.dev/fs/yaffs2/Kconfig
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/Kconfig	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/Kconfig	2007-05-26 21:13:40.683665808 +0200
 | 
			
		||||
@@ -0,0 +1,135 @@
 | 
			
		||||
+#
 | 
			
		||||
+# YAFFS file system configurations
 | 
			
		||||
@@ -426,9 +426,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/Kconfig linux-2.6.21.1-owrt/fs/yaffs2/Kconfig
 | 
			
		||||
+	  but makes look-ups faster.
 | 
			
		||||
+
 | 
			
		||||
+	  If unsure, say Y.
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/Makefile linux-2.6.21.1-owrt/fs/yaffs2/Makefile
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/Makefile	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/Makefile	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/Makefile linux-2.6.21.1.dev/fs/yaffs2/Makefile
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/Makefile	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/Makefile	2007-05-26 21:13:40.683665808 +0200
 | 
			
		||||
@@ -0,0 +1,10 @@
 | 
			
		||||
+#
 | 
			
		||||
+# Makefile for the linux YAFFS filesystem routines.
 | 
			
		||||
@@ -440,9 +440,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/Makefile linux-2.6.21.1-owrt/fs/yaffs2/Makefi
 | 
			
		||||
+yaffs-y += yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
 | 
			
		||||
+yaffs-y += yaffs_tagscompat.o yaffs_tagsvalidity.o
 | 
			
		||||
+yaffs-y += yaffs_mtdif.o yaffs_mtdif2.o
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/moduleconfig.h linux-2.6.21.1-owrt/fs/yaffs2/moduleconfig.h
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/moduleconfig.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/moduleconfig.h	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/moduleconfig.h linux-2.6.21.1.dev/fs/yaffs2/moduleconfig.h
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/moduleconfig.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/moduleconfig.h	2007-05-26 21:13:40.684665656 +0200
 | 
			
		||||
@@ -0,0 +1,32 @@
 | 
			
		||||
+#ifndef __YAFFS_CONFIG_H__
 | 
			
		||||
+#define __YAFFS_CONFIG_H__
 | 
			
		||||
@@ -476,9 +476,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/moduleconfig.h linux-2.6.21.1-owrt/fs/yaffs2/
 | 
			
		||||
+#endif /* YAFFS_OUT_OF_TREE */
 | 
			
		||||
+
 | 
			
		||||
+#endif /* __YAFFS_CONFIG_H__ */
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_checkptrw.c linux-2.6.21.1-owrt/fs/yaffs2/yaffs_checkptrw.c
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_checkptrw.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_checkptrw.c	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_checkptrw.c linux-2.6.21.1.dev/fs/yaffs2/yaffs_checkptrw.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_checkptrw.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_checkptrw.c	2007-05-26 21:13:40.684665656 +0200
 | 
			
		||||
@@ -0,0 +1,384 @@
 | 
			
		||||
+/* YAFFS: Yet another FFS. A NAND-flash specific file system. 
 | 
			
		||||
+ *
 | 
			
		||||
@@ -864,9 +864,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_checkptrw.c linux-2.6.21.1-owrt/fs/yaff
 | 
			
		||||
+
 | 
			
		||||
+
 | 
			
		||||
+
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_checkptrw.h linux-2.6.21.1-owrt/fs/yaffs2/yaffs_checkptrw.h
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_checkptrw.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_checkptrw.h	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_checkptrw.h linux-2.6.21.1.dev/fs/yaffs2/yaffs_checkptrw.h
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_checkptrw.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_checkptrw.h	2007-05-26 21:13:40.684665656 +0200
 | 
			
		||||
@@ -0,0 +1,18 @@
 | 
			
		||||
+#ifndef __YAFFS_CHECKPTRW_H__
 | 
			
		||||
+#define __YAFFS_CHECKPTRW_H__
 | 
			
		||||
@@ -886,9 +886,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_checkptrw.h linux-2.6.21.1-owrt/fs/yaff
 | 
			
		||||
+
 | 
			
		||||
+#endif
 | 
			
		||||
+
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_ecc.c linux-2.6.21.1-owrt/fs/yaffs2/yaffs_ecc.c
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_ecc.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_ecc.c	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_ecc.c linux-2.6.21.1.dev/fs/yaffs2/yaffs_ecc.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_ecc.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_ecc.c	2007-05-26 21:13:40.684665656 +0200
 | 
			
		||||
@@ -0,0 +1,333 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * YAFFS: Yet another FFS. A NAND-flash specific file system. 
 | 
			
		||||
@@ -1223,9 +1223,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_ecc.c linux-2.6.21.1-owrt/fs/yaffs2/yaf
 | 
			
		||||
+
 | 
			
		||||
+}
 | 
			
		||||
+
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_ecc.h linux-2.6.21.1-owrt/fs/yaffs2/yaffs_ecc.h
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_ecc.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_ecc.h	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_ecc.h linux-2.6.21.1.dev/fs/yaffs2/yaffs_ecc.h
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_ecc.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_ecc.h	2007-05-26 21:13:40.685665504 +0200
 | 
			
		||||
@@ -0,0 +1,44 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * YAFFS: Yet another FFS. A NAND-flash specific file system. 
 | 
			
		||||
@@ -1271,9 +1271,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_ecc.h linux-2.6.21.1-owrt/fs/yaffs2/yaf
 | 
			
		||||
+			  yaffs_ECCOther * read_ecc,
 | 
			
		||||
+			  const yaffs_ECCOther * test_ecc);
 | 
			
		||||
+#endif
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_fs.c linux-2.6.21.1-owrt/fs/yaffs2/yaffs_fs.c
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_fs.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_fs.c	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_fs.c linux-2.6.21.1.dev/fs/yaffs2/yaffs_fs.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_fs.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_fs.c	2007-05-26 21:13:40.687665200 +0200
 | 
			
		||||
@@ -0,0 +1,2136 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * YAFFS: Yet another FFS. A NAND-flash specific file system.
 | 
			
		||||
@@ -3411,9 +3411,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_fs.c linux-2.6.21.1-owrt/fs/yaffs2/yaff
 | 
			
		||||
+MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system");
 | 
			
		||||
+MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002-2006");
 | 
			
		||||
+MODULE_LICENSE("GPL");
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_guts.c linux-2.6.21.1-owrt/fs/yaffs2/yaffs_guts.c
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_guts.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_guts.c	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_guts.c linux-2.6.21.1.dev/fs/yaffs2/yaffs_guts.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_guts.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_guts.c	2007-05-26 21:13:40.730658664 +0200
 | 
			
		||||
@@ -0,0 +1,6675 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * YAFFS: Yet another FFS. A NAND-flash specific file system.
 | 
			
		||||
@@ -10090,9 +10090,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_guts.c linux-2.6.21.1-owrt/fs/yaffs2/ya
 | 
			
		||||
+
 | 
			
		||||
+	    return YAFFS_OK;
 | 
			
		||||
+}
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_guts.h linux-2.6.21.1-owrt/fs/yaffs2/yaffs_guts.h
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_guts.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_guts.h	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_guts.h linux-2.6.21.1.dev/fs/yaffs2/yaffs_guts.h
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_guts.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_guts.h	2007-05-26 21:13:40.732658360 +0200
 | 
			
		||||
@@ -0,0 +1,893 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * YAFFS: Yet another FFS. A NAND-flash specific file system.
 | 
			
		||||
@@ -10987,9 +10987,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_guts.h linux-2.6.21.1-owrt/fs/yaffs2/ya
 | 
			
		||||
+void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi);
 | 
			
		||||
+
 | 
			
		||||
+#endif
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffsinterface.h linux-2.6.21.1-owrt/fs/yaffs2/yaffsinterface.h
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffsinterface.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffsinterface.h	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffsinterface.h linux-2.6.21.1.dev/fs/yaffs2/yaffsinterface.h
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffsinterface.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffsinterface.h	2007-05-26 21:13:40.732658360 +0200
 | 
			
		||||
@@ -0,0 +1,23 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * YAFFS: Yet another FFS. A NAND-flash specific file system.
 | 
			
		||||
@@ -11014,9 +11014,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffsinterface.h linux-2.6.21.1-owrt/fs/yaffs
 | 
			
		||||
+int yaffs_Initialise(unsigned nBlocks);
 | 
			
		||||
+
 | 
			
		||||
+#endif
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_mtdif2.c linux-2.6.21.1-owrt/fs/yaffs2/yaffs_mtdif2.c
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_mtdif2.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_mtdif2.c	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_mtdif2.c linux-2.6.21.1.dev/fs/yaffs2/yaffs_mtdif2.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_mtdif2.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_mtdif2.c	2007-05-26 21:13:40.733658208 +0200
 | 
			
		||||
@@ -0,0 +1,234 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * YAFFS: Yet another FFS. A NAND-flash specific file system. 
 | 
			
		||||
@@ -11252,9 +11252,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_mtdif2.c linux-2.6.21.1-owrt/fs/yaffs2/
 | 
			
		||||
+		return YAFFS_FAIL;
 | 
			
		||||
+}
 | 
			
		||||
+
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_mtdif2.h linux-2.6.21.1-owrt/fs/yaffs2/yaffs_mtdif2.h
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_mtdif2.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_mtdif2.h	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_mtdif2.h linux-2.6.21.1.dev/fs/yaffs2/yaffs_mtdif2.h
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_mtdif2.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_mtdif2.h	2007-05-26 21:13:40.733658208 +0200
 | 
			
		||||
@@ -0,0 +1,29 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * YAFFS: Yet another FFS. A NAND-flash specific file system. 
 | 
			
		||||
@@ -11285,9 +11285,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_mtdif2.h linux-2.6.21.1-owrt/fs/yaffs2/
 | 
			
		||||
+			    yaffs_BlockState * state, int *sequenceNumber);
 | 
			
		||||
+
 | 
			
		||||
+#endif
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_mtdif.c linux-2.6.21.1-owrt/fs/yaffs2/yaffs_mtdif.c
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_mtdif.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_mtdif.c	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_mtdif.c linux-2.6.21.1.dev/fs/yaffs2/yaffs_mtdif.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_mtdif.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_mtdif.c	2007-05-26 21:13:40.733658208 +0200
 | 
			
		||||
@@ -0,0 +1,243 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * YAFFS: Yet another FFS. A NAND-flash specific file system. 
 | 
			
		||||
@@ -11532,9 +11532,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_mtdif.c linux-2.6.21.1-owrt/fs/yaffs2/y
 | 
			
		||||
+	return YAFFS_OK;
 | 
			
		||||
+}
 | 
			
		||||
+
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_mtdif.h linux-2.6.21.1-owrt/fs/yaffs2/yaffs_mtdif.h
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_mtdif.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_mtdif.h	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_mtdif.h linux-2.6.21.1.dev/fs/yaffs2/yaffs_mtdif.h
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_mtdif.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_mtdif.h	2007-05-26 21:13:40.733658208 +0200
 | 
			
		||||
@@ -0,0 +1,31 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * YAFFS: Yet another FFS. A NAND-flash specific file system. 
 | 
			
		||||
@@ -11567,9 +11567,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_mtdif.h linux-2.6.21.1-owrt/fs/yaffs2/y
 | 
			
		||||
+int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber);
 | 
			
		||||
+int nandmtd_InitialiseNAND(yaffs_Device * dev);
 | 
			
		||||
+#endif
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_nand.c linux-2.6.21.1-owrt/fs/yaffs2/yaffs_nand.c
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_nand.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_nand.c	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_nand.c linux-2.6.21.1.dev/fs/yaffs2/yaffs_nand.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_nand.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_nand.c	2007-05-26 21:13:40.734658056 +0200
 | 
			
		||||
@@ -0,0 +1,135 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * YAFFS: Yet another FFS. A NAND-flash specific file system. 
 | 
			
		||||
@@ -11706,9 +11706,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_nand.c linux-2.6.21.1-owrt/fs/yaffs2/ya
 | 
			
		||||
+
 | 
			
		||||
+
 | 
			
		||||
+ 
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_nandemul2k.h linux-2.6.21.1-owrt/fs/yaffs2/yaffs_nandemul2k.h
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_nandemul2k.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_nandemul2k.h	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_nandemul2k.h linux-2.6.21.1.dev/fs/yaffs2/yaffs_nandemul2k.h
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_nandemul2k.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_nandemul2k.h	2007-05-26 21:13:40.734658056 +0200
 | 
			
		||||
@@ -0,0 +1,42 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * YAFFS: Yet another FFS. A NAND-flash specific file system. 
 | 
			
		||||
@@ -11752,9 +11752,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_nandemul2k.h linux-2.6.21.1-owrt/fs/yaf
 | 
			
		||||
+int nandemul2k_GetNumberOfBlocks(void);
 | 
			
		||||
+
 | 
			
		||||
+#endif
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_nand.h linux-2.6.21.1-owrt/fs/yaffs2/yaffs_nand.h
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_nand.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_nand.h	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_nand.h linux-2.6.21.1.dev/fs/yaffs2/yaffs_nand.h
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_nand.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_nand.h	2007-05-26 21:13:40.734658056 +0200
 | 
			
		||||
@@ -0,0 +1,43 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * YAFFS: Yet another FFS. A NAND-flash specific file system. 
 | 
			
		||||
@@ -11799,9 +11799,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_nand.h linux-2.6.21.1-owrt/fs/yaffs2/ya
 | 
			
		||||
+
 | 
			
		||||
+#endif
 | 
			
		||||
+
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_packedtags1.c linux-2.6.21.1-owrt/fs/yaffs2/yaffs_packedtags1.c
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_packedtags1.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_packedtags1.c	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_packedtags1.c linux-2.6.21.1.dev/fs/yaffs2/yaffs_packedtags1.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_packedtags1.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_packedtags1.c	2007-05-26 21:13:40.734658056 +0200
 | 
			
		||||
@@ -0,0 +1,39 @@
 | 
			
		||||
+#include "yaffs_packedtags1.h"
 | 
			
		||||
+#include "yportenv.h"
 | 
			
		||||
@@ -11842,9 +11842,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_packedtags1.c linux-2.6.21.1-owrt/fs/ya
 | 
			
		||||
+
 | 
			
		||||
+	}
 | 
			
		||||
+}
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_packedtags1.h linux-2.6.21.1-owrt/fs/yaffs2/yaffs_packedtags1.h
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_packedtags1.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_packedtags1.h	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_packedtags1.h linux-2.6.21.1.dev/fs/yaffs2/yaffs_packedtags1.h
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_packedtags1.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_packedtags1.h	2007-05-26 21:13:40.734658056 +0200
 | 
			
		||||
@@ -0,0 +1,22 @@
 | 
			
		||||
+// This is used to pack YAFFS1 tags, not YAFFS2 tags.
 | 
			
		||||
+
 | 
			
		||||
@@ -11868,9 +11868,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_packedtags1.h linux-2.6.21.1-owrt/fs/ya
 | 
			
		||||
+void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t);
 | 
			
		||||
+void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt);
 | 
			
		||||
+#endif
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_packedtags2.c linux-2.6.21.1-owrt/fs/yaffs2/yaffs_packedtags2.c
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_packedtags2.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_packedtags2.c	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_packedtags2.c linux-2.6.21.1.dev/fs/yaffs2/yaffs_packedtags2.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_packedtags2.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_packedtags2.c	2007-05-26 21:13:40.734658056 +0200
 | 
			
		||||
@@ -0,0 +1,184 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * YAFFS: Yet another FFS. A NAND-flash specific file system. 
 | 
			
		||||
@@ -12056,9 +12056,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_packedtags2.c linux-2.6.21.1-owrt/fs/ya
 | 
			
		||||
+	yaffs_DumpTags2(t);
 | 
			
		||||
+
 | 
			
		||||
+}
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_packedtags2.h linux-2.6.21.1-owrt/fs/yaffs2/yaffs_packedtags2.h
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_packedtags2.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_packedtags2.h	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_packedtags2.h linux-2.6.21.1.dev/fs/yaffs2/yaffs_packedtags2.h
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_packedtags2.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_packedtags2.h	2007-05-26 21:13:40.735657904 +0200
 | 
			
		||||
@@ -0,0 +1,23 @@
 | 
			
		||||
+/* This is used to pack YAFFS2 tags, not YAFFS1tags. */
 | 
			
		||||
+
 | 
			
		||||
@@ -12083,9 +12083,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_packedtags2.h linux-2.6.21.1-owrt/fs/ya
 | 
			
		||||
+void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t);
 | 
			
		||||
+void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt);
 | 
			
		||||
+#endif
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_qsort.c linux-2.6.21.1-owrt/fs/yaffs2/yaffs_qsort.c
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_qsort.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_qsort.c	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_qsort.c linux-2.6.21.1.dev/fs/yaffs2/yaffs_qsort.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_qsort.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_qsort.c	2007-05-26 21:13:40.735657904 +0200
 | 
			
		||||
@@ -0,0 +1,156 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * Copyright (c) 1992, 1993
 | 
			
		||||
@@ -12243,9 +12243,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_qsort.c linux-2.6.21.1-owrt/fs/yaffs2/y
 | 
			
		||||
+	}
 | 
			
		||||
+/*		qsort(pn - r, r / es, es, cmp);*/
 | 
			
		||||
+}
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_qsort.h linux-2.6.21.1-owrt/fs/yaffs2/yaffs_qsort.h
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_qsort.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_qsort.h	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_qsort.h linux-2.6.21.1.dev/fs/yaffs2/yaffs_qsort.h
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_qsort.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_qsort.h	2007-05-26 21:13:40.735657904 +0200
 | 
			
		||||
@@ -0,0 +1,23 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * YAFFS: Yet another FFS. A NAND-flash specific file system.
 | 
			
		||||
@@ -12270,9 +12270,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_qsort.h linux-2.6.21.1-owrt/fs/yaffs2/y
 | 
			
		||||
+                   int (*cmp)(const void *, const void *));
 | 
			
		||||
+
 | 
			
		||||
+#endif
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_tagscompat.c linux-2.6.21.1-owrt/fs/yaffs2/yaffs_tagscompat.c
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_tagscompat.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_tagscompat.c	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_tagscompat.c linux-2.6.21.1.dev/fs/yaffs2/yaffs_tagscompat.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_tagscompat.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_tagscompat.c	2007-05-26 21:13:40.736657752 +0200
 | 
			
		||||
@@ -0,0 +1,532 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * YAFFS: Yet another FFS. A NAND-flash specific file system. 
 | 
			
		||||
@@ -12806,9 +12806,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_tagscompat.c linux-2.6.21.1-owrt/fs/yaf
 | 
			
		||||
+
 | 
			
		||||
+	return YAFFS_OK;
 | 
			
		||||
+}
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_tagscompat.h linux-2.6.21.1-owrt/fs/yaffs2/yaffs_tagscompat.h
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_tagscompat.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_tagscompat.h	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_tagscompat.h linux-2.6.21.1.dev/fs/yaffs2/yaffs_tagscompat.h
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_tagscompat.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_tagscompat.h	2007-05-26 21:13:40.736657752 +0200
 | 
			
		||||
@@ -0,0 +1,40 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * YAFFS: Yet another FFS. A NAND-flash specific file system. 
 | 
			
		||||
@@ -12850,9 +12850,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_tagscompat.h linux-2.6.21.1-owrt/fs/yaf
 | 
			
		||||
+					  state, int *sequenceNumber);
 | 
			
		||||
+
 | 
			
		||||
+#endif
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_tagsvalidity.c linux-2.6.21.1-owrt/fs/yaffs2/yaffs_tagsvalidity.c
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_tagsvalidity.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_tagsvalidity.c	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_tagsvalidity.c linux-2.6.21.1.dev/fs/yaffs2/yaffs_tagsvalidity.c
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_tagsvalidity.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_tagsvalidity.c	2007-05-26 21:13:40.736657752 +0200
 | 
			
		||||
@@ -0,0 +1,31 @@
 | 
			
		||||
+
 | 
			
		||||
+/*
 | 
			
		||||
@@ -12885,9 +12885,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_tagsvalidity.c linux-2.6.21.1-owrt/fs/y
 | 
			
		||||
+		tags->validMarker1 == 0x55555555);
 | 
			
		||||
+
 | 
			
		||||
+}
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_tagsvalidity.h linux-2.6.21.1-owrt/fs/yaffs2/yaffs_tagsvalidity.h
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yaffs_tagsvalidity.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yaffs_tagsvalidity.h	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yaffs_tagsvalidity.h linux-2.6.21.1.dev/fs/yaffs2/yaffs_tagsvalidity.h
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yaffs_tagsvalidity.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yaffs_tagsvalidity.h	2007-05-26 21:13:40.736657752 +0200
 | 
			
		||||
@@ -0,0 +1,25 @@
 | 
			
		||||
+
 | 
			
		||||
+/*
 | 
			
		||||
@@ -12914,9 +12914,9 @@ diff -Nur linux-2.6.21.1/fs/yaffs2/yaffs_tagsvalidity.h linux-2.6.21.1-owrt/fs/y
 | 
			
		||||
+void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
 | 
			
		||||
+int yaffs_ValidateTags(yaffs_ExtendedTags * tags);
 | 
			
		||||
+#endif
 | 
			
		||||
diff -Nur linux-2.6.21.1/fs/yaffs2/yportenv.h linux-2.6.21.1-owrt/fs/yaffs2/yportenv.h
 | 
			
		||||
--- linux-2.6.21.1/fs/yaffs2/yportenv.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1-owrt/fs/yaffs2/yportenv.h	2007-05-14 11:52:43.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/fs/yaffs2/yportenv.h linux-2.6.21.1.dev/fs/yaffs2/yportenv.h
 | 
			
		||||
--- linux-2.6.21.1.old/fs/yaffs2/yportenv.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.6.21.1.dev/fs/yaffs2/yportenv.h	2007-05-26 21:13:40.736657752 +0200
 | 
			
		||||
@@ -0,0 +1,165 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * YAFFS: Yet another FFS. A NAND-flash specific file system. 
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
diff -urN linux-2.6.19.old/include/linux/time.h linux-2.6.19.dev/include/linux/time.h
 | 
			
		||||
--- linux-2.6.19.old/include/linux/time.h	2006-11-29 22:57:37.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/include/linux/time.h	2006-12-14 03:14:05.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/time.h linux-2.6.21.1.dev/include/linux/time.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/time.h	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/time.h	2007-05-26 21:23:19.859617680 +0200
 | 
			
		||||
@@ -1,6 +1,10 @@
 | 
			
		||||
 #ifndef _LINUX_TIME_H
 | 
			
		||||
 #define _LINUX_TIME_H
 | 
			
		||||
@@ -12,16 +12,16 @@ diff -urN linux-2.6.19.old/include/linux/time.h linux-2.6.19.dev/include/linux/t
 | 
			
		||||
 #include <linux/types.h>
 | 
			
		||||
 
 | 
			
		||||
 #ifdef __KERNEL__
 | 
			
		||||
@@ -223,4 +227,6 @@
 | 
			
		||||
@@ -224,4 +228,6 @@
 | 
			
		||||
  */
 | 
			
		||||
 #define TIMER_ABSTIME			0x01
 | 
			
		||||
 
 | 
			
		||||
+#endif /* __KERNEL__ DEBIAN */
 | 
			
		||||
+
 | 
			
		||||
 #endif
 | 
			
		||||
diff -urN linux-2.6.19.old/include/linux/types.h linux-2.6.19.dev/include/linux/types.h
 | 
			
		||||
--- linux-2.6.19.old/include/linux/types.h	2006-11-29 22:57:37.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.dev/include/linux/types.h	2006-12-14 03:14:05.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/types.h linux-2.6.21.1.dev/include/linux/types.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/types.h	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/types.h	2007-05-26 21:23:19.859617680 +0200
 | 
			
		||||
@@ -1,6 +1,14 @@
 | 
			
		||||
 #ifndef _LINUX_TYPES_H
 | 
			
		||||
 #define _LINUX_TYPES_H
 | 
			
		||||
@@ -37,7 +37,7 @@ diff -urN linux-2.6.19.old/include/linux/types.h linux-2.6.19.dev/include/linux/
 | 
			
		||||
 #ifdef	__KERNEL__
 | 
			
		||||
 
 | 
			
		||||
 #define BITS_TO_LONGS(bits) \
 | 
			
		||||
@@ -156,6 +164,8 @@
 | 
			
		||||
@@ -162,6 +170,8 @@
 | 
			
		||||
 
 | 
			
		||||
 #endif /* __KERNEL_STRICT_NAMES */
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
@@ -1,100 +1,6 @@
 | 
			
		||||
diff -urN linux-2.6.19.1/scripts/mod/file2alias.c linux-2.6.19.1.new/scripts/mod/file2alias.c
 | 
			
		||||
--- linux-2.6.19.1/scripts/mod/file2alias.c	2006-12-11 20:32:53.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.1.new/scripts/mod/file2alias.c	2007-01-02 15:28:47.000000000 +0100
 | 
			
		||||
@@ -37,7 +37,21 @@
 | 
			
		||||
  * even potentially has different endianness and word sizes, since
 | 
			
		||||
  * we handle those differences explicitly below */
 | 
			
		||||
 #include "../../include/linux/mod_devicetable.h"
 | 
			
		||||
+#ifndef __APPLE__
 | 
			
		||||
 #include "../../include/linux/input.h"
 | 
			
		||||
+#else
 | 
			
		||||
+#define EV_MAX                  0x1f
 | 
			
		||||
+#define KEY_MUTE                113
 | 
			
		||||
+#define KEY_MIN_INTERESTING     KEY_MUTE
 | 
			
		||||
+#define KEY_MAX                 0x1ff
 | 
			
		||||
+#define REL_MAX                 0x0f
 | 
			
		||||
+#define ABS_MAX                 0x3f
 | 
			
		||||
+#define MSC_MAX                 0x07
 | 
			
		||||
+#define LED_MAX                 0x0f
 | 
			
		||||
+#define SND_MAX                 0x07
 | 
			
		||||
+#define FF_MAX          	0x7f
 | 
			
		||||
+#define SW_MAX                  0x0f
 | 
			
		||||
+#endif
 | 
			
		||||
 
 | 
			
		||||
 #define ADD(str, sep, cond, field)                              \
 | 
			
		||||
 do {                                                            \
 | 
			
		||||
diff -urN linux-2.6.19.1/scripts/mod/mk_elfconfig.c linux-2.6.19.1.new/scripts/mod/mk_elfconfig.c
 | 
			
		||||
--- linux-2.6.19.1/scripts/mod/mk_elfconfig.c	2006-12-11 20:32:53.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.1.new/scripts/mod/mk_elfconfig.c	2007-01-02 15:43:57.000000000 +0100
 | 
			
		||||
@@ -1,7 +1,11 @@
 | 
			
		||||
 #include <stdio.h>
 | 
			
		||||
 #include <stdlib.h>
 | 
			
		||||
 #include <string.h>
 | 
			
		||||
+#ifndef __APPLE__
 | 
			
		||||
 #include <elf.h>
 | 
			
		||||
+#else
 | 
			
		||||
+#include "../../../../../tools/sstrip/include/elf.h"
 | 
			
		||||
+#endif
 | 
			
		||||
 
 | 
			
		||||
 int
 | 
			
		||||
 main(int argc, char **argv)
 | 
			
		||||
diff -urN linux-2.6.19.1/scripts/mod/modpost.h linux-2.6.19.1.new/scripts/mod/modpost.h
 | 
			
		||||
--- linux-2.6.19.1/scripts/mod/modpost.h	2006-12-11 20:32:53.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.1.new/scripts/mod/modpost.h	2007-01-02 15:40:55.000000000 +0100
 | 
			
		||||
@@ -7,7 +7,11 @@
 | 
			
		||||
 #include <sys/mman.h>
 | 
			
		||||
 #include <fcntl.h>
 | 
			
		||||
 #include <unistd.h>
 | 
			
		||||
+#ifndef __APPLE__
 | 
			
		||||
 #include <elf.h>
 | 
			
		||||
+#else
 | 
			
		||||
+#include "../../../../../tools/sstrip/include/elf.h"
 | 
			
		||||
+#endif
 | 
			
		||||
 
 | 
			
		||||
 #include "elfconfig.h"
 | 
			
		||||
 
 | 
			
		||||
diff -urN linux-2.6.19.1/scripts/mod/sumversion.c linux-2.6.19.1.new/scripts/mod/sumversion.c
 | 
			
		||||
--- linux-2.6.19.1/scripts/mod/sumversion.c	2006-12-11 20:32:53.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.1.new/scripts/mod/sumversion.c	2007-01-02 15:30:23.000000000 +0100
 | 
			
		||||
@@ -8,6 +8,9 @@
 | 
			
		||||
 #include <errno.h>
 | 
			
		||||
 #include <string.h>
 | 
			
		||||
 #include "modpost.h"
 | 
			
		||||
+#ifdef __APPLE__
 | 
			
		||||
+#include <limits.h>
 | 
			
		||||
+#endif
 | 
			
		||||
 
 | 
			
		||||
 /*
 | 
			
		||||
  * Stolen form Cryptographic API.
 | 
			
		||||
diff -urN linux-2.6.19.1/scripts/kconfig linux-2.6.19.1.new/scripts/kconfig/Makefile
 | 
			
		||||
--- linux-2.6.19.1/scripts/kconfig/Makefile    2007-01-04 17:49:35.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.1.new/scripts/kconfig/Makefile        2007-01-04 17:50:37.000000000 +0100
 | 
			
		||||
@@ -87,6 +87,9 @@
 | 
			
		||||
 # we really need to do so. (Do not call gcc as part of make mrproper)
 | 
			
		||||
 HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
 | 
			
		||||
 HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
 | 
			
		||||
+ifeq ($(shell uname -s),Darwin)
 | 
			
		||||
+HOST_LOADLIBES  += -lncurses
 | 
			
		||||
+endif
 | 
			
		||||
 
 | 
			
		||||
 HOST_EXTRACFLAGS += -DLOCALE
 | 
			
		||||
 | 
			
		||||
diff -urN linux-2.6.19.1/scripts/genksyms/parse.y linux-2.6.19.1.new/scripts/genksyms/parse.y 
 | 
			
		||||
--- linux-2.6.19.1/scripts/genksyms/parse.y	2006-12-11 20:32:53.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.1.new/scripts/genksyms/parse.y	2007-01-04 19:20:55.000000000 +0100
 | 
			
		||||
@@ -24,7 +24,9 @@
 | 
			
		||||
 %{
 | 
			
		||||
 
 | 
			
		||||
 #include <assert.h>
 | 
			
		||||
+#ifndef __APPLE__
 | 
			
		||||
 #include <malloc.h>
 | 
			
		||||
+#endif
 | 
			
		||||
 #include "genksyms.h"
 | 
			
		||||
 
 | 
			
		||||
 static int is_typedef;
 | 
			
		||||
diff -urN linux-2.6.19.1/scripts/genksyms/parse.c_shipped linux-2.6.19.1.new/scripts/genksyms/parse.c_shipped
 | 
			
		||||
--- linux-2.6.19.1/scripts/genksyms/parse.c_shipped	2007-01-04 19:34:09.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.1.new/scripts/genksyms/parse.c_shipped	2007-01-04 19:34:02.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/scripts/genksyms/parse.c_shipped linux-2.6.21.1.dev/scripts/genksyms/parse.c_shipped
 | 
			
		||||
--- linux-2.6.21.1.old/scripts/genksyms/parse.c_shipped	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/scripts/genksyms/parse.c_shipped	2007-05-26 21:26:23.565690112 +0200
 | 
			
		||||
@@ -144,7 +144,9 @@
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
@@ -105,8 +11,22 @@ diff -urN linux-2.6.19.1/scripts/genksyms/parse.c_shipped linux-2.6.19.1.new/scr
 | 
			
		||||
 #include "genksyms.h"
 | 
			
		||||
 
 | 
			
		||||
 static int is_typedef;
 | 
			
		||||
--- linux-2.6.19.1/scripts/kallsyms.c	2006-12-11 20:32:53.000000000 +0100
 | 
			
		||||
+++ linux-2.6.19.1.new/scripts/kallsyms.c	2007-01-04 19:46:38.000000000 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/scripts/genksyms/parse.y linux-2.6.21.1.dev/scripts/genksyms/parse.y
 | 
			
		||||
--- linux-2.6.21.1.old/scripts/genksyms/parse.y	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/scripts/genksyms/parse.y	2007-05-26 21:26:23.563690416 +0200
 | 
			
		||||
@@ -24,7 +24,9 @@
 | 
			
		||||
 %{
 | 
			
		||||
 
 | 
			
		||||
 #include <assert.h>
 | 
			
		||||
+#ifndef __APPLE__
 | 
			
		||||
 #include <malloc.h>
 | 
			
		||||
+#endif
 | 
			
		||||
 #include "genksyms.h"
 | 
			
		||||
 
 | 
			
		||||
 static int is_typedef;
 | 
			
		||||
diff -urN linux-2.6.21.1.old/scripts/kallsyms.c linux-2.6.21.1.dev/scripts/kallsyms.c
 | 
			
		||||
--- linux-2.6.21.1.old/scripts/kallsyms.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/scripts/kallsyms.c	2007-05-26 21:26:23.579687984 +0200
 | 
			
		||||
@@ -30,6 +30,35 @@
 | 
			
		||||
 #include <stdlib.h>
 | 
			
		||||
 #include <string.h>
 | 
			
		||||
@@ -143,3 +63,84 @@ diff -urN linux-2.6.19.1/scripts/genksyms/parse.c_shipped linux-2.6.19.1.new/scr
 | 
			
		||||
 
 | 
			
		||||
 #define KSYM_NAME_LEN		127
 | 
			
		||||
 
 | 
			
		||||
diff -urN linux-2.6.21.1.old/scripts/kconfig/Makefile linux-2.6.21.1.dev/scripts/kconfig/Makefile
 | 
			
		||||
--- linux-2.6.21.1.old/scripts/kconfig/Makefile	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/scripts/kconfig/Makefile	2007-05-26 21:26:23.553691936 +0200
 | 
			
		||||
@@ -87,6 +87,9 @@
 | 
			
		||||
 # we really need to do so. (Do not call gcc as part of make mrproper)
 | 
			
		||||
 HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
 | 
			
		||||
 HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
 | 
			
		||||
+ifeq ($(shell uname -s),Darwin)
 | 
			
		||||
+HOST_LOADLIBES  += -lncurses
 | 
			
		||||
+endif
 | 
			
		||||
 
 | 
			
		||||
 HOST_EXTRACFLAGS += -DLOCALE
 | 
			
		||||
 
 | 
			
		||||
diff -urN linux-2.6.21.1.old/scripts/mod/file2alias.c linux-2.6.21.1.dev/scripts/mod/file2alias.c
 | 
			
		||||
--- linux-2.6.21.1.old/scripts/mod/file2alias.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/scripts/mod/file2alias.c	2007-05-26 21:26:23.552692088 +0200
 | 
			
		||||
@@ -37,7 +37,21 @@
 | 
			
		||||
  * even potentially has different endianness and word sizes, since
 | 
			
		||||
  * we handle those differences explicitly below */
 | 
			
		||||
 #include "../../include/linux/mod_devicetable.h"
 | 
			
		||||
+#ifndef __APPLE__
 | 
			
		||||
 #include "../../include/linux/input.h"
 | 
			
		||||
+#else
 | 
			
		||||
+#define EV_MAX                  0x1f
 | 
			
		||||
+#define KEY_MUTE                113
 | 
			
		||||
+#define KEY_MIN_INTERESTING     KEY_MUTE
 | 
			
		||||
+#define KEY_MAX                 0x1ff
 | 
			
		||||
+#define REL_MAX                 0x0f
 | 
			
		||||
+#define ABS_MAX                 0x3f
 | 
			
		||||
+#define MSC_MAX                 0x07
 | 
			
		||||
+#define LED_MAX                 0x0f
 | 
			
		||||
+#define SND_MAX                 0x07
 | 
			
		||||
+#define FF_MAX          	0x7f
 | 
			
		||||
+#define SW_MAX                  0x0f
 | 
			
		||||
+#endif
 | 
			
		||||
 
 | 
			
		||||
 #define ADD(str, sep, cond, field)                              \
 | 
			
		||||
 do {                                                            \
 | 
			
		||||
diff -urN linux-2.6.21.1.old/scripts/mod/mk_elfconfig.c linux-2.6.21.1.dev/scripts/mod/mk_elfconfig.c
 | 
			
		||||
--- linux-2.6.21.1.old/scripts/mod/mk_elfconfig.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/scripts/mod/mk_elfconfig.c	2007-05-26 21:26:23.553691936 +0200
 | 
			
		||||
@@ -1,7 +1,11 @@
 | 
			
		||||
 #include <stdio.h>
 | 
			
		||||
 #include <stdlib.h>
 | 
			
		||||
 #include <string.h>
 | 
			
		||||
+#ifndef __APPLE__
 | 
			
		||||
 #include <elf.h>
 | 
			
		||||
+#else
 | 
			
		||||
+#include "../../../../../tools/sstrip/include/elf.h"
 | 
			
		||||
+#endif
 | 
			
		||||
 
 | 
			
		||||
 int
 | 
			
		||||
 main(int argc, char **argv)
 | 
			
		||||
diff -urN linux-2.6.21.1.old/scripts/mod/modpost.h linux-2.6.21.1.dev/scripts/mod/modpost.h
 | 
			
		||||
--- linux-2.6.21.1.old/scripts/mod/modpost.h	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/scripts/mod/modpost.h	2007-05-26 21:26:23.553691936 +0200
 | 
			
		||||
@@ -7,7 +7,11 @@
 | 
			
		||||
 #include <sys/mman.h>
 | 
			
		||||
 #include <fcntl.h>
 | 
			
		||||
 #include <unistd.h>
 | 
			
		||||
+#ifndef __APPLE__
 | 
			
		||||
 #include <elf.h>
 | 
			
		||||
+#else
 | 
			
		||||
+#include "../../../../../tools/sstrip/include/elf.h"
 | 
			
		||||
+#endif
 | 
			
		||||
 
 | 
			
		||||
 #include "elfconfig.h"
 | 
			
		||||
 
 | 
			
		||||
diff -urN linux-2.6.21.1.old/scripts/mod/sumversion.c linux-2.6.21.1.dev/scripts/mod/sumversion.c
 | 
			
		||||
--- linux-2.6.21.1.old/scripts/mod/sumversion.c	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/scripts/mod/sumversion.c	2007-05-26 21:26:23.553691936 +0200
 | 
			
		||||
@@ -8,6 +8,9 @@
 | 
			
		||||
 #include <errno.h>
 | 
			
		||||
 #include <string.h>
 | 
			
		||||
 #include "modpost.h"
 | 
			
		||||
+#ifdef __APPLE__
 | 
			
		||||
+#include <limits.h>
 | 
			
		||||
+#endif
 | 
			
		||||
 
 | 
			
		||||
 /*
 | 
			
		||||
  * Stolen form Cryptographic API.
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,6 @@
 | 
			
		||||
--- linux-2.6.19.2/include/linux/stddef.h.old	2007-02-14 03:34:54.861805424 +0100
 | 
			
		||||
+++ linux-2.6.19.2/include/linux/stddef.h	2007-02-14 03:35:06.331061832 +0100
 | 
			
		||||
diff -urN linux-2.6.21.1.old/include/linux/stddef.h linux-2.6.21.1.dev/include/linux/stddef.h
 | 
			
		||||
--- linux-2.6.21.1.old/include/linux/stddef.h	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/include/linux/stddef.h	2007-05-26 21:29:46.108898864 +0200
 | 
			
		||||
@@ -16,6 +16,7 @@
 | 
			
		||||
 	false	= 0,
 | 
			
		||||
 	true	= 1
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
diff -Nur linux-2.6.21.1/scripts/gen_initramfs_list.sh linux-2.6.21.1-owrt/scripts/gen_initramfs_list.sh
 | 
			
		||||
--- linux-2.6.21.1/scripts/gen_initramfs_list.sh	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1-owrt/scripts/gen_initramfs_list.sh	2007-05-14 12:18:02.000000000 +0200
 | 
			
		||||
diff -urN linux-2.6.21.1.old/scripts/gen_initramfs_list.sh linux-2.6.21.1.dev/scripts/gen_initramfs_list.sh
 | 
			
		||||
--- linux-2.6.21.1.old/scripts/gen_initramfs_list.sh	2007-04-27 23:49:26.000000000 +0200
 | 
			
		||||
+++ linux-2.6.21.1.dev/scripts/gen_initramfs_list.sh	2007-05-26 21:32:53.679383816 +0200
 | 
			
		||||
@@ -125,7 +125,7 @@
 | 
			
		||||
 			str="${ftype} ${name} ${location} ${str}"
 | 
			
		||||
 			;;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user