qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-09-12 06:53:41 +03:00
Code

[kernel] refresh generic 2.6.25 patches

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11189 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2008-05-18 20:26:43 +00:00
parent 3d542aac84
commit afc90574b4
59 changed files with 1789 additions and 1789 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
target/linux/generic-2.6/patches-2.6.25/001-squashfs.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/fs/Kconfig Index: linux-2.6.25.4/fs/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/fs/Kconfig --- linux-2.6.25.4.orig/fs/Kconfig
+++ linux-2.6.25.1/fs/Kconfig +++ linux-2.6.25.4/fs/Kconfig
@@ -1367,6 +1367,71 @@ config CRAMFS @@ -1367,6 +1367,71 @@ config CRAMFS
If unsure, say N. If unsure, say N.
@ -74,10 +74,10 @@ Index: linux-2.6.25.1/fs/Kconfig
config VXFS_FS config VXFS_FS
tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)" tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
depends on BLOCK depends on BLOCK
Index: linux-2.6.25.1/fs/Makefile Index: linux-2.6.25.4/fs/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/fs/Makefile --- linux-2.6.25.4.orig/fs/Makefile
+++ linux-2.6.25.1/fs/Makefile +++ linux-2.6.25.4/fs/Makefile
@@ -73,6 +73,7 @@ obj-$(CONFIG_JBD) += jbd/ @@ -73,6 +73,7 @@ obj-$(CONFIG_JBD) += jbd/
obj-$(CONFIG_JBD2) += jbd2/ obj-$(CONFIG_JBD2) += jbd2/
obj-$(CONFIG_EXT2_FS) += ext2/ obj-$(CONFIG_EXT2_FS) += ext2/
@ -86,10 +86,10 @@ Index: linux-2.6.25.1/fs/Makefile
obj-y += ramfs/ obj-y += ramfs/
obj-$(CONFIG_HUGETLBFS) += hugetlbfs/ obj-$(CONFIG_HUGETLBFS) += hugetlbfs/
obj-$(CONFIG_CODA_FS) += coda/ obj-$(CONFIG_CODA_FS) += coda/
Index: linux-2.6.25.1/fs/squashfs/inode.c Index: linux-2.6.25.4/fs/squashfs/inode.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/fs/squashfs/inode.c +++ linux-2.6.25.4/fs/squashfs/inode.c
@@ -0,0 +1,2122 @@ @@ -0,0 +1,2122 @@
+/* +/*
+ * Squashfs - a compressed read only filesystem for Linux + * Squashfs - a compressed read only filesystem for Linux
@ -2213,10 +2213,10 @@ Index: linux-2.6.25.1/fs/squashfs/inode.c
+MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem"); +MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem");
+MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>"); +MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
Index: linux-2.6.25.1/fs/squashfs/Makefile Index: linux-2.6.25.4/fs/squashfs/Makefile
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/fs/squashfs/Makefile +++ linux-2.6.25.4/fs/squashfs/Makefile
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
+# +#
+# Makefile for the linux squashfs routines. +# Makefile for the linux squashfs routines.
@ -2225,10 +2225,10 @@ Index: linux-2.6.25.1/fs/squashfs/Makefile
+obj-$(CONFIG_SQUASHFS) += squashfs.o +obj-$(CONFIG_SQUASHFS) += squashfs.o
+squashfs-y += inode.o +squashfs-y += inode.o
+squashfs-y += squashfs2_0.o +squashfs-y += squashfs2_0.o
Index: linux-2.6.25.1/fs/squashfs/squashfs2_0.c Index: linux-2.6.25.4/fs/squashfs/squashfs2_0.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/fs/squashfs/squashfs2_0.c +++ linux-2.6.25.4/fs/squashfs/squashfs2_0.c
@@ -0,0 +1,758 @@ @@ -0,0 +1,758 @@
+/* +/*
+ * Squashfs - a compressed read only filesystem for Linux + * Squashfs - a compressed read only filesystem for Linux
@ -2988,10 +2988,10 @@ Index: linux-2.6.25.1/fs/squashfs/squashfs2_0.c
+ +
+ return 1; + return 1;
+} +}
Index: linux-2.6.25.1/fs/squashfs/squashfs.h Index: linux-2.6.25.4/fs/squashfs/squashfs.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/fs/squashfs/squashfs.h +++ linux-2.6.25.4/fs/squashfs/squashfs.h
@@ -0,0 +1,86 @@ @@ -0,0 +1,86 @@
+/* +/*
+ * Squashfs - a compressed read only filesystem for Linux + * Squashfs - a compressed read only filesystem for Linux
@ -3079,10 +3079,10 @@ Index: linux-2.6.25.1/fs/squashfs/squashfs.h
+ return 0; + return 0;
+} +}
+#endif +#endif
Index: linux-2.6.25.1/include/linux/magic.h Index: linux-2.6.25.4/include/linux/magic.h
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/include/linux/magic.h --- linux-2.6.25.4.orig/include/linux/magic.h
+++ linux-2.6.25.1/include/linux/magic.h +++ linux-2.6.25.4/include/linux/magic.h
@@ -35,6 +35,9 @@ @@ -35,6 +35,9 @@
#define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs" #define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs"
#define REISER2FS_JR_SUPER_MAGIC_STRING "ReIsEr3Fs" #define REISER2FS_JR_SUPER_MAGIC_STRING "ReIsEr3Fs"
@ -3093,10 +3093,10 @@ Index: linux-2.6.25.1/include/linux/magic.h
#define SMB_SUPER_MAGIC 0x517B #define SMB_SUPER_MAGIC 0x517B
#define USBDEVICE_SUPER_MAGIC 0x9fa2 #define USBDEVICE_SUPER_MAGIC 0x9fa2
#define CGROUP_SUPER_MAGIC 0x27e0eb #define CGROUP_SUPER_MAGIC 0x27e0eb
Index: linux-2.6.25.1/include/linux/squashfs_fs.h Index: linux-2.6.25.4/include/linux/squashfs_fs.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/squashfs_fs.h +++ linux-2.6.25.4/include/linux/squashfs_fs.h
@@ -0,0 +1,911 @@ @@ -0,0 +1,911 @@
+#ifndef SQUASHFS_FS +#ifndef SQUASHFS_FS
+#define SQUASHFS_FS +#define SQUASHFS_FS
@ -4009,10 +4009,10 @@ Index: linux-2.6.25.1/include/linux/squashfs_fs.h
+ +
+#endif +#endif
+#endif +#endif
Index: linux-2.6.25.1/include/linux/squashfs_fs_i.h Index: linux-2.6.25.4/include/linux/squashfs_fs_i.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/squashfs_fs_i.h +++ linux-2.6.25.4/include/linux/squashfs_fs_i.h
@@ -0,0 +1,45 @@ @@ -0,0 +1,45 @@
+#ifndef SQUASHFS_FS_I +#ifndef SQUASHFS_FS_I
+#define SQUASHFS_FS_I +#define SQUASHFS_FS_I
@ -4059,10 +4059,10 @@ Index: linux-2.6.25.1/include/linux/squashfs_fs_i.h
+ struct inode vfs_inode; + struct inode vfs_inode;
+}; +};
+#endif +#endif
Index: linux-2.6.25.1/include/linux/squashfs_fs_sb.h Index: linux-2.6.25.4/include/linux/squashfs_fs_sb.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/squashfs_fs_sb.h +++ linux-2.6.25.4/include/linux/squashfs_fs_sb.h
@@ -0,0 +1,74 @@ @@ -0,0 +1,74 @@
+#ifndef SQUASHFS_FS_SB +#ifndef SQUASHFS_FS_SB
+#define SQUASHFS_FS_SB +#define SQUASHFS_FS_SB
@ -4138,10 +4138,10 @@ Index: linux-2.6.25.1/include/linux/squashfs_fs_sb.h
+ int (*read_fragment_index_table)(struct super_block *s); + int (*read_fragment_index_table)(struct super_block *s);
+}; +};
+#endif +#endif
Index: linux-2.6.25.1/init/do_mounts_rd.c Index: linux-2.6.25.4/init/do_mounts_rd.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/init/do_mounts_rd.c --- linux-2.6.25.4.orig/init/do_mounts_rd.c
+++ linux-2.6.25.1/init/do_mounts_rd.c +++ linux-2.6.25.4/init/do_mounts_rd.c
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
#include <linux/ext2_fs.h> #include <linux/ext2_fs.h>
#include <linux/romfs_fs.h> #include <linux/romfs_fs.h>

14
target/linux/generic-2.6/patches-2.6.25/002-lzma_decompress.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/include/linux/LzmaDecode.h Index: linux-2.6.25.4/include/linux/LzmaDecode.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/LzmaDecode.h +++ linux-2.6.25.4/include/linux/LzmaDecode.h
@@ -0,0 +1,100 @@ @@ -0,0 +1,100 @@
+/* +/*
+ LzmaDecode.h + LzmaDecode.h
@ -103,10 +103,10 @@ Index: linux-2.6.25.1/include/linux/LzmaDecode.h
+ UInt32 *outSizeProcessed); + UInt32 *outSizeProcessed);
+ +
+#endif +#endif
Index: linux-2.6.25.1/lib/LzmaDecode.c Index: linux-2.6.25.4/lib/LzmaDecode.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/lib/LzmaDecode.c +++ linux-2.6.25.4/lib/LzmaDecode.c
@@ -0,0 +1,663 @@ @@ -0,0 +1,663 @@
+/* +/*
+ LzmaDecode.c + LzmaDecode.c
@ -771,10 +771,10 @@ Index: linux-2.6.25.1/lib/LzmaDecode.c
+ *outSizeProcessed = nowPos; + *outSizeProcessed = nowPos;
+ return LZMA_RESULT_OK; + return LZMA_RESULT_OK;
+} +}
Index: linux-2.6.25.1/lib/Makefile Index: linux-2.6.25.4/lib/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/lib/Makefile --- linux-2.6.25.4.orig/lib/Makefile
+++ linux-2.6.25.1/lib/Makefile +++ linux-2.6.25.4/lib/Makefile
@@ -14,7 +14,7 @@ lib-$(CONFIG_SMP) += cpumask.o @@ -14,7 +14,7 @@ lib-$(CONFIG_SMP) += cpumask.o
lib-y += kobject.o kref.o klist.o lib-y += kobject.o kref.o klist.o

6
target/linux/generic-2.6/patches-2.6.25/003-squashfs_lzma.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/fs/squashfs/inode.c Index: linux-2.6.25.4/fs/squashfs/inode.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/fs/squashfs/inode.c --- linux-2.6.25.4.orig/fs/squashfs/inode.c
+++ linux-2.6.25.1/fs/squashfs/inode.c +++ linux-2.6.25.4/fs/squashfs/inode.c
@@ -4,6 +4,9 @@ @@ -4,6 +4,9 @@
* Copyright (c) 2002, 2003, 2004, 2005, 2006 * Copyright (c) 2002, 2003, 2004, 2005, 2006
* Phillip Lougher <phillip@lougher.org.uk> * Phillip Lougher <phillip@lougher.org.uk>

6
target/linux/generic-2.6/patches-2.6.25/004-extra_optimization.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/Makefile Index: linux-2.6.25.4/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/Makefile --- linux-2.6.25.4.orig/Makefile
+++ linux-2.6.25.1/Makefile +++ linux-2.6.25.4/Makefile
@@ -533,6 +533,9 @@ endif @@ -533,6 +533,9 @@ endif
NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include) NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
CHECKFLAGS += $(NOSTDINC_FLAGS) CHECKFLAGS += $(NOSTDINC_FLAGS)

6
target/linux/generic-2.6/patches-2.6.25/005-squashfs_fix.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/fs/squashfs/inode.c Index: linux-2.6.25.4/fs/squashfs/inode.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/fs/squashfs/inode.c --- linux-2.6.25.4.orig/fs/squashfs/inode.c
+++ linux-2.6.25.1/fs/squashfs/inode.c +++ linux-2.6.25.4/fs/squashfs/inode.c
@@ -33,6 +33,7 @@ @@ -33,6 +33,7 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/smp_lock.h> #include <linux/smp_lock.h>

6
target/linux/generic-2.6/patches-2.6.25/006-gcc4_inline_fix.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/include/asm-mips/system.h Index: linux-2.6.25.4/include/asm-mips/system.h
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/include/asm-mips/system.h --- linux-2.6.25.4.orig/include/asm-mips/system.h
+++ linux-2.6.25.1/include/asm-mips/system.h +++ linux-2.6.25.4/include/asm-mips/system.h
@@ -185,7 +185,7 @@ extern __u64 __xchg_u64_unsupported_on_3 @@ -185,7 +185,7 @@ extern __u64 __xchg_u64_unsupported_on_3
if something tries to do an invalid xchg(). */ if something tries to do an invalid xchg(). */
extern void __xchg_called_with_bad_pointer(void); extern void __xchg_called_with_bad_pointer(void);

6
target/linux/generic-2.6/patches-2.6.25/007-samsung_flash.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/drivers/mtd/chips/cfi_cmdset_0002.c Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0002.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/mtd/chips/cfi_cmdset_0002.c --- linux-2.6.25.4.orig/drivers/mtd/chips/cfi_cmdset_0002.c
+++ linux-2.6.25.1/drivers/mtd/chips/cfi_cmdset_0002.c +++ linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -51,6 +51,7 @@ @@ -51,6 +51,7 @@
#define SST49LF040B 0x0050 #define SST49LF040B 0x0050
#define SST49LF008A 0x005a #define SST49LF008A 0x005a

6
target/linux/generic-2.6/patches-2.6.25/009-revert_intel_flash_breakage.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/drivers/mtd/chips/cfi_cmdset_0001.c Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/mtd/chips/cfi_cmdset_0001.c --- linux-2.6.25.4.orig/drivers/mtd/chips/cfi_cmdset_0001.c
+++ linux-2.6.25.1/drivers/mtd/chips/cfi_cmdset_0001.c +++ linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -1008,7 +1008,7 @@ static void __xipram xip_enable(struct m @@ -1008,7 +1008,7 @@ static void __xipram xip_enable(struct m
static int __xipram xip_wait_for_operation( static int __xipram xip_wait_for_operation(

12
target/linux/generic-2.6/patches-2.6.25/010-disable_old_squashfs_compatibility.patch
View File

@ -1,16 +1,16 @@
Index: linux-2.6.25.1/fs/squashfs/Makefile Index: linux-2.6.25.4/fs/squashfs/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/fs/squashfs/Makefile --- linux-2.6.25.4.orig/fs/squashfs/Makefile
+++ linux-2.6.25.1/fs/squashfs/Makefile +++ linux-2.6.25.4/fs/squashfs/Makefile
@@ -4,4 +4,3 @@ @@ -4,4 +4,3 @@
obj-$(CONFIG_SQUASHFS) += squashfs.o obj-$(CONFIG_SQUASHFS) += squashfs.o
squashfs-y += inode.o squashfs-y += inode.o
-squashfs-y += squashfs2_0.o -squashfs-y += squashfs2_0.o
Index: linux-2.6.25.1/fs/squashfs/squashfs.h Index: linux-2.6.25.4/fs/squashfs/squashfs.h
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/fs/squashfs/squashfs.h --- linux-2.6.25.4.orig/fs/squashfs/squashfs.h
+++ linux-2.6.25.1/fs/squashfs/squashfs.h +++ linux-2.6.25.4/fs/squashfs/squashfs.h
@@ -24,6 +24,9 @@ @@ -24,6 +24,9 @@
#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY #ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
#undef CONFIG_SQUASHFS_1_0_COMPATIBILITY #undef CONFIG_SQUASHFS_1_0_COMPATIBILITY

6
target/linux/generic-2.6/patches-2.6.25/011-mips_boot.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/arch/mips/kernel/head.S Index: linux-2.6.25.4/arch/mips/kernel/head.S
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/arch/mips/kernel/head.S --- linux-2.6.25.4.orig/arch/mips/kernel/head.S
+++ linux-2.6.25.1/arch/mips/kernel/head.S +++ linux-2.6.25.4/arch/mips/kernel/head.S
@@ -120,6 +120,8 @@ @@ -120,6 +120,8 @@
#endif #endif
.endm .endm

6
target/linux/generic-2.6/patches-2.6.25/060-block2mtd_init.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/drivers/mtd/devices/block2mtd.c Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/mtd/devices/block2mtd.c --- linux-2.6.25.4.orig/drivers/mtd/devices/block2mtd.c
+++ linux-2.6.25.1/drivers/mtd/devices/block2mtd.c +++ linux-2.6.25.4/drivers/mtd/devices/block2mtd.c
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/init.h> #include <linux/init.h>

42
target/linux/generic-2.6/patches-2.6.25/065-rootfs_split.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/drivers/mtd/Kconfig Index: linux-2.6.25.4/drivers/mtd/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/mtd/Kconfig --- linux-2.6.25.4.orig/drivers/mtd/Kconfig
+++ linux-2.6.25.1/drivers/mtd/Kconfig +++ linux-2.6.25.4/drivers/mtd/Kconfig
@@ -47,6 +47,16 @@ config MTD_PARTITIONS @@ -47,6 +47,16 @@ config MTD_PARTITIONS
devices. Partitioning on NFTL 'devices' is a different - that's the devices. Partitioning on NFTL 'devices' is a different - that's the
'normal' form of partitioning used on a block device. 'normal' form of partitioning used on a block device.
@ -19,10 +19,10 @@ Index: linux-2.6.25.1/drivers/mtd/Kconfig
config MTD_REDBOOT_PARTS config MTD_REDBOOT_PARTS
tristate "RedBoot partition table parsing" tristate "RedBoot partition table parsing"
depends on MTD_PARTITIONS depends on MTD_PARTITIONS
Index: linux-2.6.25.1/drivers/mtd/mtdpart.c Index: linux-2.6.25.4/drivers/mtd/mtdpart.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/mtd/mtdpart.c --- linux-2.6.25.4.orig/drivers/mtd/mtdpart.c
+++ linux-2.6.25.1/drivers/mtd/mtdpart.c +++ linux-2.6.25.4/drivers/mtd/mtdpart.c
@@ -20,6 +20,8 @@ @@ -20,6 +20,8 @@
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
@ -584,10 +584,10 @@ Index: linux-2.6.25.1/drivers/mtd/mtdpart.c
+EXPORT_SYMBOL_GPL(refresh_mtd_partitions); +EXPORT_SYMBOL_GPL(refresh_mtd_partitions);
EXPORT_SYMBOL_GPL(register_mtd_parser); EXPORT_SYMBOL_GPL(register_mtd_parser);
EXPORT_SYMBOL_GPL(deregister_mtd_parser); EXPORT_SYMBOL_GPL(deregister_mtd_parser);
Index: linux-2.6.25.1/drivers/mtd/devices/block2mtd.c Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/mtd/devices/block2mtd.c --- linux-2.6.25.4.orig/drivers/mtd/devices/block2mtd.c
+++ linux-2.6.25.1/drivers/mtd/devices/block2mtd.c +++ linux-2.6.25.4/drivers/mtd/devices/block2mtd.c
@@ -34,6 +34,8 @@ struct block2mtd_dev { @@ -34,6 +34,8 @@ struct block2mtd_dev {
struct block_device *blkdev; struct block_device *blkdev;
struct mtd_info mtd; struct mtd_info mtd;
@ -875,10 +875,10 @@ Index: linux-2.6.25.1/drivers/mtd/devices/block2mtd.c
part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL); part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
part->name = dev->mtd.name; part->name = dev->mtd.name;
Index: linux-2.6.25.1/drivers/mtd/mtdchar.c Index: linux-2.6.25.4/drivers/mtd/mtdchar.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/mtd/mtdchar.c --- linux-2.6.25.4.orig/drivers/mtd/mtdchar.c
+++ linux-2.6.25.1/drivers/mtd/mtdchar.c +++ linux-2.6.25.4/drivers/mtd/mtdchar.c
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
@ -901,10 +901,10 @@ Index: linux-2.6.25.1/drivers/mtd/mtdchar.c
default: default:
ret = -ENOTTY; ret = -ENOTTY;
Index: linux-2.6.25.1/include/linux/mtd/mtd.h Index: linux-2.6.25.4/include/linux/mtd/mtd.h
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/include/linux/mtd/mtd.h --- linux-2.6.25.4.orig/include/linux/mtd/mtd.h
+++ linux-2.6.25.1/include/linux/mtd/mtd.h +++ linux-2.6.25.4/include/linux/mtd/mtd.h
@@ -98,6 +98,7 @@ struct mtd_oob_ops { @@ -98,6 +98,7 @@ struct mtd_oob_ops {
uint8_t *oobbuf; uint8_t *oobbuf;
}; };
@ -923,10 +923,10 @@ Index: linux-2.6.25.1/include/linux/mtd/mtd.h
/* If the driver is something smart, like UBI, it may need to maintain /* If the driver is something smart, like UBI, it may need to maintain
* its own reference counting. The below functions are only for driver. * its own reference counting. The below functions are only for driver.
* The driver may register its callbacks. These callbacks are not * The driver may register its callbacks. These callbacks are not
Index: linux-2.6.25.1/include/linux/mtd/partitions.h Index: linux-2.6.25.4/include/linux/mtd/partitions.h
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/include/linux/mtd/partitions.h --- linux-2.6.25.4.orig/include/linux/mtd/partitions.h
+++ linux-2.6.25.1/include/linux/mtd/partitions.h +++ linux-2.6.25.4/include/linux/mtd/partitions.h
@@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
* erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK). * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
*/ */
@ -951,10 +951,10 @@ Index: linux-2.6.25.1/include/linux/mtd/partitions.h
/* /*
* Functions dealing with the various ways of partitioning the space * Functions dealing with the various ways of partitioning the space
Index: linux-2.6.25.1/include/mtd/mtd-abi.h Index: linux-2.6.25.4/include/mtd/mtd-abi.h
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/include/mtd/mtd-abi.h --- linux-2.6.25.4.orig/include/mtd/mtd-abi.h
+++ linux-2.6.25.1/include/mtd/mtd-abi.h +++ linux-2.6.25.4/include/mtd/mtd-abi.h
@@ -95,6 +95,7 @@ struct otp_info { @@ -95,6 +95,7 @@ struct otp_info {
#define ECCGETLAYOUT _IOR('M', 17, struct nand_ecclayout) #define ECCGETLAYOUT _IOR('M', 17, struct nand_ecclayout)
#define ECCGETSTATS _IOR('M', 18, struct mtd_ecc_stats) #define ECCGETSTATS _IOR('M', 18, struct mtd_ecc_stats)

6
target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/drivers/mtd/redboot.c Index: linux-2.6.25.4/drivers/mtd/redboot.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/mtd/redboot.c --- linux-2.6.25.4.orig/drivers/mtd/redboot.c
+++ linux-2.6.25.1/drivers/mtd/redboot.c +++ linux-2.6.25.4/drivers/mtd/redboot.c
@@ -251,14 +251,21 @@ static int parse_redboot_partitions(stru @@ -251,14 +251,21 @@ static int parse_redboot_partitions(stru
#endif #endif
names += strlen(names)+1; names += strlen(names)+1;

54
target/linux/generic-2.6/patches-2.6.25/100-netfilter_layer7_2.17.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/net/netfilter/Kconfig Index: linux-2.6.25.4/net/netfilter/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/netfilter/Kconfig --- linux-2.6.25.4.orig/net/netfilter/Kconfig
+++ linux-2.6.25.1/net/netfilter/Kconfig +++ linux-2.6.25.4/net/netfilter/Kconfig
@@ -735,6 +735,27 @@ config NETFILTER_XT_MATCH_STATE @@ -735,6 +735,27 @@ config NETFILTER_XT_MATCH_STATE
To compile it as a module, choose M here. If unsure, say N. To compile it as a module, choose M here. If unsure, say N.
@ -30,10 +30,10 @@ Index: linux-2.6.25.1/net/netfilter/Kconfig
config NETFILTER_XT_MATCH_STATISTIC config NETFILTER_XT_MATCH_STATISTIC
tristate '"statistic" match support' tristate '"statistic" match support'
depends on NETFILTER_XTABLES depends on NETFILTER_XTABLES
Index: linux-2.6.25.1/net/netfilter/Makefile Index: linux-2.6.25.4/net/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/netfilter/Makefile --- linux-2.6.25.4.orig/net/netfilter/Makefile
+++ linux-2.6.25.1/net/netfilter/Makefile +++ linux-2.6.25.4/net/netfilter/Makefile
@@ -77,6 +77,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RATEEST) @@ -77,6 +77,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RATEEST)
obj-$(CONFIG_NETFILTER_XT_MATCH_REALM) += xt_realm.o obj-$(CONFIG_NETFILTER_XT_MATCH_REALM) += xt_realm.o
obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
@ -42,10 +42,10 @@ Index: linux-2.6.25.1/net/netfilter/Makefile
obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o
obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
Index: linux-2.6.25.1/net/netfilter/xt_layer7.c Index: linux-2.6.25.4/net/netfilter/xt_layer7.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/netfilter/xt_layer7.c +++ linux-2.6.25.4/net/netfilter/xt_layer7.c
@@ -0,0 +1,634 @@ @@ -0,0 +1,634 @@
+/* +/*
+ Kernel module to match application layer (OSI layer 7) data in connections. + Kernel module to match application layer (OSI layer 7) data in connections.
@ -681,10 +681,10 @@ Index: linux-2.6.25.1/net/netfilter/xt_layer7.c
+ +
+module_init(xt_layer7_init); +module_init(xt_layer7_init);
+module_exit(xt_layer7_fini); +module_exit(xt_layer7_fini);
Index: linux-2.6.25.1/net/netfilter/regexp/regexp.c Index: linux-2.6.25.4/net/netfilter/regexp/regexp.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/netfilter/regexp/regexp.c +++ linux-2.6.25.4/net/netfilter/regexp/regexp.c
@@ -0,0 +1,1197 @@ @@ -0,0 +1,1197 @@
+/* +/*
+ * regcomp and regexec -- regsub and regerror are elsewhere + * regcomp and regexec -- regsub and regerror are elsewhere
@ -1883,10 +1883,10 @@ Index: linux-2.6.25.1/net/netfilter/regexp/regexp.c
+#endif +#endif
+ +
+ +
Index: linux-2.6.25.1/net/netfilter/regexp/regexp.h Index: linux-2.6.25.4/net/netfilter/regexp/regexp.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/netfilter/regexp/regexp.h +++ linux-2.6.25.4/net/netfilter/regexp/regexp.h
@@ -0,0 +1,41 @@ @@ -0,0 +1,41 @@
+/* +/*
+ * Definitions etc. for regexp(3) routines. + * Definitions etc. for regexp(3) routines.
@ -1929,20 +1929,20 @@ Index: linux-2.6.25.1/net/netfilter/regexp/regexp.h
+void regerror(char *s); +void regerror(char *s);
+ +
+#endif +#endif
Index: linux-2.6.25.1/net/netfilter/regexp/regmagic.h Index: linux-2.6.25.4/net/netfilter/regexp/regmagic.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/netfilter/regexp/regmagic.h +++ linux-2.6.25.4/net/netfilter/regexp/regmagic.h
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
+/* +/*
+ * The first byte of the regexp internal "program" is actually this magic + * The first byte of the regexp internal "program" is actually this magic
+ * number; the start node begins in the second byte. + * number; the start node begins in the second byte.
+ */ + */
+#define MAGIC 0234 +#define MAGIC 0234
Index: linux-2.6.25.1/net/netfilter/regexp/regsub.c Index: linux-2.6.25.4/net/netfilter/regexp/regsub.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/netfilter/regexp/regsub.c +++ linux-2.6.25.4/net/netfilter/regexp/regsub.c
@@ -0,0 +1,95 @@ @@ -0,0 +1,95 @@
+/* +/*
+ * regsub + * regsub
@ -2039,10 +2039,10 @@ Index: linux-2.6.25.1/net/netfilter/regexp/regsub.c
+ } + }
+ *dst++ = '\0'; + *dst++ = '\0';
+} +}
Index: linux-2.6.25.1/net/netfilter/nf_conntrack_core.c Index: linux-2.6.25.4/net/netfilter/nf_conntrack_core.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/netfilter/nf_conntrack_core.c --- linux-2.6.25.4.orig/net/netfilter/nf_conntrack_core.c
+++ linux-2.6.25.1/net/netfilter/nf_conntrack_core.c +++ linux-2.6.25.4/net/netfilter/nf_conntrack_core.c
@@ -210,6 +210,14 @@ destroy_conntrack(struct nf_conntrack *n @@ -210,6 +210,14 @@ destroy_conntrack(struct nf_conntrack *n
* too. */ * too. */
nf_ct_remove_expectations(ct); nf_ct_remove_expectations(ct);
@ -2058,10 +2058,10 @@ Index: linux-2.6.25.1/net/netfilter/nf_conntrack_core.c
/* We overload first tuple to link into unconfirmed list. */ /* We overload first tuple to link into unconfirmed list. */
if (!nf_ct_is_confirmed(ct)) { if (!nf_ct_is_confirmed(ct)) {
BUG_ON(hlist_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnode)); BUG_ON(hlist_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnode));
Index: linux-2.6.25.1/net/netfilter/nf_conntrack_standalone.c Index: linux-2.6.25.4/net/netfilter/nf_conntrack_standalone.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/netfilter/nf_conntrack_standalone.c --- linux-2.6.25.4.orig/net/netfilter/nf_conntrack_standalone.c
+++ linux-2.6.25.1/net/netfilter/nf_conntrack_standalone.c +++ linux-2.6.25.4/net/netfilter/nf_conntrack_standalone.c
@@ -181,7 +181,12 @@ static int ct_seq_show(struct seq_file * @@ -181,7 +181,12 @@ static int ct_seq_show(struct seq_file *
return -ENOSPC; return -ENOSPC;
#endif #endif
@ -2076,10 +2076,10 @@ Index: linux-2.6.25.1/net/netfilter/nf_conntrack_standalone.c
return -ENOSPC; return -ENOSPC;
return 0; return 0;
Index: linux-2.6.25.1/include/net/netfilter/nf_conntrack.h Index: linux-2.6.25.4/include/net/netfilter/nf_conntrack.h
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/include/net/netfilter/nf_conntrack.h --- linux-2.6.25.4.orig/include/net/netfilter/nf_conntrack.h
+++ linux-2.6.25.1/include/net/netfilter/nf_conntrack.h +++ linux-2.6.25.4/include/net/netfilter/nf_conntrack.h
@@ -124,6 +124,22 @@ struct nf_conn @@ -124,6 +124,22 @@ struct nf_conn
u_int32_t secmark; u_int32_t secmark;
#endif #endif
@ -2103,10 +2103,10 @@ Index: linux-2.6.25.1/include/net/netfilter/nf_conntrack.h
/* Storage reserved for other modules: */ /* Storage reserved for other modules: */
union nf_conntrack_proto proto; union nf_conntrack_proto proto;
Index: linux-2.6.25.1/include/linux/netfilter/xt_layer7.h Index: linux-2.6.25.4/include/linux/netfilter/xt_layer7.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter/xt_layer7.h +++ linux-2.6.25.4/include/linux/netfilter/xt_layer7.h
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
+#ifndef _XT_LAYER7_H +#ifndef _XT_LAYER7_H
+#define _XT_LAYER7_H +#define _XT_LAYER7_H

12
target/linux/generic-2.6/patches-2.6.25/101-netfilter_layer7_pktmatch.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/include/linux/netfilter/xt_layer7.h Index: linux-2.6.25.4/include/linux/netfilter/xt_layer7.h
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/include/linux/netfilter/xt_layer7.h --- linux-2.6.25.4.orig/include/linux/netfilter/xt_layer7.h
+++ linux-2.6.25.1/include/linux/netfilter/xt_layer7.h +++ linux-2.6.25.4/include/linux/netfilter/xt_layer7.h
@@ -8,6 +8,7 @@ struct xt_layer7_info { @@ -8,6 +8,7 @@ struct xt_layer7_info {
char protocol[MAX_PROTOCOL_LEN]; char protocol[MAX_PROTOCOL_LEN];
char pattern[MAX_PATTERN_LEN]; char pattern[MAX_PATTERN_LEN];
@ -10,10 +10,10 @@ Index: linux-2.6.25.1/include/linux/netfilter/xt_layer7.h
}; };
#endif /* _XT_LAYER7_H */ #endif /* _XT_LAYER7_H */
Index: linux-2.6.25.1/net/netfilter/xt_layer7.c Index: linux-2.6.25.4/net/netfilter/xt_layer7.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/netfilter/xt_layer7.c --- linux-2.6.25.4.orig/net/netfilter/xt_layer7.c
+++ linux-2.6.25.1/net/netfilter/xt_layer7.c +++ linux-2.6.25.4/net/netfilter/xt_layer7.c
@@ -297,34 +297,36 @@ static int match_no_append(struct nf_con @@ -297,34 +297,36 @@ static int match_no_append(struct nf_con
} }

20
target/linux/generic-2.6/patches-2.6.25/110-ipp2p_0.8.1rc1.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_ipp2p.h Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_ipp2p.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_ipp2p.h +++ linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_ipp2p.h
@@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
+#ifndef __IPT_IPP2P_H +#ifndef __IPT_IPP2P_H
+#define __IPT_IPP2P_H +#define __IPT_IPP2P_H
@ -34,10 +34,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_ipp2p.h
+#define IPP2P_MUTE (1 << 14) +#define IPP2P_MUTE (1 << 14)
+#define IPP2P_WASTE (1 << 15) +#define IPP2P_WASTE (1 << 15)
+#define IPP2P_XDCC (1 << 16) +#define IPP2P_XDCC (1 << 16)
Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_ipp2p.c Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_ipp2p.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ipt_ipp2p.c +++ linux-2.6.25.4/net/ipv4/netfilter/ipt_ipp2p.c
@@ -0,0 +1,856 @@ @@ -0,0 +1,856 @@
+#if defined(MODVERSIONS) +#if defined(MODVERSIONS)
+#include <linux/modversions.h> +#include <linux/modversions.h>
@ -895,10 +895,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_ipp2p.c
+module_exit(fini); +module_exit(fini);
+ +
+ +
Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/ipv4/netfilter/Kconfig --- linux-2.6.25.4.orig/net/ipv4/netfilter/Kconfig
+++ linux-2.6.25.1/net/ipv4/netfilter/Kconfig +++ linux-2.6.25.4/net/ipv4/netfilter/Kconfig
@@ -57,6 +57,12 @@ config IP_NF_IPTABLES @@ -57,6 +57,12 @@ config IP_NF_IPTABLES
To compile it as a module, choose M here. If unsure, say N. To compile it as a module, choose M here. If unsure, say N.
@ -912,10 +912,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig
config IP_NF_MATCH_RECENT config IP_NF_MATCH_RECENT
tristate '"recent" match support' tristate '"recent" match support'
depends on IP_NF_IPTABLES depends on IP_NF_IPTABLES
Index: linux-2.6.25.1/net/ipv4/netfilter/Makefile Index: linux-2.6.25.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/ipv4/netfilter/Makefile --- linux-2.6.25.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.6.25.1/net/ipv4/netfilter/Makefile +++ linux-2.6.25.4/net/ipv4/netfilter/Makefile
@@ -47,6 +47,8 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn @@ -47,6 +47,8 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn
obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o

104
target/linux/generic-2.6/patches-2.6.25/130-netfilter_ipset.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set.h Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set.h +++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set.h
@@ -0,0 +1,498 @@ @@ -0,0 +1,498 @@
+#ifndef _IP_SET_H +#ifndef _IP_SET_H
+#define _IP_SET_H +#define _IP_SET_H
@ -501,10 +501,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set.h
+#endif /* __KERNEL__ */ +#endif /* __KERNEL__ */
+ +
+#endif /*_IP_SET_H*/ +#endif /*_IP_SET_H*/
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iphash.h Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iphash.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iphash.h +++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iphash.h
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
+#ifndef __IP_SET_IPHASH_H +#ifndef __IP_SET_IPHASH_H
+#define __IP_SET_IPHASH_H +#define __IP_SET_IPHASH_H
@ -536,10 +536,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iphash.h
+}; +};
+ +
+#endif /* __IP_SET_IPHASH_H */ +#endif /* __IP_SET_IPHASH_H */
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_ipmap.h Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_ipmap.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_ipmap.h +++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_ipmap.h
@@ -0,0 +1,56 @@ @@ -0,0 +1,56 @@
+#ifndef __IP_SET_IPMAP_H +#ifndef __IP_SET_IPMAP_H
+#define __IP_SET_IPMAP_H +#define __IP_SET_IPMAP_H
@ -597,10 +597,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_ipmap.h
+} +}
+ +
+#endif /* __IP_SET_IPMAP_H */ +#endif /* __IP_SET_IPMAP_H */
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_ipporthash.h Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_ipporthash.h +++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h
@@ -0,0 +1,34 @@ @@ -0,0 +1,34 @@
+#ifndef __IP_SET_IPPORTHASH_H +#ifndef __IP_SET_IPPORTHASH_H
+#define __IP_SET_IPPORTHASH_H +#define __IP_SET_IPPORTHASH_H
@ -636,10 +636,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_ipporthash.h
+}; +};
+ +
+#endif /* __IP_SET_IPPORTHASH_H */ +#endif /* __IP_SET_IPPORTHASH_H */
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iptree.h Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iptree.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iptree.h +++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iptree.h
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+#ifndef __IP_SET_IPTREE_H +#ifndef __IP_SET_IPTREE_H
+#define __IP_SET_IPTREE_H +#define __IP_SET_IPTREE_H
@ -681,10 +681,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iptree.h
+}; +};
+ +
+#endif /* __IP_SET_IPTREE_H */ +#endif /* __IP_SET_IPTREE_H */
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iptreemap.h Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iptreemap.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iptreemap.h +++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iptreemap.h
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+#ifndef __IP_SET_IPTREEMAP_H +#ifndef __IP_SET_IPTREEMAP_H
+#define __IP_SET_IPTREEMAP_H +#define __IP_SET_IPTREEMAP_H
@ -726,10 +726,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iptreemap.h
+}; +};
+ +
+#endif /* __IP_SET_IPTREEMAP_H */ +#endif /* __IP_SET_IPTREEMAP_H */
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_jhash.h Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_jhash.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_jhash.h +++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_jhash.h
@@ -0,0 +1,148 @@ @@ -0,0 +1,148 @@
+#ifndef _LINUX_IPSET_JHASH_H +#ifndef _LINUX_IPSET_JHASH_H
+#define _LINUX_IPSET_JHASH_H +#define _LINUX_IPSET_JHASH_H
@ -879,10 +879,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_jhash.h
+} +}
+ +
+#endif /* _LINUX_IPSET_JHASH_H */ +#endif /* _LINUX_IPSET_JHASH_H */
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_macipmap.h Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_macipmap.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_macipmap.h +++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_macipmap.h
@@ -0,0 +1,38 @@ @@ -0,0 +1,38 @@
+#ifndef __IP_SET_MACIPMAP_H +#ifndef __IP_SET_MACIPMAP_H
+#define __IP_SET_MACIPMAP_H +#define __IP_SET_MACIPMAP_H
@ -922,10 +922,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_macipmap.h
+}; +};
+ +
+#endif /* __IP_SET_MACIPMAP_H */ +#endif /* __IP_SET_MACIPMAP_H */
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_malloc.h Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_malloc.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_malloc.h +++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_malloc.h
@@ -0,0 +1,116 @@ @@ -0,0 +1,116 @@
+#ifndef _IP_SET_MALLOC_H +#ifndef _IP_SET_MALLOC_H
+#define _IP_SET_MALLOC_H +#define _IP_SET_MALLOC_H
@ -1043,10 +1043,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_malloc.h
+#endif /* __KERNEL__ */ +#endif /* __KERNEL__ */
+ +
+#endif /*_IP_SET_MALLOC_H*/ +#endif /*_IP_SET_MALLOC_H*/
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_nethash.h Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_nethash.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_nethash.h +++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_nethash.h
@@ -0,0 +1,55 @@ @@ -0,0 +1,55 @@
+#ifndef __IP_SET_NETHASH_H +#ifndef __IP_SET_NETHASH_H
+#define __IP_SET_NETHASH_H +#define __IP_SET_NETHASH_H
@ -1103,10 +1103,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_nethash.h
+} +}
+ +
+#endif /* __IP_SET_NETHASH_H */ +#endif /* __IP_SET_NETHASH_H */
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_portmap.h Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_portmap.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_portmap.h +++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_portmap.h
@@ -0,0 +1,25 @@ @@ -0,0 +1,25 @@
+#ifndef __IP_SET_PORTMAP_H +#ifndef __IP_SET_PORTMAP_H
+#define __IP_SET_PORTMAP_H +#define __IP_SET_PORTMAP_H
@ -1133,10 +1133,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_portmap.h
+}; +};
+ +
+#endif /* __IP_SET_PORTMAP_H */ +#endif /* __IP_SET_PORTMAP_H */
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_set.h Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_set.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_set.h +++ linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_set.h
@@ -0,0 +1,21 @@ @@ -0,0 +1,21 @@
+#ifndef _IPT_SET_H +#ifndef _IPT_SET_H
+#define _IPT_SET_H +#define _IPT_SET_H
@ -1159,10 +1159,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_set.h
+}; +};
+ +
+#endif /*_IPT_SET_H*/ +#endif /*_IPT_SET_H*/
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set.c Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set.c +++ linux-2.6.25.4/net/ipv4/netfilter/ip_set.c
@@ -0,0 +1,2003 @@ @@ -0,0 +1,2003 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu> +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de> + * Patrick Schaaf <bof@bof.de>
@ -3167,10 +3167,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set.c
+ +
+module_init(ip_set_init); +module_init(ip_set_init);
+module_exit(ip_set_fini); +module_exit(ip_set_fini);
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_iphash.c Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_iphash.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_iphash.c +++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_iphash.c
@@ -0,0 +1,429 @@ @@ -0,0 +1,429 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ * + *
@ -3601,10 +3601,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_iphash.c
+ +
+module_init(ip_set_iphash_init); +module_init(ip_set_iphash_init);
+module_exit(ip_set_iphash_fini); +module_exit(ip_set_iphash_fini);
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_ipmap.c Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_ipmap.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_ipmap.c +++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_ipmap.c
@@ -0,0 +1,336 @@ @@ -0,0 +1,336 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu> +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de> + * Patrick Schaaf <bof@bof.de>
@ -3942,10 +3942,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_ipmap.c
+ +
+module_init(ip_set_ipmap_init); +module_init(ip_set_ipmap_init);
+module_exit(ip_set_ipmap_fini); +module_exit(ip_set_ipmap_fini);
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_ipporthash.c Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_ipporthash.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_ipporthash.c +++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_ipporthash.c
@@ -0,0 +1,581 @@ @@ -0,0 +1,581 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ * + *
@ -4528,10 +4528,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_ipporthash.c
+ +
+module_init(ip_set_ipporthash_init); +module_init(ip_set_ipporthash_init);
+module_exit(ip_set_ipporthash_fini); +module_exit(ip_set_ipporthash_fini);
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_iptree.c Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_iptree.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_iptree.c +++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_iptree.c
@@ -0,0 +1,612 @@ @@ -0,0 +1,612 @@
+/* Copyright (C) 2005 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> +/* Copyright (C) 2005 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ * + *
@ -5145,10 +5145,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_iptree.c
+ +
+module_init(ip_set_iptree_init); +module_init(ip_set_iptree_init);
+module_exit(ip_set_iptree_fini); +module_exit(ip_set_iptree_fini);
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_iptreemap.c Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_iptreemap.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_iptreemap.c +++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_iptreemap.c
@@ -0,0 +1,829 @@ @@ -0,0 +1,829 @@
+/* Copyright (C) 2007 Sven Wegener <sven.wegener@stealer.net> +/* Copyright (C) 2007 Sven Wegener <sven.wegener@stealer.net>
+ * + *
@ -5979,10 +5979,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_iptreemap.c
+ +
+module_init(ip_set_iptreemap_init); +module_init(ip_set_iptreemap_init);
+module_exit(ip_set_iptreemap_fini); +module_exit(ip_set_iptreemap_fini);
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_macipmap.c Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_macipmap.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_macipmap.c +++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_macipmap.c
@@ -0,0 +1,375 @@ @@ -0,0 +1,375 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu> +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de> + * Patrick Schaaf <bof@bof.de>
@ -6359,10 +6359,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_macipmap.c
+ +
+module_init(ip_set_macipmap_init); +module_init(ip_set_macipmap_init);
+module_exit(ip_set_macipmap_fini); +module_exit(ip_set_macipmap_fini);
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_nethash.c Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_nethash.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_nethash.c +++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_nethash.c
@@ -0,0 +1,497 @@ @@ -0,0 +1,497 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ * + *
@ -6861,10 +6861,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_nethash.c
+ +
+module_init(ip_set_nethash_init); +module_init(ip_set_nethash_init);
+module_exit(ip_set_nethash_fini); +module_exit(ip_set_nethash_fini);
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_portmap.c Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_portmap.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_portmap.c +++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_portmap.c
@@ -0,0 +1,346 @@ @@ -0,0 +1,346 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ * + *
@ -7212,10 +7212,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_portmap.c
+ +
+module_init(ip_set_portmap_init); +module_init(ip_set_portmap_init);
+module_exit(ip_set_portmap_fini); +module_exit(ip_set_portmap_fini);
Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_set.c Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_set.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ipt_set.c +++ linux-2.6.25.4/net/ipv4/netfilter/ipt_set.c
@@ -0,0 +1,160 @@ @@ -0,0 +1,160 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu> +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de> + * Patrick Schaaf <bof@bof.de>
@ -7377,10 +7377,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_set.c
+ +
+module_init(ipt_ipset_init); +module_init(ipt_ipset_init);
+module_exit(ipt_ipset_fini); +module_exit(ipt_ipset_fini);
Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_SET.c Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_SET.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ipt_SET.c +++ linux-2.6.25.4/net/ipv4/netfilter/ipt_SET.c
@@ -0,0 +1,179 @@ @@ -0,0 +1,179 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu> +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de> + * Patrick Schaaf <bof@bof.de>
@ -7561,10 +7561,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_SET.c
+ +
+module_init(ipt_SET_init); +module_init(ipt_SET_init);
+module_exit(ipt_SET_fini); +module_exit(ipt_SET_fini);
Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/ipv4/netfilter/Kconfig --- linux-2.6.25.4.orig/net/ipv4/netfilter/Kconfig
+++ linux-2.6.25.1/net/ipv4/netfilter/Kconfig +++ linux-2.6.25.4/net/ipv4/netfilter/Kconfig
@@ -385,5 +385,122 @@ config IP_NF_ARP_MANGLE @@ -385,5 +385,122 @@ config IP_NF_ARP_MANGLE
Allows altering the ARP packet payload: source and destination Allows altering the ARP packet payload: source and destination
hardware and network addresses. hardware and network addresses.
@ -7688,10 +7688,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig
+ +
endmenu endmenu
Index: linux-2.6.25.1/net/ipv4/netfilter/Makefile Index: linux-2.6.25.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/ipv4/netfilter/Makefile --- linux-2.6.25.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.6.25.1/net/ipv4/netfilter/Makefile +++ linux-2.6.25.4/net/ipv4/netfilter/Makefile
@@ -46,6 +46,7 @@ obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o @@ -46,6 +46,7 @@ obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o
obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o
obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o

20
target/linux/generic-2.6/patches-2.6.25/140-netfilter_time.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_time.h Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_time.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_time.h +++ linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_time.h
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
+#ifndef __ipt_time_h_included__ +#ifndef __ipt_time_h_included__
+#define __ipt_time_h_included__ +#define __ipt_time_h_included__
@ -21,10 +21,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_time.h
+ +
+ +
+#endif /* __ipt_time_h_included__ */ +#endif /* __ipt_time_h_included__ */
Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_time.c Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_time.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ipt_time.c +++ linux-2.6.25.4/net/ipv4/netfilter/ipt_time.c
@@ -0,0 +1,180 @@ @@ -0,0 +1,180 @@
+/* +/*
+ This is a module which is used for time matching + This is a module which is used for time matching
@ -206,10 +206,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_time.c
+ r->tm_mon=i; + r->tm_mon=i;
+ r->tm_mday=work-__spm[i]+1; + r->tm_mday=work-__spm[i]+1;
+} +}
Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/ipv4/netfilter/Kconfig --- linux-2.6.25.4.orig/net/ipv4/netfilter/Kconfig
+++ linux-2.6.25.1/net/ipv4/netfilter/Kconfig +++ linux-2.6.25.4/net/ipv4/netfilter/Kconfig
@@ -63,6 +63,22 @@ config IP_NF_MATCH_IPP2P @@ -63,6 +63,22 @@ config IP_NF_MATCH_IPP2P
help help
Module for matching traffic of various Peer-to-Peer applications Module for matching traffic of various Peer-to-Peer applications
@ -233,10 +233,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig
config IP_NF_MATCH_RECENT config IP_NF_MATCH_RECENT
tristate '"recent" match support' tristate '"recent" match support'
depends on IP_NF_IPTABLES depends on IP_NF_IPTABLES
Index: linux-2.6.25.1/net/ipv4/netfilter/Makefile Index: linux-2.6.25.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/ipv4/netfilter/Makefile --- linux-2.6.25.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.6.25.1/net/ipv4/netfilter/Makefile +++ linux-2.6.25.4/net/ipv4/netfilter/Makefile
@@ -47,6 +47,7 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn @@ -47,6 +47,7 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn
obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o

78
target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/drivers/net/imq.c Index: linux-2.6.25.4/drivers/net/imq.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/drivers/net/imq.c +++ linux-2.6.25.4/drivers/net/imq.c
@@ -0,0 +1,409 @@ @@ -0,0 +1,409 @@
+/* +/*
+ * Pseudo-driver for the intermediate queue device. + * Pseudo-driver for the intermediate queue device.
@ -412,10 +412,10 @@ Index: linux-2.6.25.1/drivers/net/imq.c
+MODULE_AUTHOR("http://www.linuximq.net"); +MODULE_AUTHOR("http://www.linuximq.net");
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information."); +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
Index: linux-2.6.25.1/drivers/net/Kconfig Index: linux-2.6.25.4/drivers/net/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/net/Kconfig --- linux-2.6.25.4.orig/drivers/net/Kconfig
+++ linux-2.6.25.1/drivers/net/Kconfig +++ linux-2.6.25.4/drivers/net/Kconfig
@@ -117,6 +117,129 @@ config EQUALIZER @@ -117,6 +117,129 @@ config EQUALIZER
To compile this driver as a module, choose M here: the module To compile this driver as a module, choose M here: the module
will be called eql. If unsure, say N. will be called eql. If unsure, say N.
@ -546,10 +546,10 @@ Index: linux-2.6.25.1/drivers/net/Kconfig
config TUN config TUN
tristate "Universal TUN/TAP device driver support" tristate "Universal TUN/TAP device driver support"
select CRC32 select CRC32
Index: linux-2.6.25.1/drivers/net/Makefile Index: linux-2.6.25.4/drivers/net/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/net/Makefile --- linux-2.6.25.4.orig/drivers/net/Makefile
+++ linux-2.6.25.1/drivers/net/Makefile +++ linux-2.6.25.4/drivers/net/Makefile
@@ -143,6 +143,7 @@ obj-$(CONFIG_SLHC) += slhc.o @@ -143,6 +143,7 @@ obj-$(CONFIG_SLHC) += slhc.o
obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
@ -558,10 +558,10 @@ Index: linux-2.6.25.1/drivers/net/Makefile
obj-$(CONFIG_IFB) += ifb.o obj-$(CONFIG_IFB) += ifb.o
obj-$(CONFIG_MACVLAN) += macvlan.o obj-$(CONFIG_MACVLAN) += macvlan.o
obj-$(CONFIG_DE600) += de600.o obj-$(CONFIG_DE600) += de600.o
Index: linux-2.6.25.1/include/linux/imq.h Index: linux-2.6.25.4/include/linux/imq.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/imq.h +++ linux-2.6.25.4/include/linux/imq.h
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
+#ifndef _IMQ_H +#ifndef _IMQ_H
+#define _IMQ_H +#define _IMQ_H
@ -572,10 +572,10 @@ Index: linux-2.6.25.1/include/linux/imq.h
+#define IMQ_F_ENQUEUE 0x80 +#define IMQ_F_ENQUEUE 0x80
+ +
+#endif /* _IMQ_H */ +#endif /* _IMQ_H */
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_IMQ.h Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_IMQ.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_IMQ.h +++ linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_IMQ.h
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
+#ifndef _IPT_IMQ_H +#ifndef _IPT_IMQ_H
+#define _IPT_IMQ_H +#define _IPT_IMQ_H
@ -585,10 +585,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_IMQ.h
+}; +};
+ +
+#endif /* _IPT_IMQ_H */ +#endif /* _IPT_IMQ_H */
Index: linux-2.6.25.1/include/linux/netfilter_ipv6/ip6t_IMQ.h Index: linux-2.6.25.4/include/linux/netfilter_ipv6/ip6t_IMQ.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv6/ip6t_IMQ.h +++ linux-2.6.25.4/include/linux/netfilter_ipv6/ip6t_IMQ.h
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
+#ifndef _IP6T_IMQ_H +#ifndef _IP6T_IMQ_H
+#define _IP6T_IMQ_H +#define _IP6T_IMQ_H
@ -598,10 +598,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv6/ip6t_IMQ.h
+}; +};
+ +
+#endif /* _IP6T_IMQ_H */ +#endif /* _IP6T_IMQ_H */
Index: linux-2.6.25.1/include/linux/skbuff.h Index: linux-2.6.25.4/include/linux/skbuff.h
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/include/linux/skbuff.h --- linux-2.6.25.4.orig/include/linux/skbuff.h
+++ linux-2.6.25.1/include/linux/skbuff.h +++ linux-2.6.25.4/include/linux/skbuff.h
@@ -296,6 +296,10 @@ struct sk_buff { @@ -296,6 +296,10 @@ struct sk_buff {
struct nf_conntrack *nfct; struct nf_conntrack *nfct;
struct sk_buff *nfct_reasm; struct sk_buff *nfct_reasm;
@ -624,10 +624,10 @@ Index: linux-2.6.25.1/include/linux/skbuff.h
#ifdef CONFIG_BRIDGE_NETFILTER #ifdef CONFIG_BRIDGE_NETFILTER
dst->nf_bridge = src->nf_bridge; dst->nf_bridge = src->nf_bridge;
nf_bridge_get(src->nf_bridge); nf_bridge_get(src->nf_bridge);
Index: linux-2.6.25.1/net/core/dev.c Index: linux-2.6.25.4/net/core/dev.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/core/dev.c --- linux-2.6.25.4.orig/net/core/dev.c
+++ linux-2.6.25.1/net/core/dev.c +++ linux-2.6.25.4/net/core/dev.c
@@ -95,6 +95,9 @@ @@ -95,6 +95,9 @@
#include <net/net_namespace.h> #include <net/net_namespace.h>
#include <net/sock.h> #include <net/sock.h>
@ -651,10 +651,10 @@ Index: linux-2.6.25.1/net/core/dev.c
dev_queue_xmit_nit(skb, dev); dev_queue_xmit_nit(skb, dev);
if (netif_needs_gso(dev, skb)) { if (netif_needs_gso(dev, skb)) {
Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_IMQ.c Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_IMQ.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ipt_IMQ.c +++ linux-2.6.25.4/net/ipv4/netfilter/ipt_IMQ.c
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
+/* +/*
+ * This target marks packets to be enqueued to an imq device + * This target marks packets to be enqueued to an imq device
@ -725,10 +725,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_IMQ.c
+MODULE_AUTHOR("http://www.linuximq.net"); +MODULE_AUTHOR("http://www.linuximq.net");
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information."); +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/ipv4/netfilter/Kconfig --- linux-2.6.25.4.orig/net/ipv4/netfilter/Kconfig
+++ linux-2.6.25.1/net/ipv4/netfilter/Kconfig +++ linux-2.6.25.4/net/ipv4/netfilter/Kconfig
@@ -315,6 +315,17 @@ config IP_NF_MANGLE @@ -315,6 +315,17 @@ config IP_NF_MANGLE
To compile it as a module, choose M here. If unsure, say N. To compile it as a module, choose M here. If unsure, say N.
@ -747,10 +747,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig
config IP_NF_TARGET_ECN config IP_NF_TARGET_ECN
tristate "ECN target support" tristate "ECN target support"
depends on IP_NF_MANGLE depends on IP_NF_MANGLE
Index: linux-2.6.25.1/net/ipv4/netfilter/Makefile Index: linux-2.6.25.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/ipv4/netfilter/Makefile --- linux-2.6.25.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.6.25.1/net/ipv4/netfilter/Makefile +++ linux-2.6.25.4/net/ipv4/netfilter/Makefile
@@ -55,6 +55,7 @@ obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_i @@ -55,6 +55,7 @@ obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_i
obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
@ -759,10 +759,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/Makefile
obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
Index: linux-2.6.25.1/net/ipv6/netfilter/ip6t_IMQ.c Index: linux-2.6.25.4/net/ipv6/netfilter/ip6t_IMQ.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/ipv6/netfilter/ip6t_IMQ.c +++ linux-2.6.25.4/net/ipv6/netfilter/ip6t_IMQ.c
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
+/* +/*
+ * This target marks packets to be enqueued to an imq device + * This target marks packets to be enqueued to an imq device
@ -833,10 +833,10 @@ Index: linux-2.6.25.1/net/ipv6/netfilter/ip6t_IMQ.c
+MODULE_AUTHOR("http://www.linuximq.net"); +MODULE_AUTHOR("http://www.linuximq.net");
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information."); +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
Index: linux-2.6.25.1/net/ipv6/netfilter/Kconfig Index: linux-2.6.25.4/net/ipv6/netfilter/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/ipv6/netfilter/Kconfig --- linux-2.6.25.4.orig/net/ipv6/netfilter/Kconfig
+++ linux-2.6.25.1/net/ipv6/netfilter/Kconfig +++ linux-2.6.25.4/net/ipv6/netfilter/Kconfig
@@ -179,6 +179,15 @@ config IP6_NF_MANGLE @@ -179,6 +179,15 @@ config IP6_NF_MANGLE
To compile it as a module, choose M here. If unsure, say N. To compile it as a module, choose M here. If unsure, say N.
@ -853,10 +853,10 @@ Index: linux-2.6.25.1/net/ipv6/netfilter/Kconfig
config IP6_NF_TARGET_HL config IP6_NF_TARGET_HL
tristate 'HL (hoplimit) target support' tristate 'HL (hoplimit) target support'
depends on IP6_NF_MANGLE depends on IP6_NF_MANGLE
Index: linux-2.6.25.1/net/ipv6/netfilter/Makefile Index: linux-2.6.25.4/net/ipv6/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/ipv6/netfilter/Makefile --- linux-2.6.25.4.orig/net/ipv6/netfilter/Makefile
+++ linux-2.6.25.1/net/ipv6/netfilter/Makefile +++ linux-2.6.25.4/net/ipv6/netfilter/Makefile
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o
obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
@ -865,10 +865,10 @@ Index: linux-2.6.25.1/net/ipv6/netfilter/Makefile
obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o
Index: linux-2.6.25.1/net/sched/sch_generic.c Index: linux-2.6.25.4/net/sched/sch_generic.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/sched/sch_generic.c --- linux-2.6.25.4.orig/net/sched/sch_generic.c
+++ linux-2.6.25.1/net/sched/sch_generic.c +++ linux-2.6.25.4/net/sched/sch_generic.c
@@ -182,6 +182,13 @@ static inline int qdisc_restart(struct n @@ -182,6 +182,13 @@ static inline int qdisc_restart(struct n
return ret; return ret;
} }

50
target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch
View File

@ -1,17 +1,17 @@
Index: linux-2.6.25.1/include/linux/netfilter/oot_conntrack.h Index: linux-2.6.25.4/include/linux/netfilter/oot_conntrack.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter/oot_conntrack.h +++ linux-2.6.25.4/include/linux/netfilter/oot_conntrack.h
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
+#if defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE) +#if defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE)
+# include <linux/netfilter_ipv4/ip_conntrack.h> +# include <linux/netfilter_ipv4/ip_conntrack.h>
+#else /* linux-2.6.20+ */ +#else /* linux-2.6.20+ */
+# include <net/netfilter/nf_nat_rule.h> +# include <net/netfilter/nf_nat_rule.h>
+#endif +#endif
Index: linux-2.6.25.1/include/linux/netfilter/oot_trans.h Index: linux-2.6.25.4/include/linux/netfilter/oot_trans.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter/oot_trans.h +++ linux-2.6.25.4/include/linux/netfilter/oot_trans.h
@@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
+/* Out of tree workarounds */ +/* Out of tree workarounds */
+#include <linux/version.h> +#include <linux/version.h>
@ -27,10 +27,10 @@ Index: linux-2.6.25.1/include/linux/netfilter/oot_trans.h
+# define tcp_v4_check(tcph, tcph_sz, s, d, csp) \ +# define tcp_v4_check(tcph, tcph_sz, s, d, csp) \
+ tcp_v4_check((tcph_sz), (s), (d), (csp)) + tcp_v4_check((tcph_sz), (s), (d), (csp))
+#endif +#endif
Index: linux-2.6.25.1/include/linux/netfilter/xt_CHAOS.h Index: linux-2.6.25.4/include/linux/netfilter/xt_CHAOS.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter/xt_CHAOS.h +++ linux-2.6.25.4/include/linux/netfilter/xt_CHAOS.h
@@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
+#ifndef _LINUX_NETFILTER_XT_CHAOS_H +#ifndef _LINUX_NETFILTER_XT_CHAOS_H
+#define _LINUX_NETFILTER_XT_CHAOS_H 1 +#define _LINUX_NETFILTER_XT_CHAOS_H 1
@ -46,10 +46,10 @@ Index: linux-2.6.25.1/include/linux/netfilter/xt_CHAOS.h
+}; +};
+ +
+#endif /* _LINUX_NETFILTER_XT_CHAOS_H */ +#endif /* _LINUX_NETFILTER_XT_CHAOS_H */
Index: linux-2.6.25.1/include/linux/netfilter/xt_portscan.h Index: linux-2.6.25.4/include/linux/netfilter/xt_portscan.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter/xt_portscan.h +++ linux-2.6.25.4/include/linux/netfilter/xt_portscan.h
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
+#ifndef _LINUX_NETFILTER_XT_PORTSCAN_H +#ifndef _LINUX_NETFILTER_XT_PORTSCAN_H
+#define _LINUX_NETFILTER_XT_PORTSCAN_H 1 +#define _LINUX_NETFILTER_XT_PORTSCAN_H 1
@ -59,10 +59,10 @@ Index: linux-2.6.25.1/include/linux/netfilter/xt_portscan.h
+}; +};
+ +
+#endif /* _LINUX_NETFILTER_XT_PORTSCAN_H */ +#endif /* _LINUX_NETFILTER_XT_PORTSCAN_H */
Index: linux-2.6.25.1/net/netfilter/find_match.c Index: linux-2.6.25.4/net/netfilter/find_match.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/netfilter/find_match.c +++ linux-2.6.25.4/net/netfilter/find_match.c
@@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
+/* +/*
+ xt_request_find_match + xt_request_find_match
@ -103,10 +103,10 @@ Index: linux-2.6.25.1/net/netfilter/find_match.c
+ +
+/* In case it goes into mainline, let this out-of-tree package compile */ +/* In case it goes into mainline, let this out-of-tree package compile */
+#define xt_request_find_match xt_request_find_match_lo +#define xt_request_find_match xt_request_find_match_lo
Index: linux-2.6.25.1/net/netfilter/Kconfig Index: linux-2.6.25.4/net/netfilter/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/netfilter/Kconfig --- linux-2.6.25.4.orig/net/netfilter/Kconfig
+++ linux-2.6.25.1/net/netfilter/Kconfig +++ linux-2.6.25.4/net/netfilter/Kconfig
@@ -276,6 +276,14 @@ config NETFILTER_XTABLES @@ -276,6 +276,14 @@ config NETFILTER_XTABLES
# alphabetically ordered list of targets # alphabetically ordered list of targets
@ -152,10 +152,10 @@ Index: linux-2.6.25.1/net/netfilter/Kconfig
config NETFILTER_XT_MATCH_MULTIPORT config NETFILTER_XT_MATCH_MULTIPORT
tristate '"multiport" Multiple port match support' tristate '"multiport" Multiple port match support'
depends on NETFILTER_XTABLES depends on NETFILTER_XTABLES
Index: linux-2.6.25.1/net/netfilter/Makefile Index: linux-2.6.25.4/net/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/netfilter/Makefile --- linux-2.6.25.4.orig/net/netfilter/Makefile
+++ linux-2.6.25.1/net/netfilter/Makefile +++ linux-2.6.25.4/net/netfilter/Makefile
@@ -50,6 +50,8 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK @@ -50,6 +50,8 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK
obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o
obj-$(CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP) += xt_TCPOPTSTRIP.o obj-$(CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP) += xt_TCPOPTSTRIP.o
@ -170,10 +170,10 @@ Index: linux-2.6.25.1/net/netfilter/Makefile
obj-$(CONFIG_NETFILTER_XT_MATCH_TIME) += xt_time.o obj-$(CONFIG_NETFILTER_XT_MATCH_TIME) += xt_time.o
obj-$(CONFIG_NETFILTER_XT_MATCH_U32) += xt_u32.o obj-$(CONFIG_NETFILTER_XT_MATCH_U32) += xt_u32.o
+obj-$(CONFIG_NETFILTER_XT_MATCH_PORTSCAN) += xt_portscan.o +obj-$(CONFIG_NETFILTER_XT_MATCH_PORTSCAN) += xt_portscan.o
Index: linux-2.6.25.1/net/netfilter/xt_CHAOS.c Index: linux-2.6.25.4/net/netfilter/xt_CHAOS.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/netfilter/xt_CHAOS.c +++ linux-2.6.25.4/net/netfilter/xt_CHAOS.c
@@ -0,0 +1,200 @@ @@ -0,0 +1,200 @@
+/* +/*
+ * CHAOS target for netfilter + * CHAOS target for netfilter
@ -375,10 +375,10 @@ Index: linux-2.6.25.1/net/netfilter/xt_CHAOS.c
+MODULE_DESCRIPTION("netfilter \"CHAOS\" target"); +MODULE_DESCRIPTION("netfilter \"CHAOS\" target");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_ALIAS("ipt_CHAOS"); +MODULE_ALIAS("ipt_CHAOS");
Index: linux-2.6.25.1/net/netfilter/xt_DELUDE.c Index: linux-2.6.25.4/net/netfilter/xt_DELUDE.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/netfilter/xt_DELUDE.c +++ linux-2.6.25.4/net/netfilter/xt_DELUDE.c
@@ -0,0 +1,197 @@ @@ -0,0 +1,197 @@
+/* +/*
+ * DELUDE target + * DELUDE target
@ -577,10 +577,10 @@ Index: linux-2.6.25.1/net/netfilter/xt_DELUDE.c
+MODULE_DESCRIPTION("netfilter \"DELUDE\" target"); +MODULE_DESCRIPTION("netfilter \"DELUDE\" target");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_ALIAS("ipt_DELUDE"); +MODULE_ALIAS("ipt_DELUDE");
Index: linux-2.6.25.1/net/netfilter/xt_portscan.c Index: linux-2.6.25.4/net/netfilter/xt_portscan.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/netfilter/xt_portscan.c +++ linux-2.6.25.4/net/netfilter/xt_portscan.c
@@ -0,0 +1,269 @@ @@ -0,0 +1,269 @@
+/* +/*
+ * portscan match for netfilter + * portscan match for netfilter
@ -851,10 +851,10 @@ Index: linux-2.6.25.1/net/netfilter/xt_portscan.c
+MODULE_DESCRIPTION("netfilter \"portscan\" match"); +MODULE_DESCRIPTION("netfilter \"portscan\" match");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_ALIAS("ipt_portscan"); +MODULE_ALIAS("ipt_portscan");
Index: linux-2.6.25.1/drivers/char/random.c Index: linux-2.6.25.4/drivers/char/random.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/char/random.c --- linux-2.6.25.4.orig/drivers/char/random.c
+++ linux-2.6.25.1/drivers/char/random.c +++ linux-2.6.25.4/drivers/char/random.c
@@ -1563,6 +1563,8 @@ __u32 secure_tcp_sequence_number(__be32 @@ -1563,6 +1563,8 @@ __u32 secure_tcp_sequence_number(__be32
return seq; return seq;
} }

16
target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/net/netfilter/Kconfig Index: linux-2.6.25.4/net/netfilter/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/netfilter/Kconfig --- linux-2.6.25.4.orig/net/netfilter/Kconfig
+++ linux-2.6.25.1/net/netfilter/Kconfig +++ linux-2.6.25.4/net/netfilter/Kconfig
@@ -437,6 +437,23 @@ config NETFILTER_XT_TARGET_CONNSECMARK @@ -437,6 +437,23 @@ config NETFILTER_XT_TARGET_CONNSECMARK
To compile it as a module, choose M here. If unsure, say N. To compile it as a module, choose M here. If unsure, say N.
@ -26,10 +26,10 @@ Index: linux-2.6.25.1/net/netfilter/Kconfig
config NETFILTER_XT_TARGET_TCPMSS config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support' tristate '"TCPMSS" target support'
depends on NETFILTER_XTABLES && (IPV6 || IPV6=n) depends on NETFILTER_XTABLES && (IPV6 || IPV6=n)
Index: linux-2.6.25.1/net/netfilter/Makefile Index: linux-2.6.25.4/net/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/netfilter/Makefile --- linux-2.6.25.4.orig/net/netfilter/Makefile
+++ linux-2.6.25.1/net/netfilter/Makefile +++ linux-2.6.25.4/net/netfilter/Makefile
@@ -47,6 +47,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE @@ -47,6 +47,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE
obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_NOTRACK.o obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_NOTRACK.o
obj-$(CONFIG_NETFILTER_XT_TARGET_RATEEST) += xt_RATEEST.o obj-$(CONFIG_NETFILTER_XT_TARGET_RATEEST) += xt_RATEEST.o
@ -38,10 +38,10 @@ Index: linux-2.6.25.1/net/netfilter/Makefile
obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o
obj-$(CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP) += xt_TCPOPTSTRIP.o obj-$(CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP) += xt_TCPOPTSTRIP.o
obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.o obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.o
Index: linux-2.6.25.1/net/netfilter/xt_TARPIT.c Index: linux-2.6.25.4/net/netfilter/xt_TARPIT.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/netfilter/xt_TARPIT.c +++ linux-2.6.25.4/net/netfilter/xt_TARPIT.c
@@ -0,0 +1,279 @@ @@ -0,0 +1,279 @@
+/* +/*
+ * Kernel module to capture and hold incoming TCP connections using + * Kernel module to capture and hold incoming TCP connections using

6
target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/net/netfilter/Kconfig Index: linux-2.6.25.4/net/netfilter/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/netfilter/Kconfig --- linux-2.6.25.4.orig/net/netfilter/Kconfig
+++ linux-2.6.25.1/net/netfilter/Kconfig +++ linux-2.6.25.4/net/netfilter/Kconfig
@@ -145,7 +145,7 @@ config NF_CONNTRACK_FTP @@ -145,7 +145,7 @@ config NF_CONNTRACK_FTP
config NF_CONNTRACK_H323 config NF_CONNTRACK_H323

44
target/linux/generic-2.6/patches-2.6.25/190-netfilter_rtsp.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/include/linux/netfilter/nf_conntrack_rtsp.h Index: linux-2.6.25.4/include/linux/netfilter/nf_conntrack_rtsp.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter/nf_conntrack_rtsp.h +++ linux-2.6.25.4/include/linux/netfilter/nf_conntrack_rtsp.h
@@ -0,0 +1,63 @@ @@ -0,0 +1,63 @@
+/* +/*
+ * RTSP extension for IP connection tracking. + * RTSP extension for IP connection tracking.
@ -66,10 +66,10 @@ Index: linux-2.6.25.1/include/linux/netfilter/nf_conntrack_rtsp.h
+#endif /* __KERNEL__ */ +#endif /* __KERNEL__ */
+ +
+#endif /* _IP_CONNTRACK_RTSP_H */ +#endif /* _IP_CONNTRACK_RTSP_H */
Index: linux-2.6.25.1/include/linux/netfilter_helpers.h Index: linux-2.6.25.4/include/linux/netfilter_helpers.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_helpers.h +++ linux-2.6.25.4/include/linux/netfilter_helpers.h
@@ -0,0 +1,133 @@ @@ -0,0 +1,133 @@
+/* +/*
+ * Helpers for netfiler modules. This file provides implementations for basic + * Helpers for netfiler modules. This file provides implementations for basic
@ -204,10 +204,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_helpers.h
+#endif /* __KERNEL__ */ +#endif /* __KERNEL__ */
+ +
+#endif /* _NETFILTER_HELPERS_H */ +#endif /* _NETFILTER_HELPERS_H */
Index: linux-2.6.25.1/include/linux/netfilter_mime.h Index: linux-2.6.25.4/include/linux/netfilter_mime.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_mime.h +++ linux-2.6.25.4/include/linux/netfilter_mime.h
@@ -0,0 +1,89 @@ @@ -0,0 +1,89 @@
+/* +/*
+ * MIME functions for netfilter modules. This file provides implementations + * MIME functions for netfilter modules. This file provides implementations
@ -298,10 +298,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_mime.h
+#endif /* __KERNEL__ */ +#endif /* __KERNEL__ */
+ +
+#endif /* _NETFILTER_MIME_H */ +#endif /* _NETFILTER_MIME_H */
Index: linux-2.6.25.1/net/ipv4/netfilter/Makefile Index: linux-2.6.25.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/ipv4/netfilter/Makefile --- linux-2.6.25.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.6.25.1/net/ipv4/netfilter/Makefile +++ linux-2.6.25.4/net/ipv4/netfilter/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am @@ -23,6 +23,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am
obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
@ -310,10 +310,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/Makefile
obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o
obj-$(CONFIG_NF_NAT_SIP) += nf_nat_sip.o obj-$(CONFIG_NF_NAT_SIP) += nf_nat_sip.o
obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
Index: linux-2.6.25.1/net/netfilter/Kconfig Index: linux-2.6.25.4/net/netfilter/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/netfilter/Kconfig --- linux-2.6.25.4.orig/net/netfilter/Kconfig
+++ linux-2.6.25.1/net/netfilter/Kconfig +++ linux-2.6.25.4/net/netfilter/Kconfig
@@ -258,6 +258,16 @@ config NF_CONNTRACK_TFTP @@ -258,6 +258,16 @@ config NF_CONNTRACK_TFTP
To compile it as a module, choose M here. If unsure, say N. To compile it as a module, choose M here. If unsure, say N.
@ -331,10 +331,10 @@ Index: linux-2.6.25.1/net/netfilter/Kconfig
config NF_CT_NETLINK config NF_CT_NETLINK
tristate 'Connection tracking netlink interface' tristate 'Connection tracking netlink interface'
depends on NF_CONNTRACK depends on NF_CONNTRACK
Index: linux-2.6.25.1/net/netfilter/Makefile Index: linux-2.6.25.4/net/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/netfilter/Makefile --- linux-2.6.25.4.orig/net/netfilter/Makefile
+++ linux-2.6.25.1/net/netfilter/Makefile +++ linux-2.6.25.4/net/netfilter/Makefile
@@ -32,6 +32,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co @@ -32,6 +32,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co
obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
@ -343,10 +343,10 @@ Index: linux-2.6.25.1/net/netfilter/Makefile
# generic X tables # generic X tables
obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/ipv4/netfilter/Kconfig --- linux-2.6.25.4.orig/net/ipv4/netfilter/Kconfig
+++ linux-2.6.25.1/net/ipv4/netfilter/Kconfig +++ linux-2.6.25.4/net/ipv4/netfilter/Kconfig
@@ -277,6 +277,11 @@ config NF_NAT_IRC @@ -277,6 +277,11 @@ config NF_NAT_IRC
depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
default NF_NAT && NF_CONNTRACK_IRC default NF_NAT && NF_CONNTRACK_IRC
@ -359,10 +359,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig
config NF_NAT_TFTP config NF_NAT_TFTP
tristate tristate
depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
Index: linux-2.6.25.1/net/netfilter/nf_conntrack_rtsp.c Index: linux-2.6.25.4/net/netfilter/nf_conntrack_rtsp.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/netfilter/nf_conntrack_rtsp.c +++ linux-2.6.25.4/net/netfilter/nf_conntrack_rtsp.c
@@ -0,0 +1,513 @@ @@ -0,0 +1,513 @@
+/* +/*
+ * RTSP extension for IP connection tracking + * RTSP extension for IP connection tracking
@ -877,10 +877,10 @@ Index: linux-2.6.25.1/net/netfilter/nf_conntrack_rtsp.c
+ +
+EXPORT_SYMBOL(nf_nat_rtsp_hook_expectfn); +EXPORT_SYMBOL(nf_nat_rtsp_hook_expectfn);
+ +
Index: linux-2.6.25.1/net/ipv4/netfilter/nf_nat_rtsp.c Index: linux-2.6.25.4/net/ipv4/netfilter/nf_nat_rtsp.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/nf_nat_rtsp.c +++ linux-2.6.25.4/net/ipv4/netfilter/nf_nat_rtsp.c
@@ -0,0 +1,496 @@ @@ -0,0 +1,496 @@
+/* +/*
+ * RTSP extension for TCP NAT alteration + * RTSP extension for TCP NAT alteration

22
target/linux/generic-2.6/patches-2.6.25/200-sched_esfq.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/include/linux/pkt_sched.h Index: linux-2.6.25.4/include/linux/pkt_sched.h
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/include/linux/pkt_sched.h --- linux-2.6.25.4.orig/include/linux/pkt_sched.h
+++ linux-2.6.25.1/include/linux/pkt_sched.h +++ linux-2.6.25.4/include/linux/pkt_sched.h
@@ -162,8 +162,37 @@ struct tc_sfq_xstats @@ -162,8 +162,37 @@ struct tc_sfq_xstats
* *
* The only reason for this is efficiency, it is possible * The only reason for this is efficiency, it is possible
@ -40,10 +40,10 @@ Index: linux-2.6.25.1/include/linux/pkt_sched.h
/* RED section */ /* RED section */
enum enum
Index: linux-2.6.25.1/net/sched/Kconfig Index: linux-2.6.25.4/net/sched/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/sched/Kconfig --- linux-2.6.25.4.orig/net/sched/Kconfig
+++ linux-2.6.25.1/net/sched/Kconfig +++ linux-2.6.25.4/net/sched/Kconfig
@@ -139,6 +139,37 @@ config NET_SCH_SFQ @@ -139,6 +139,37 @@ config NET_SCH_SFQ
To compile this code as a module, choose M here: the To compile this code as a module, choose M here: the
module will be called sch_sfq. module will be called sch_sfq.
@ -82,10 +82,10 @@ Index: linux-2.6.25.1/net/sched/Kconfig
config NET_SCH_TEQL config NET_SCH_TEQL
tristate "True Link Equalizer (TEQL)" tristate "True Link Equalizer (TEQL)"
---help--- ---help---
Index: linux-2.6.25.1/net/sched/Makefile Index: linux-2.6.25.4/net/sched/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/sched/Makefile --- linux-2.6.25.4.orig/net/sched/Makefile
+++ linux-2.6.25.1/net/sched/Makefile +++ linux-2.6.25.4/net/sched/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_NET_SCH_GRED) += sch_gred.o @@ -23,6 +23,7 @@ obj-$(CONFIG_NET_SCH_GRED) += sch_gred.o
obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o
obj-$(CONFIG_NET_SCH_DSMARK) += sch_dsmark.o obj-$(CONFIG_NET_SCH_DSMARK) += sch_dsmark.o
@ -94,10 +94,10 @@ Index: linux-2.6.25.1/net/sched/Makefile
obj-$(CONFIG_NET_SCH_TBF) += sch_tbf.o obj-$(CONFIG_NET_SCH_TBF) += sch_tbf.o
obj-$(CONFIG_NET_SCH_TEQL) += sch_teql.o obj-$(CONFIG_NET_SCH_TEQL) += sch_teql.o
obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o
Index: linux-2.6.25.1/net/sched/sch_esfq.c Index: linux-2.6.25.4/net/sched/sch_esfq.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/net/sched/sch_esfq.c +++ linux-2.6.25.4/net/sched/sch_esfq.c
@@ -0,0 +1,702 @@ @@ -0,0 +1,702 @@
+/* +/*
+ * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline. + * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline.

6
target/linux/generic-2.6/patches-2.6.25/202-mips-freestanding.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/arch/mips/Makefile Index: linux-2.6.25.4/arch/mips/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/arch/mips/Makefile --- linux-2.6.25.4.orig/arch/mips/Makefile
+++ linux-2.6.25.1/arch/mips/Makefile +++ linux-2.6.25.4/arch/mips/Makefile
@@ -593,6 +593,9 @@ core-$(CONFIG_TOSHIBA_RBTX4938) += arch/ @@ -593,6 +593,9 @@ core-$(CONFIG_TOSHIBA_RBTX4938) += arch/
cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000 load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000

12
target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/fs/jffs2/build.c Index: linux-2.6.25.4/fs/jffs2/build.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/fs/jffs2/build.c --- linux-2.6.25.4.orig/fs/jffs2/build.c
+++ linux-2.6.25.1/fs/jffs2/build.c +++ linux-2.6.25.4/fs/jffs2/build.c
@@ -105,6 +105,17 @@ static int jffs2_build_filesystem(struct @@ -105,6 +105,17 @@ static int jffs2_build_filesystem(struct
dbg_fsbuild("scanned flash completely\n"); dbg_fsbuild("scanned flash completely\n");
jffs2_dbg_dump_block_lists_nolock(c); jffs2_dbg_dump_block_lists_nolock(c);
@ -20,10 +20,10 @@ Index: linux-2.6.25.1/fs/jffs2/build.c
dbg_fsbuild("pass 1 starting\n"); dbg_fsbuild("pass 1 starting\n");
c->flags |= JFFS2_SB_FLAG_BUILDING; c->flags |= JFFS2_SB_FLAG_BUILDING;
/* Now scan the directory tree, increasing nlink according to every dirent found. */ /* Now scan the directory tree, increasing nlink according to every dirent found. */
Index: linux-2.6.25.1/fs/jffs2/scan.c Index: linux-2.6.25.4/fs/jffs2/scan.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/fs/jffs2/scan.c --- linux-2.6.25.4.orig/fs/jffs2/scan.c
+++ linux-2.6.25.1/fs/jffs2/scan.c +++ linux-2.6.25.4/fs/jffs2/scan.c
@@ -142,9 +142,12 @@ int jffs2_scan_medium(struct jffs2_sb_in @@ -142,9 +142,12 @@ int jffs2_scan_medium(struct jffs2_sb_in
/* reset summary info for next eraseblock scan */ /* reset summary info for next eraseblock scan */

4
target/linux/generic-2.6/patches-2.6.25/207-powerpc_asm_segment_h.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/include/asm-powerpc/segment.h Index: linux-2.6.25.4/include/asm-powerpc/segment.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/include/asm-powerpc/segment.h +++ linux-2.6.25.4/include/asm-powerpc/segment.h
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
+#ifndef _ASM_SEGMENT_H +#ifndef _ASM_SEGMENT_H
+#define _ASM_SEGMENT_H +#define _ASM_SEGMENT_H

6
target/linux/generic-2.6/patches-2.6.25/208-rtl8110sb_fix.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/drivers/net/r8169.c Index: linux-2.6.25.4/drivers/net/r8169.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/net/r8169.c --- linux-2.6.25.4.orig/drivers/net/r8169.c
+++ linux-2.6.25.1/drivers/net/r8169.c +++ linux-2.6.25.4/drivers/net/r8169.c
@@ -1537,7 +1537,7 @@ static const struct rtl_cfg_info { @@ -1537,7 +1537,7 @@ static const struct rtl_cfg_info {
.hw_start = rtl_hw_start_8169, .hw_start = rtl_hw_start_8169,
.region = 1, .region = 1,

80
target/linux/generic-2.6/patches-2.6.25/209-mini_fo.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/fs/Kconfig Index: linux-2.6.25.4/fs/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/fs/Kconfig --- linux-2.6.25.4.orig/fs/Kconfig
+++ linux-2.6.25.1/fs/Kconfig +++ linux-2.6.25.4/fs/Kconfig
@@ -1449,6 +1449,9 @@ config VXFS_FS @@ -1449,6 +1449,9 @@ config VXFS_FS
To compile this as a module, choose M here: the module will be To compile this as a module, choose M here: the module will be
called freevxfs. If unsure, say N. called freevxfs. If unsure, say N.
@ -12,10 +12,10 @@ Index: linux-2.6.25.1/fs/Kconfig
config MINIX_FS config MINIX_FS
tristate "Minix file system support" tristate "Minix file system support"
depends on BLOCK depends on BLOCK
Index: linux-2.6.25.1/fs/Makefile Index: linux-2.6.25.4/fs/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/fs/Makefile --- linux-2.6.25.4.orig/fs/Makefile
+++ linux-2.6.25.1/fs/Makefile +++ linux-2.6.25.4/fs/Makefile
@@ -77,6 +77,7 @@ obj-$(CONFIG_SQUASHFS) += squashfs/ @@ -77,6 +77,7 @@ obj-$(CONFIG_SQUASHFS) += squashfs/
obj-y += ramfs/ obj-y += ramfs/
obj-$(CONFIG_HUGETLBFS) += hugetlbfs/ obj-$(CONFIG_HUGETLBFS) += hugetlbfs/
@ -24,10 +24,10 @@ Index: linux-2.6.25.1/fs/Makefile
obj-$(CONFIG_MINIX_FS) += minix/ obj-$(CONFIG_MINIX_FS) += minix/
obj-$(CONFIG_FAT_FS) += fat/ obj-$(CONFIG_FAT_FS) += fat/
obj-$(CONFIG_MSDOS_FS) += msdos/ obj-$(CONFIG_MSDOS_FS) += msdos/
Index: linux-2.6.25.1/fs/mini_fo/aux.c Index: linux-2.6.25.4/fs/mini_fo/aux.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/aux.c +++ linux-2.6.25.4/fs/mini_fo/aux.c
@@ -0,0 +1,577 @@ @@ -0,0 +1,577 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -606,10 +606,10 @@ Index: linux-2.6.25.1/fs/mini_fo/aux.c
+ +
+#endif /* unused */ +#endif /* unused */
+ +
Index: linux-2.6.25.1/fs/mini_fo/ChangeLog Index: linux-2.6.25.4/fs/mini_fo/ChangeLog
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/ChangeLog +++ linux-2.6.25.4/fs/mini_fo/ChangeLog
@@ -0,0 +1,281 @@ @@ -0,0 +1,281 @@
+2006-01-24 Markus Klotzbuecher <mk@mary.denx.de> +2006-01-24 Markus Klotzbuecher <mk@mary.denx.de>
+ +
@ -892,10 +892,10 @@ Index: linux-2.6.25.1/fs/mini_fo/ChangeLog
+ * Implementation of mini_fo_mknod and mini_fo_rename, support + * Implementation of mini_fo_mknod and mini_fo_rename, support
+ for device files. + for device files.
+ +
Index: linux-2.6.25.1/fs/mini_fo/dentry.c Index: linux-2.6.25.4/fs/mini_fo/dentry.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/dentry.c +++ linux-2.6.25.4/fs/mini_fo/dentry.c
@@ -0,0 +1,244 @@ @@ -0,0 +1,244 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -1141,10 +1141,10 @@ Index: linux-2.6.25.1/fs/mini_fo/dentry.c
+ d_delete: mini_fo_d_delete, + d_delete: mini_fo_d_delete,
+ d_iput: mini_fo_d_iput, + d_iput: mini_fo_d_iput,
+}; +};
Index: linux-2.6.25.1/fs/mini_fo/file.c Index: linux-2.6.25.4/fs/mini_fo/file.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/file.c +++ linux-2.6.25.4/fs/mini_fo/file.c
@@ -0,0 +1,713 @@ @@ -0,0 +1,713 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -1859,10 +1859,10 @@ Index: linux-2.6.25.1/fs/mini_fo/file.c
+ /* not implemented: sendpage */ + /* not implemented: sendpage */
+ /* not implemented: get_unmapped_area */ + /* not implemented: get_unmapped_area */
+ }; + };
Index: linux-2.6.25.1/fs/mini_fo/fist.h Index: linux-2.6.25.4/fs/mini_fo/fist.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/fist.h +++ linux-2.6.25.4/fs/mini_fo/fist.h
@@ -0,0 +1,252 @@ @@ -0,0 +1,252 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -2116,10 +2116,10 @@ Index: linux-2.6.25.1/fs/mini_fo/fist.h
+# define FIST_IOCTL_SET_DEBUG_VALUE _IOW(0x15, 2, int) +# define FIST_IOCTL_SET_DEBUG_VALUE _IOW(0x15, 2, int)
+ +
+#endif /* not __FIST_H_ */ +#endif /* not __FIST_H_ */
Index: linux-2.6.25.1/fs/mini_fo/inode.c Index: linux-2.6.25.4/fs/mini_fo/inode.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/inode.c +++ linux-2.6.25.4/fs/mini_fo/inode.c
@@ -0,0 +1,1564 @@ @@ -0,0 +1,1564 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -3685,10 +3685,10 @@ Index: linux-2.6.25.1/fs/mini_fo/inode.c
+ removexattr: mini_fo_removexattr + removexattr: mini_fo_removexattr
+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */ +# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
+ }; + };
Index: linux-2.6.25.1/fs/mini_fo/main.c Index: linux-2.6.25.4/fs/mini_fo/main.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/main.c +++ linux-2.6.25.4/fs/mini_fo/main.c
@@ -0,0 +1,423 @@ @@ -0,0 +1,423 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -4113,10 +4113,10 @@ Index: linux-2.6.25.1/fs/mini_fo/main.c
+ +
+module_init(init_mini_fo_fs) +module_init(init_mini_fo_fs)
+module_exit(exit_mini_fo_fs) +module_exit(exit_mini_fo_fs)
Index: linux-2.6.25.1/fs/mini_fo/Makefile Index: linux-2.6.25.4/fs/mini_fo/Makefile
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/Makefile +++ linux-2.6.25.4/fs/mini_fo/Makefile
@@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
+# +#
+# Makefile for mini_fo 2.4 and 2.6 Linux kernels +# Makefile for mini_fo 2.4 and 2.6 Linux kernels
@ -4135,10 +4135,10 @@ Index: linux-2.6.25.1/fs/mini_fo/Makefile
+# dependencies +# dependencies
+${mini_fo-objs}: mini_fo.h fist.h +${mini_fo-objs}: mini_fo.h fist.h
+ +
Index: linux-2.6.25.1/fs/mini_fo/meta.c Index: linux-2.6.25.4/fs/mini_fo/meta.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/meta.c +++ linux-2.6.25.4/fs/mini_fo/meta.c
@@ -0,0 +1,1000 @@ @@ -0,0 +1,1000 @@
+/* +/*
+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de> + * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
@ -5140,10 +5140,10 @@ Index: linux-2.6.25.1/fs/mini_fo/meta.c
+ return 0; + return 0;
+} +}
+ +
Index: linux-2.6.25.1/fs/mini_fo/mini_fo.h Index: linux-2.6.25.4/fs/mini_fo/mini_fo.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/mini_fo.h +++ linux-2.6.25.4/fs/mini_fo/mini_fo.h
@@ -0,0 +1,510 @@ @@ -0,0 +1,510 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -5655,10 +5655,10 @@ Index: linux-2.6.25.1/fs/mini_fo/mini_fo.h
+/* ioctls */ +/* ioctls */
+ +
+#endif /* not __MINI_FO_H_ */ +#endif /* not __MINI_FO_H_ */
Index: linux-2.6.25.1/fs/mini_fo/mini_fo-merge Index: linux-2.6.25.4/fs/mini_fo/mini_fo-merge
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/mini_fo-merge +++ linux-2.6.25.4/fs/mini_fo/mini_fo-merge
@@ -0,0 +1,180 @@ @@ -0,0 +1,180 @@
+#!/bin/bash +#!/bin/bash
+# +#
@ -5840,10 +5840,10 @@ Index: linux-2.6.25.1/fs/mini_fo/mini_fo-merge
+#rm $TMP/$SKIP_DEL_LIST +#rm $TMP/$SKIP_DEL_LIST
+ +
+echo "Done!" +echo "Done!"
Index: linux-2.6.25.1/fs/mini_fo/mini_fo-overlay Index: linux-2.6.25.4/fs/mini_fo/mini_fo-overlay
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/mini_fo-overlay +++ linux-2.6.25.4/fs/mini_fo/mini_fo-overlay
@@ -0,0 +1,130 @@ @@ -0,0 +1,130 @@
+#!/bin/bash +#!/bin/bash
+# +#
@ -5975,10 +5975,10 @@ Index: linux-2.6.25.1/fs/mini_fo/mini_fo-overlay
+if [ $? -ne 0 ]; then +if [ $? -ne 0 ]; then
+ echo "Error, mounting failed, maybe no permisson to mount?" + echo "Error, mounting failed, maybe no permisson to mount?"
+fi +fi
Index: linux-2.6.25.1/fs/mini_fo/mmap.c Index: linux-2.6.25.4/fs/mini_fo/mmap.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/mmap.c +++ linux-2.6.25.4/fs/mini_fo/mmap.c
@@ -0,0 +1,637 @@ @@ -0,0 +1,637 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -6617,10 +6617,10 @@ Index: linux-2.6.25.1/fs/mini_fo/mmap.c
+ print_exit_status(err); + print_exit_status(err);
+ return err; + return err;
+} +}
Index: linux-2.6.25.1/fs/mini_fo/README Index: linux-2.6.25.4/fs/mini_fo/README
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/README +++ linux-2.6.25.4/fs/mini_fo/README
@@ -0,0 +1,163 @@ @@ -0,0 +1,163 @@
+README for the mini_fo overlay file system +README for the mini_fo overlay file system
+========================================= +=========================================
@ -6785,10 +6785,10 @@ Index: linux-2.6.25.1/fs/mini_fo/README
+2 of the License, or (at your option) any later version. +2 of the License, or (at your option) any later version.
+ +
+ +
Index: linux-2.6.25.1/fs/mini_fo/RELEASE_NOTES Index: linux-2.6.25.4/fs/mini_fo/RELEASE_NOTES
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/RELEASE_NOTES +++ linux-2.6.25.4/fs/mini_fo/RELEASE_NOTES
@@ -0,0 +1,111 @@ @@ -0,0 +1,111 @@
+Release: mini_fo-0.6.1 (v0-6-1) +Release: mini_fo-0.6.1 (v0-6-1)
+Date: 21.09.2005 +Date: 21.09.2005
@ -6901,10 +6901,10 @@ Index: linux-2.6.25.1/fs/mini_fo/RELEASE_NOTES
+original state. I hope to fix this someday. Please note that this does +original state. I hope to fix this someday. Please note that this does
+not effect the special hard links '.' and '..', that are handled +not effect the special hard links '.' and '..', that are handled
+seperately by the lower fs. +seperately by the lower fs.
Index: linux-2.6.25.1/fs/mini_fo/state.c Index: linux-2.6.25.4/fs/mini_fo/state.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/state.c +++ linux-2.6.25.4/fs/mini_fo/state.c
@@ -0,0 +1,620 @@ @@ -0,0 +1,620 @@
+/* +/*
+ * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de> + * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
@ -7526,10 +7526,10 @@ Index: linux-2.6.25.1/fs/mini_fo/state.c
+ return err; + return err;
+} +}
+ +
Index: linux-2.6.25.1/fs/mini_fo/super.c Index: linux-2.6.25.4/fs/mini_fo/super.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/super.c +++ linux-2.6.25.4/fs/mini_fo/super.c
@@ -0,0 +1,281 @@ @@ -0,0 +1,281 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok

24
target/linux/generic-2.6/patches-2.6.25/210-mini_fo_2.6.25_fixes.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/fs/mini_fo/main.c Index: linux-2.6.25.4/fs/mini_fo/main.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/fs/mini_fo/main.c --- linux-2.6.25.4.orig/fs/mini_fo/main.c
+++ linux-2.6.25.1/fs/mini_fo/main.c +++ linux-2.6.25.4/fs/mini_fo/main.c
@@ -79,6 +79,7 @@ mini_fo_tri_interpose(dentry_t *hidden_d @@ -79,6 +79,7 @@ mini_fo_tri_interpose(dentry_t *hidden_d
* of the new inode's fields * of the new inode's fields
*/ */
@ -50,10 +50,10 @@ Index: linux-2.6.25.1/fs/mini_fo/main.c
stohs2(sb) = hidden_root2->d_sb; stohs2(sb) = hidden_root2->d_sb;
/* validate storage dir, this is done in /* validate storage dir, this is done in
Index: linux-2.6.25.1/fs/mini_fo/mini_fo.h Index: linux-2.6.25.4/fs/mini_fo/mini_fo.h
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/fs/mini_fo/mini_fo.h --- linux-2.6.25.4.orig/fs/mini_fo/mini_fo.h
+++ linux-2.6.25.1/fs/mini_fo/mini_fo.h +++ linux-2.6.25.4/fs/mini_fo/mini_fo.h
@@ -302,6 +302,10 @@ extern int mini_fo_tri_interpose(dentry_ @@ -302,6 +302,10 @@ extern int mini_fo_tri_interpose(dentry_
extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt, extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
dentry_t *src_dentry, struct vfsmount *src_mnt); dentry_t *src_dentry, struct vfsmount *src_mnt);
@ -95,10 +95,10 @@ Index: linux-2.6.25.1/fs/mini_fo/mini_fo.h
/* /*
* Definitions for user and kernel code * Definitions for user and kernel code
*/ */
Index: linux-2.6.25.1/fs/mini_fo/super.c Index: linux-2.6.25.4/fs/mini_fo/super.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/fs/mini_fo/super.c --- linux-2.6.25.4.orig/fs/mini_fo/super.c
+++ linux-2.6.25.1/fs/mini_fo/super.c +++ linux-2.6.25.4/fs/mini_fo/super.c
@@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb) @@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
} }
#endif #endif
@ -131,10 +131,10 @@ Index: linux-2.6.25.1/fs/mini_fo/super.c
#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
write_inode: mini_fo_write_inode, write_inode: mini_fo_write_inode,
#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */ #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
Index: linux-2.6.25.1/fs/mini_fo/aux.c Index: linux-2.6.25.4/fs/mini_fo/aux.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/fs/mini_fo/aux.c --- linux-2.6.25.4.orig/fs/mini_fo/aux.c
+++ linux-2.6.25.1/fs/mini_fo/aux.c +++ linux-2.6.25.4/fs/mini_fo/aux.c
@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb, @@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb,
err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd); err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);

6
target/linux/generic-2.6/patches-2.6.25/211-mini_fo_2.6.25_dentry_open_war.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/fs/mini_fo/meta.c Index: linux-2.6.25.4/fs/mini_fo/meta.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/fs/mini_fo/meta.c --- linux-2.6.25.4.orig/fs/mini_fo/meta.c
+++ linux-2.6.25.1/fs/mini_fo/meta.c +++ linux-2.6.25.4/fs/mini_fo/meta.c
@@ -442,6 +442,11 @@ int meta_write_d_entry(dentry_t *dentry, @@ -442,6 +442,11 @@ int meta_write_d_entry(dentry_t *dentry,
S_IRUSR | S_IWUSR); S_IRUSR | S_IWUSR);
#endif #endif

6
target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/lib/kobject_uevent.c Index: linux-2.6.25.4/lib/kobject_uevent.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/lib/kobject_uevent.c --- linux-2.6.25.4.orig/lib/kobject_uevent.c
+++ linux-2.6.25.1/lib/kobject_uevent.c +++ linux-2.6.25.4/lib/kobject_uevent.c
@@ -27,7 +27,8 @@ u64 uevent_seqnum; @@ -27,7 +27,8 @@ u64 uevent_seqnum;
char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH; char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
static DEFINE_SPINLOCK(sequence_lock); static DEFINE_SPINLOCK(sequence_lock);

6
target/linux/generic-2.6/patches-2.6.25/220-sound_kconfig.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/sound/core/Kconfig Index: linux-2.6.25.4/sound/core/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/sound/core/Kconfig --- linux-2.6.25.4.orig/sound/core/Kconfig
+++ linux-2.6.25.1/sound/core/Kconfig +++ linux-2.6.25.4/sound/core/Kconfig
@@ -9,7 +9,7 @@ config SND_PCM @@ -9,7 +9,7 @@ config SND_PCM
depends on SND depends on SND

12
target/linux/generic-2.6/patches-2.6.25/400-ledtrig_morse.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/drivers/leds/Kconfig Index: linux-2.6.25.4/drivers/leds/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/leds/Kconfig --- linux-2.6.25.4.orig/drivers/leds/Kconfig
+++ linux-2.6.25.1/drivers/leds/Kconfig +++ linux-2.6.25.4/drivers/leds/Kconfig
@@ -181,4 +181,8 @@ config LEDS_TRIGGER_HEARTBEAT @@ -181,4 +181,8 @@ config LEDS_TRIGGER_HEARTBEAT
load average. load average.
If unsure, say Y. If unsure, say Y.
@ -11,10 +11,10 @@ Index: linux-2.6.25.1/drivers/leds/Kconfig
+ depends on LEDS_TRIGGERS + depends on LEDS_TRIGGERS
+ +
endif # NEW_LEDS endif # NEW_LEDS
Index: linux-2.6.25.1/drivers/leds/Makefile Index: linux-2.6.25.4/drivers/leds/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/leds/Makefile --- linux-2.6.25.4.orig/drivers/leds/Makefile
+++ linux-2.6.25.1/drivers/leds/Makefile +++ linux-2.6.25.4/drivers/leds/Makefile
@@ -26,3 +26,4 @@ obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx. @@ -26,3 +26,4 @@ obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.
obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o
obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += ledtrig-ide-disk.o obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += ledtrig-ide-disk.o

12
target/linux/generic-2.6/patches-2.6.25/401-led_alix.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/drivers/leds/Kconfig Index: linux-2.6.25.4/drivers/leds/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/leds/Kconfig --- linux-2.6.25.4.orig/drivers/leds/Kconfig
+++ linux-2.6.25.1/drivers/leds/Kconfig +++ linux-2.6.25.4/drivers/leds/Kconfig
@@ -79,6 +79,12 @@ config LEDS_WRAP @@ -79,6 +79,12 @@ config LEDS_WRAP
help help
This option enables support for the PCEngines WRAP programmable LEDs. This option enables support for the PCEngines WRAP programmable LEDs.
@ -15,10 +15,10 @@ Index: linux-2.6.25.1/drivers/leds/Kconfig
config LEDS_H1940 config LEDS_H1940
tristate "LED Support for iPAQ H1940 device" tristate "LED Support for iPAQ H1940 device"
depends on LEDS_CLASS && ARCH_H1940 depends on LEDS_CLASS && ARCH_H1940
Index: linux-2.6.25.1/drivers/leds/Makefile Index: linux-2.6.25.4/drivers/leds/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/leds/Makefile --- linux-2.6.25.4.orig/drivers/leds/Makefile
+++ linux-2.6.25.1/drivers/leds/Makefile +++ linux-2.6.25.4/drivers/leds/Makefile
@@ -14,6 +14,7 @@ obj-$(CONFIG_LEDS_S3C24XX) += leds-s3c2 @@ -14,6 +14,7 @@ obj-$(CONFIG_LEDS_S3C24XX) += leds-s3c2
obj-$(CONFIG_LEDS_AMS_DELTA) += leds-ams-delta.o obj-$(CONFIG_LEDS_AMS_DELTA) += leds-ams-delta.o
obj-$(CONFIG_LEDS_NET48XX) += leds-net48xx.o obj-$(CONFIG_LEDS_NET48XX) += leds-net48xx.o

12
target/linux/generic-2.6/patches-2.6.25/402-ledtrig_default_on.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/drivers/leds/Kconfig Index: linux-2.6.25.4/drivers/leds/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/leds/Kconfig --- linux-2.6.25.4.orig/drivers/leds/Kconfig
+++ linux-2.6.25.1/drivers/leds/Kconfig +++ linux-2.6.25.4/drivers/leds/Kconfig
@@ -191,4 +191,11 @@ config LEDS_TRIGGER_MORSE @@ -191,4 +191,11 @@ config LEDS_TRIGGER_MORSE
tristate "LED Morse Trigger" tristate "LED Morse Trigger"
depends on LEDS_TRIGGERS depends on LEDS_TRIGGERS
@ -14,10 +14,10 @@ Index: linux-2.6.25.1/drivers/leds/Kconfig
+ If unsure, say Y. + If unsure, say Y.
+ +
endif # NEW_LEDS endif # NEW_LEDS
Index: linux-2.6.25.1/drivers/leds/Makefile Index: linux-2.6.25.4/drivers/leds/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/leds/Makefile --- linux-2.6.25.4.orig/drivers/leds/Makefile
+++ linux-2.6.25.1/drivers/leds/Makefile +++ linux-2.6.25.4/drivers/leds/Makefile
@@ -28,3 +28,4 @@ obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledt @@ -28,3 +28,4 @@ obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledt
obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += ledtrig-ide-disk.o obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += ledtrig-ide-disk.o
obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o

6
target/linux/generic-2.6/patches-2.6.25/403-ds1672_detect.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/drivers/rtc/rtc-ds1672.c Index: linux-2.6.25.4/drivers/rtc/rtc-ds1672.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/rtc/rtc-ds1672.c --- linux-2.6.25.4.orig/drivers/rtc/rtc-ds1672.c
+++ linux-2.6.25.1/drivers/rtc/rtc-ds1672.c +++ linux-2.6.25.4/drivers/rtc/rtc-ds1672.c
@@ -13,10 +13,10 @@ @@ -13,10 +13,10 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/rtc.h> #include <linux/rtc.h>

12
target/linux/generic-2.6/patches-2.6.25/410-gpio_buttons.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/drivers/input/misc/Kconfig Index: linux-2.6.25.4/drivers/input/misc/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/input/misc/Kconfig --- linux-2.6.25.4.orig/drivers/input/misc/Kconfig
+++ linux-2.6.25.1/drivers/input/misc/Kconfig +++ linux-2.6.25.4/drivers/input/misc/Kconfig
@@ -197,4 +197,20 @@ config HP_SDC_RTC @@ -197,4 +197,20 @@ config HP_SDC_RTC
Say Y here if you want to support the built-in real time clock Say Y here if you want to support the built-in real time clock
of the HP SDC controller. of the HP SDC controller.
@ -23,10 +23,10 @@ Index: linux-2.6.25.1/drivers/input/misc/Kconfig
+ module will be called gpio-buttons. + module will be called gpio-buttons.
+ +
endif endif
Index: linux-2.6.25.1/drivers/input/misc/Makefile Index: linux-2.6.25.4/drivers/input/misc/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/input/misc/Makefile --- linux-2.6.25.4.orig/drivers/input/misc/Makefile
+++ linux-2.6.25.1/drivers/input/misc/Makefile +++ linux-2.6.25.4/drivers/input/misc/Makefile
@@ -19,3 +19,4 @@ obj-$(CONFIG_INPUT_YEALINK) += yealink. @@ -19,3 +19,4 @@ obj-$(CONFIG_INPUT_YEALINK) += yealink.
obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o
obj-$(CONFIG_INPUT_UINPUT) += uinput.o obj-$(CONFIG_INPUT_UINPUT) += uinput.o

12
target/linux/generic-2.6/patches-2.6.25/420-gpiodev.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25/drivers/gpio/Kconfig Index: linux-2.6.25.4/drivers/gpio/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.orig/drivers/gpio/Kconfig 2008-04-27 23:35:57.000000000 +0100 --- linux-2.6.25.4.orig/drivers/gpio/Kconfig
+++ linux-2.6.25/drivers/gpio/Kconfig 2008-04-27 23:42:52.000000000 +0100 +++ linux-2.6.25.4/drivers/gpio/Kconfig
@@ -2,6 +2,13 @@ @@ -2,6 +2,13 @@
# GPIO infrastructure and expanders # GPIO infrastructure and expanders
# #
@ -16,10 +16,10 @@ Index: linux-2.6.25/drivers/gpio/Kconfig
config HAVE_GPIO_LIB config HAVE_GPIO_LIB
bool bool
help help
Index: linux-2.6.25/drivers/gpio/Makefile Index: linux-2.6.25.4/drivers/gpio/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.orig/drivers/gpio/Makefile 2008-04-27 23:42:59.000000000 +0100 --- linux-2.6.25.4.orig/drivers/gpio/Makefile
+++ linux-2.6.25/drivers/gpio/Makefile 2008-04-27 23:43:41.000000000 +0100 +++ linux-2.6.25.4/drivers/gpio/Makefile
@@ -7,3 +7,4 @@ obj-$(CONFIG_HAVE_GPIO_LIB) += gpiolib.o @@ -7,3 +7,4 @@ obj-$(CONFIG_HAVE_GPIO_LIB) += gpiolib.o
obj-$(CONFIG_GPIO_MCP23S08) += mcp23s08.o obj-$(CONFIG_GPIO_MCP23S08) += mcp23s08.o
obj-$(CONFIG_GPIO_PCA953X) += pca953x.o obj-$(CONFIG_GPIO_PCA953X) += pca953x.o

12
target/linux/generic-2.6/patches-2.6.25/510-Yaffs.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/fs/Kconfig Index: linux-2.6.25.4/fs/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/fs/Kconfig --- linux-2.6.25.4.orig/fs/Kconfig
+++ linux-2.6.25.1/fs/Kconfig +++ linux-2.6.25.4/fs/Kconfig
@@ -421,6 +421,7 @@ config FS_POSIX_ACL @@ -421,6 +421,7 @@ config FS_POSIX_ACL
source "fs/xfs/Kconfig" source "fs/xfs/Kconfig"
@ -10,10 +10,10 @@ Index: linux-2.6.25.1/fs/Kconfig
config OCFS2_FS config OCFS2_FS
tristate "OCFS2 file system support" tristate "OCFS2 file system support"
Index: linux-2.6.25.1/fs/Makefile Index: linux-2.6.25.4/fs/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/fs/Makefile --- linux-2.6.25.4.orig/fs/Makefile
+++ linux-2.6.25.1/fs/Makefile +++ linux-2.6.25.4/fs/Makefile
@@ -121,3 +121,4 @@ obj-$(CONFIG_HPPFS) += hppfs/ @@ -121,3 +121,4 @@ obj-$(CONFIG_HPPFS) += hppfs/
obj-$(CONFIG_DEBUG_FS) += debugfs/ obj-$(CONFIG_DEBUG_FS) += debugfs/
obj-$(CONFIG_OCFS2_FS) += ocfs2/ obj-$(CONFIG_OCFS2_FS) += ocfs2/

12
target/linux/generic-2.6/patches-2.6.25/600-phy_extension.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/drivers/net/phy/phy.c Index: linux-2.6.25.4/drivers/net/phy/phy.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/net/phy/phy.c --- linux-2.6.25.4.orig/drivers/net/phy/phy.c
+++ linux-2.6.25.1/drivers/net/phy/phy.c +++ linux-2.6.25.4/drivers/net/phy/phy.c
@@ -348,6 +348,50 @@ int phy_ethtool_gset(struct phy_device * @@ -348,6 +348,50 @@ int phy_ethtool_gset(struct phy_device *
} }
EXPORT_SYMBOL(phy_ethtool_gset); EXPORT_SYMBOL(phy_ethtool_gset);
@ -53,10 +53,10 @@ Index: linux-2.6.25.1/drivers/net/phy/phy.c
/** /**
* phy_mii_ioctl - generic PHY MII ioctl interface * phy_mii_ioctl - generic PHY MII ioctl interface
* @phydev: the phy_device struct * @phydev: the phy_device struct
Index: linux-2.6.25.1/include/linux/phy.h Index: linux-2.6.25.4/include/linux/phy.h
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/include/linux/phy.h --- linux-2.6.25.4.orig/include/linux/phy.h
+++ linux-2.6.25.1/include/linux/phy.h +++ linux-2.6.25.4/include/linux/phy.h
@@ -399,6 +399,7 @@ void phy_start_machine(struct phy_device @@ -399,6 +399,7 @@ void phy_start_machine(struct phy_device
void phy_stop_machine(struct phy_device *phydev); void phy_stop_machine(struct phy_device *phydev);
int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd); int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);

16
target/linux/generic-2.6/patches-2.6.25/610-phy_detect.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.25.1/drivers/net/phy/mdio_bus.c Index: linux-2.6.25.4/drivers/net/phy/mdio_bus.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/net/phy/mdio_bus.c 2008-05-01 23:45:25.000000000 +0200 --- linux-2.6.25.4.orig/drivers/net/phy/mdio_bus.c
+++ linux-2.6.25.1/drivers/net/phy/mdio_bus.c 2008-05-12 23:44:21.000000000 +0200 +++ linux-2.6.25.4/drivers/net/phy/mdio_bus.c
@@ -132,6 +132,9 @@ @@ -132,6 +132,9 @@ static int mdio_bus_match(struct device
struct phy_device *phydev = to_phy_device(dev); struct phy_device *phydev = to_phy_device(dev);
struct phy_driver *phydrv = to_phy_driver(drv); struct phy_driver *phydrv = to_phy_driver(drv);
@ -12,11 +12,11 @@ Index: linux-2.6.25.1/drivers/net/phy/mdio_bus.c
return ((phydrv->phy_id & phydrv->phy_id_mask) == return ((phydrv->phy_id & phydrv->phy_id_mask) ==
(phydev->phy_id & phydrv->phy_id_mask)); (phydev->phy_id & phydrv->phy_id_mask));
} }
Index: linux-2.6.25.1/include/linux/phy.h Index: linux-2.6.25.4/include/linux/phy.h
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/include/linux/phy.h 2008-05-01 23:45:25.000000000 +0200 --- linux-2.6.25.4.orig/include/linux/phy.h
+++ linux-2.6.25.1/include/linux/phy.h 2008-05-12 23:44:21.000000000 +0200 +++ linux-2.6.25.4/include/linux/phy.h
@@ -325,6 +325,11 @@ @@ -325,6 +325,11 @@ struct phy_driver {
u32 features; u32 features;
u32 flags; u32 flags;

16
target/linux/generic-2.6/patches-2.6.25/620-phy_adm6996.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.25.1/drivers/net/phy/Kconfig Index: linux-2.6.25.4/drivers/net/phy/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/net/phy/Kconfig 2008-05-01 23:45:25.000000000 +0200 --- linux-2.6.25.4.orig/drivers/net/phy/Kconfig
+++ linux-2.6.25.1/drivers/net/phy/Kconfig 2008-05-12 23:44:33.000000000 +0200 +++ linux-2.6.25.4/drivers/net/phy/Kconfig
@@ -65,6 +65,11 @@ @@ -65,6 +65,11 @@ config REALTEK_PHY
---help--- ---help---
Supports the Realtek 821x PHY. Supports the Realtek 821x PHY.
@ -14,11 +14,11 @@ Index: linux-2.6.25.1/drivers/net/phy/Kconfig
config FIXED_PHY config FIXED_PHY
bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs" bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
depends on PHYLIB=y depends on PHYLIB=y
Index: linux-2.6.25.1/drivers/net/phy/Makefile Index: linux-2.6.25.4/drivers/net/phy/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/net/phy/Makefile 2008-05-01 23:45:25.000000000 +0200 --- linux-2.6.25.4.orig/drivers/net/phy/Makefile
+++ linux-2.6.25.1/drivers/net/phy/Makefile 2008-05-12 23:44:50.000000000 +0200 +++ linux-2.6.25.4/drivers/net/phy/Makefile
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@ obj-$(CONFIG_SMSC_PHY) += smsc.o
obj-$(CONFIG_VITESSE_PHY) += vitesse.o obj-$(CONFIG_VITESSE_PHY) += vitesse.o
obj-$(CONFIG_BROADCOM_PHY) += broadcom.o obj-$(CONFIG_BROADCOM_PHY) += broadcom.o
obj-$(CONFIG_ICPLUS_PHY) += icplus.o obj-$(CONFIG_ICPLUS_PHY) += icplus.o

32
target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch
View File

@ -1,10 +1,10 @@
Index: linux-2.6.23.16/drivers/net/phy/phy_device.c Index: linux-2.6.25.4/drivers/net/phy/phy_device.c
=================================================================== ===================================================================
--- linux-2.6.23.16.orig/drivers/net/phy/phy_device.c 2008-04-20 10:16:21.000000000 +0200 --- linux-2.6.25.4.orig/drivers/net/phy/phy_device.c
+++ linux-2.6.23.16/drivers/net/phy/phy_device.c 2008-04-29 14:20:03.000000000 +0200 +++ linux-2.6.25.4/drivers/net/phy/phy_device.c
@@ -44,6 +44,18 @@ @@ -53,6 +53,18 @@ static void phy_device_release(struct de
extern int mdio_bus_init(void); phy_device_free(to_phy_device(dev));
extern void mdio_bus_exit(void); }
+static int generic_receive_skb(struct sk_buff *skb) +static int generic_receive_skb(struct sk_buff *skb)
+{ +{
@ -21,20 +21,20 @@ Index: linux-2.6.23.16/drivers/net/phy/phy_device.c
struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id) struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
{ {
struct phy_device *dev; struct phy_device *dev;
@@ -67,6 +79,8 @@ @@ -78,6 +90,8 @@ struct phy_device* phy_device_create(str
dev->bus = bus; dev->bus = bus;
dev->state = PHY_DOWN; dev->state = PHY_DOWN;
+ dev->netif_receive_skb = &generic_receive_skb; + dev->netif_receive_skb = &generic_receive_skb;
+ dev->netif_rx = &generic_rx; + dev->netif_rx = &generic_rx;
spin_lock_init(&dev->lock); mutex_init(&dev->lock);
Index: linux-2.6.23.16/include/linux/phy.h Index: linux-2.6.25.4/include/linux/phy.h
=================================================================== ===================================================================
--- linux-2.6.23.16.orig/include/linux/phy.h 2008-04-20 10:16:21.000000000 +0200 --- linux-2.6.25.4.orig/include/linux/phy.h
+++ linux-2.6.23.16/include/linux/phy.h 2008-04-20 10:17:58.000000000 +0200 +++ linux-2.6.25.4/include/linux/phy.h
@@ -289,6 +289,17 @@ @@ -295,6 +295,17 @@ struct phy_device {
void (*adjust_link)(struct net_device *dev); void (*adjust_link)(struct net_device *dev);
void (*adjust_state)(struct net_device *dev); void (*adjust_state)(struct net_device *dev);
@ -52,11 +52,11 @@ Index: linux-2.6.23.16/include/linux/phy.h
}; };
#define to_phy_device(d) container_of(d, struct phy_device, dev) #define to_phy_device(d) container_of(d, struct phy_device, dev)
Index: linux-2.6.23.16/include/linux/netdevice.h Index: linux-2.6.25.4/include/linux/netdevice.h
=================================================================== ===================================================================
--- linux-2.6.23.16.orig/include/linux/netdevice.h 2008-04-20 10:16:21.000000000 +0200 --- linux-2.6.25.4.orig/include/linux/netdevice.h
+++ linux-2.6.23.16/include/linux/netdevice.h 2008-04-20 10:17:58.000000000 +0200 +++ linux-2.6.25.4/include/linux/netdevice.h
@@ -426,6 +426,7 @@ @@ -595,6 +595,7 @@ struct net_device
void *ax25_ptr; /* AX.25 specific data */ void *ax25_ptr; /* AX.25 specific data */
struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data, struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
assign before registering */ assign before registering */

24
target/linux/generic-2.6/patches-2.6.25/640-mvswitch.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.25.1/drivers/net/phy/Kconfig Index: linux-2.6.25.4/drivers/net/phy/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/net/phy/Kconfig 2008-05-12 23:44:33.000000000 +0200 --- linux-2.6.25.4.orig/drivers/net/phy/Kconfig
+++ linux-2.6.25.1/drivers/net/phy/Kconfig 2008-05-12 23:45:33.000000000 +0200 +++ linux-2.6.25.4/drivers/net/phy/Kconfig
@@ -70,6 +70,12 @@ @@ -70,6 +70,12 @@ config ADM6996_PHY
---help--- ---help---
Currently supports the ADM6996F switch Currently supports the ADM6996F switch
@ -15,11 +15,11 @@ Index: linux-2.6.25.1/drivers/net/phy/Kconfig
config FIXED_PHY config FIXED_PHY
bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs" bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
depends on PHYLIB=y depends on PHYLIB=y
Index: linux-2.6.25.1/drivers/net/phy/Makefile Index: linux-2.6.25.4/drivers/net/phy/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/net/phy/Makefile 2008-05-12 23:44:50.000000000 +0200 --- linux-2.6.25.4.orig/drivers/net/phy/Makefile
+++ linux-2.6.25.1/drivers/net/phy/Makefile 2008-05-12 23:45:59.000000000 +0200 +++ linux-2.6.25.4/drivers/net/phy/Makefile
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@ obj-$(CONFIG_VITESSE_PHY) += vitesse.o
obj-$(CONFIG_BROADCOM_PHY) += broadcom.o obj-$(CONFIG_BROADCOM_PHY) += broadcom.o
obj-$(CONFIG_ICPLUS_PHY) += icplus.o obj-$(CONFIG_ICPLUS_PHY) += icplus.o
obj-$(CONFIG_ADM6996_PHY) += adm6996.o obj-$(CONFIG_ADM6996_PHY) += adm6996.o
@ -27,10 +27,10 @@ Index: linux-2.6.25.1/drivers/net/phy/Makefile
obj-$(CONFIG_REALTEK_PHY) += realtek.o obj-$(CONFIG_REALTEK_PHY) += realtek.o
obj-$(CONFIG_FIXED_PHY) += fixed.o obj-$(CONFIG_FIXED_PHY) += fixed.o
obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
Index: linux-2.6.25.1/drivers/net/phy/mdio_bus.c Index: linux-2.6.25.4/drivers/net/phy/mdio_bus.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/net/phy/mdio_bus.c 2008-05-12 23:44:21.000000000 +0200 --- linux-2.6.25.4.orig/drivers/net/phy/mdio_bus.c
+++ linux-2.6.25.1/drivers/net/phy/mdio_bus.c 2008-05-12 23:45:33.000000000 +0200 +++ linux-2.6.25.4/drivers/net/phy/mdio_bus.c
@@ -35,6 +35,12 @@ @@ -35,6 +35,12 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
@ -44,7 +44,7 @@ Index: linux-2.6.25.1/drivers/net/phy/mdio_bus.c
/** /**
* mdiobus_register - bring up all the PHYs on a given bus and attach them to bus * mdiobus_register - bring up all the PHYs on a given bus and attach them to bus
* @bus: target mii_bus * @bus: target mii_bus
@@ -85,6 +91,7 @@ @@ -85,6 +91,7 @@ int mdiobus_register(struct mii_bus *bus
phydev->dev.parent = bus->dev; phydev->dev.parent = bus->dev;
phydev->dev.bus = &mdio_bus_type; phydev->dev.bus = &mdio_bus_type;

2500
target/linux/generic-2.6/patches-2.6.25/700-powerpc_git.patch
View File

File diff suppressed because it is too large Load Diff

6
target/linux/generic-2.6/patches-2.6.25/801-usb_serial_endpoint_size.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/drivers/usb/serial/usb-serial.c Index: linux-2.6.25.4/drivers/usb/serial/usb-serial.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/usb/serial/usb-serial.c --- linux-2.6.25.4.orig/drivers/usb/serial/usb-serial.c
+++ linux-2.6.25.1/drivers/usb/serial/usb-serial.c +++ linux-2.6.25.4/drivers/usb/serial/usb-serial.c
@@ -58,6 +58,7 @@ static struct usb_driver usb_serial_driv @@ -58,6 +58,7 @@ static struct usb_driver usb_serial_driv
drivers depend on it. drivers depend on it.
*/ */

6
target/linux/generic-2.6/patches-2.6.25/840-unable_to_open_console.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/init/main.c Index: linux-2.6.25.4/init/main.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/init/main.c --- linux-2.6.25.4.orig/init/main.c
+++ linux-2.6.25.1/init/main.c +++ linux-2.6.25.4/init/main.c
@@ -775,7 +775,7 @@ static int noinline init_post(void) @@ -775,7 +775,7 @@ static int noinline init_post(void)
numa_default_policy(); numa_default_policy();

6
target/linux/generic-2.6/patches-2.6.25/850-jffs2_erase_progress_indicator.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/fs/jffs2/erase.c Index: linux-2.6.25.4/fs/jffs2/erase.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/fs/jffs2/erase.c --- linux-2.6.25.4.orig/fs/jffs2/erase.c
+++ linux-2.6.25.1/fs/jffs2/erase.c +++ linux-2.6.25.4/fs/jffs2/erase.c
@@ -35,6 +35,8 @@ static void jffs2_erase_block(struct jff @@ -35,6 +35,8 @@ static void jffs2_erase_block(struct jff
{ {
int ret; int ret;

12
target/linux/generic-2.6/patches-2.6.25/900-headers_type_and_time.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/include/linux/time.h Index: linux-2.6.25.4/include/linux/time.h
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/include/linux/time.h --- linux-2.6.25.4.orig/include/linux/time.h
+++ linux-2.6.25.1/include/linux/time.h +++ linux-2.6.25.4/include/linux/time.h
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
#ifndef _LINUX_TIME_H #ifndef _LINUX_TIME_H
#define _LINUX_TIME_H #define _LINUX_TIME_H
@ -20,10 +20,10 @@ Index: linux-2.6.25.1/include/linux/time.h
+#endif /* __KERNEL__ DEBIAN */ +#endif /* __KERNEL__ DEBIAN */
+ +
#endif #endif
Index: linux-2.6.25.1/include/linux/types.h Index: linux-2.6.25.4/include/linux/types.h
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/include/linux/types.h --- linux-2.6.25.4.orig/include/linux/types.h
+++ linux-2.6.25.1/include/linux/types.h +++ linux-2.6.25.4/include/linux/types.h
@@ -1,6 +1,14 @@ @@ -1,6 +1,14 @@
#ifndef _LINUX_TYPES_H #ifndef _LINUX_TYPES_H
#define _LINUX_TYPES_H #define _LINUX_TYPES_H

36
target/linux/generic-2.6/patches-2.6.25/902-darwin_scripts_include.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/scripts/genksyms/parse.c_shipped Index: linux-2.6.25.4/scripts/genksyms/parse.c_shipped
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/scripts/genksyms/parse.c_shipped --- linux-2.6.25.4.orig/scripts/genksyms/parse.c_shipped
+++ linux-2.6.25.1/scripts/genksyms/parse.c_shipped +++ linux-2.6.25.4/scripts/genksyms/parse.c_shipped
@@ -160,7 +160,9 @@ @@ -160,7 +160,9 @@
@ -12,10 +12,10 @@ Index: linux-2.6.25.1/scripts/genksyms/parse.c_shipped
#include "genksyms.h" #include "genksyms.h"
static int is_typedef; static int is_typedef;
Index: linux-2.6.25.1/scripts/genksyms/parse.y Index: linux-2.6.25.4/scripts/genksyms/parse.y
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/scripts/genksyms/parse.y --- linux-2.6.25.4.orig/scripts/genksyms/parse.y
+++ linux-2.6.25.1/scripts/genksyms/parse.y +++ linux-2.6.25.4/scripts/genksyms/parse.y
@@ -24,7 +24,9 @@ @@ -24,7 +24,9 @@
%{ %{
@ -26,10 +26,10 @@ Index: linux-2.6.25.1/scripts/genksyms/parse.y
#include "genksyms.h" #include "genksyms.h"
static int is_typedef; static int is_typedef;
Index: linux-2.6.25.1/scripts/kallsyms.c Index: linux-2.6.25.4/scripts/kallsyms.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/scripts/kallsyms.c --- linux-2.6.25.4.orig/scripts/kallsyms.c
+++ linux-2.6.25.1/scripts/kallsyms.c +++ linux-2.6.25.4/scripts/kallsyms.c
@@ -28,6 +28,35 @@ @@ -28,6 +28,35 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -66,10 +66,10 @@ Index: linux-2.6.25.1/scripts/kallsyms.c
#define KSYM_NAME_LEN 128 #define KSYM_NAME_LEN 128
Index: linux-2.6.25.1/scripts/kconfig/Makefile Index: linux-2.6.25.4/scripts/kconfig/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/scripts/kconfig/Makefile --- linux-2.6.25.4.orig/scripts/kconfig/Makefile
+++ linux-2.6.25.1/scripts/kconfig/Makefile +++ linux-2.6.25.4/scripts/kconfig/Makefile
@@ -93,6 +93,9 @@ check-lxdialog := $(srctree)/$(src)/lxd @@ -93,6 +93,9 @@ check-lxdialog := $(srctree)/$(src)/lxd
# we really need to do so. (Do not call gcc as part of make mrproper) # we really need to do so. (Do not call gcc as part of make mrproper)
HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
@ -80,10 +80,10 @@ Index: linux-2.6.25.1/scripts/kconfig/Makefile
HOST_EXTRACFLAGS += -DLOCALE HOST_EXTRACFLAGS += -DLOCALE
Index: linux-2.6.25.1/scripts/mod/mk_elfconfig.c Index: linux-2.6.25.4/scripts/mod/mk_elfconfig.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/scripts/mod/mk_elfconfig.c --- linux-2.6.25.4.orig/scripts/mod/mk_elfconfig.c
+++ linux-2.6.25.1/scripts/mod/mk_elfconfig.c +++ linux-2.6.25.4/scripts/mod/mk_elfconfig.c
@@ -1,7 +1,11 @@ @@ -1,7 +1,11 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -96,10 +96,10 @@ Index: linux-2.6.25.1/scripts/mod/mk_elfconfig.c
int int
main(int argc, char **argv) main(int argc, char **argv)
Index: linux-2.6.25.1/scripts/mod/modpost.h Index: linux-2.6.25.4/scripts/mod/modpost.h
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/scripts/mod/modpost.h --- linux-2.6.25.4.orig/scripts/mod/modpost.h
+++ linux-2.6.25.1/scripts/mod/modpost.h +++ linux-2.6.25.4/scripts/mod/modpost.h
@@ -7,7 +7,11 @@ @@ -7,7 +7,11 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <fcntl.h> #include <fcntl.h>

36
target/linux/generic-2.6/patches-2.6.25/903-hostap_txpower.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap_ap.c Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_ap.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/net/wireless/hostap/hostap_ap.c --- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap_ap.c
+++ linux-2.6.25.1/drivers/net/wireless/hostap/hostap_ap.c +++ linux-2.6.25.4/drivers/net/wireless/hostap/hostap_ap.c
@@ -2397,13 +2397,13 @@ int prism2_ap_get_sta_qual(local_info_t @@ -2397,13 +2397,13 @@ int prism2_ap_get_sta_qual(local_info_t
addr[count].sa_family = ARPHRD_ETHER; addr[count].sa_family = ARPHRD_ETHER;
memcpy(addr[count].sa_data, sta->addr, ETH_ALEN); memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
@ -42,10 +42,10 @@ Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap_ap.c
iwe.u.qual.updated = sta->last_rx_updated; iwe.u.qual.updated = sta->last_rx_updated;
iwe.len = IW_EV_QUAL_LEN; iwe.len = IW_EV_QUAL_LEN;
current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap_config.h Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_config.h
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/net/wireless/hostap/hostap_config.h --- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap_config.h
+++ linux-2.6.25.1/drivers/net/wireless/hostap/hostap_config.h +++ linux-2.6.25.4/drivers/net/wireless/hostap/hostap_config.h
@@ -45,4 +45,9 @@ @@ -45,4 +45,9 @@
*/ */
/* #define PRISM2_NO_STATION_MODES */ /* #define PRISM2_NO_STATION_MODES */
@ -56,10 +56,10 @@ Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap_config.h
+#define RAW_TXPOWER_SETTING +#define RAW_TXPOWER_SETTING
+ +
#endif /* HOSTAP_CONFIG_H */ #endif /* HOSTAP_CONFIG_H */
Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap.h Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap.h
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/net/wireless/hostap/hostap.h --- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap.h
+++ linux-2.6.25.1/drivers/net/wireless/hostap/hostap.h +++ linux-2.6.25.4/drivers/net/wireless/hostap/hostap.h
@@ -89,6 +89,7 @@ extern const struct iw_handler_def hosta @@ -89,6 +89,7 @@ extern const struct iw_handler_def hosta
extern const struct ethtool_ops prism2_ethtool_ops; extern const struct ethtool_ops prism2_ethtool_ops;
@ -68,10 +68,10 @@ Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap.h
#endif /* HOSTAP_H */ #endif /* HOSTAP_H */
Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap_hw.c Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_hw.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/net/wireless/hostap/hostap_hw.c --- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap_hw.c
+++ linux-2.6.25.1/drivers/net/wireless/hostap/hostap_hw.c +++ linux-2.6.25.4/drivers/net/wireless/hostap/hostap_hw.c
@@ -933,6 +933,7 @@ static int hfa384x_set_rid(struct net_de @@ -933,6 +933,7 @@ static int hfa384x_set_rid(struct net_de
prism2_hw_reset(dev); prism2_hw_reset(dev);
} }
@ -80,10 +80,10 @@ Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap_hw.c
return res; return res;
} }
Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap_info.c Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_info.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/net/wireless/hostap/hostap_info.c --- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap_info.c
+++ linux-2.6.25.1/drivers/net/wireless/hostap/hostap_info.c +++ linux-2.6.25.4/drivers/net/wireless/hostap/hostap_info.c
@@ -434,6 +434,11 @@ static void handle_info_queue_linkstatus @@ -434,6 +434,11 @@ static void handle_info_queue_linkstatus
} }
@ -96,10 +96,10 @@ Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap_info.c
if (connected) { if (connected) {
netif_carrier_on(local->dev); netif_carrier_on(local->dev);
netif_carrier_on(local->ddev); netif_carrier_on(local->ddev);
Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap_ioctl.c Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_ioctl.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/net/wireless/hostap/hostap_ioctl.c --- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap_ioctl.c
+++ linux-2.6.25.1/drivers/net/wireless/hostap/hostap_ioctl.c +++ linux-2.6.25.4/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -1500,23 +1500,20 @@ static int prism2_txpower_hfa386x_to_dBm @@ -1500,23 +1500,20 @@ static int prism2_txpower_hfa386x_to_dBm
val = 255; val = 255;

6
target/linux/generic-2.6/patches-2.6.25/903-stddef_include.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/include/linux/stddef.h Index: linux-2.6.25.4/include/linux/stddef.h
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/include/linux/stddef.h --- linux-2.6.25.4.orig/include/linux/stddef.h
+++ linux-2.6.25.1/include/linux/stddef.h +++ linux-2.6.25.4/include/linux/stddef.h
@@ -16,6 +16,7 @@ enum { @@ -16,6 +16,7 @@ enum {
false = 0, false = 0,
true = 1 true = 1

6
target/linux/generic-2.6/patches-2.6.25/904-ls_time_locale.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/scripts/gen_initramfs_list.sh Index: linux-2.6.25.4/scripts/gen_initramfs_list.sh
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/scripts/gen_initramfs_list.sh --- linux-2.6.25.4.orig/scripts/gen_initramfs_list.sh
+++ linux-2.6.25.1/scripts/gen_initramfs_list.sh +++ linux-2.6.25.4/scripts/gen_initramfs_list.sh
@@ -125,7 +125,7 @@ parse() { @@ -125,7 +125,7 @@ parse() {
str="${ftype} ${name} ${location} ${str}" str="${ftype} ${name} ${location} ${str}"
;; ;;

6
target/linux/generic-2.6/patches-2.6.25/905-i386_build.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/arch/x86/boot/tools/build.c Index: linux-2.6.25.4/arch/x86/boot/tools/build.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/arch/x86/boot/tools/build.c --- linux-2.6.25.4.orig/arch/x86/boot/tools/build.c
+++ linux-2.6.25.1/arch/x86/boot/tools/build.c +++ linux-2.6.25.4/arch/x86/boot/tools/build.c
@@ -29,7 +29,6 @@ @@ -29,7 +29,6 @@
#include <stdarg.h> #include <stdarg.h>
#include <sys/types.h> #include <sys/types.h>

12
target/linux/generic-2.6/patches-2.6.25/921-gpio_spi_driver.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/drivers/spi/Kconfig Index: linux-2.6.25.4/drivers/spi/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/spi/Kconfig --- linux-2.6.25.4.orig/drivers/spi/Kconfig
+++ linux-2.6.25.1/drivers/spi/Kconfig +++ linux-2.6.25.4/drivers/spi/Kconfig
@@ -100,6 +100,11 @@ config SPI_BUTTERFLY @@ -100,6 +100,11 @@ config SPI_BUTTERFLY
inexpensive battery powered microcontroller evaluation board. inexpensive battery powered microcontroller evaluation board.
This same cable can be used to flash new firmware. This same cable can be used to flash new firmware.
@ -14,10 +14,10 @@ Index: linux-2.6.25.1/drivers/spi/Kconfig
config SPI_IMX config SPI_IMX
tristate "Freescale iMX SPI controller" tristate "Freescale iMX SPI controller"
depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
Index: linux-2.6.25.1/drivers/spi/Makefile Index: linux-2.6.25.4/drivers/spi/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/spi/Makefile --- linux-2.6.25.4.orig/drivers/spi/Makefile
+++ linux-2.6.25.1/drivers/spi/Makefile +++ linux-2.6.25.4/drivers/spi/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_BFIN) += spi_bfin5xx. @@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_BFIN) += spi_bfin5xx.
obj-$(CONFIG_SPI_BITBANG) += spi_bitbang.o obj-$(CONFIG_SPI_BITBANG) += spi_bitbang.o
obj-$(CONFIG_SPI_AU1550) += au1550_spi.o obj-$(CONFIG_SPI_AU1550) += au1550_spi.o

6
target/linux/generic-2.6/patches-2.6.25/930-ppc_big_endian_io_memory_accessors.patch
View File

@ -30,10 +30,10 @@ and didn't make it with the ppc32 equivalent. Thanks.
--- ---
Index: linux-2.6.25.1/include/asm-ppc/io.h Index: linux-2.6.25.4/include/asm-ppc/io.h
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/include/asm-ppc/io.h --- linux-2.6.25.4.orig/include/asm-ppc/io.h
+++ linux-2.6.25.1/include/asm-ppc/io.h +++ linux-2.6.25.4/include/asm-ppc/io.h
@@ -413,11 +413,21 @@ static inline unsigned int ioread16(void @@ -413,11 +413,21 @@ static inline unsigned int ioread16(void
return readw(addr); return readw(addr);
} }

6
target/linux/generic-2.6/patches-2.6.25/940-arm_mach_types.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/arch/arm/tools/mach-types Index: linux-2.6.25.4/arch/arm/tools/mach-types
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/arch/arm/tools/mach-types --- linux-2.6.25.4.orig/arch/arm/tools/mach-types
+++ linux-2.6.25.1/arch/arm/tools/mach-types +++ linux-2.6.25.4/arch/arm/tools/mach-types
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
# #
# http://www.arm.linux.org.uk/developer/machines/?action=new # http://www.arm.linux.org.uk/developer/machines/?action=new

6
target/linux/generic-2.6/patches-2.6.25/950-revert_conntrack_optimization.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/net/netfilter/nf_conntrack_core.c Index: linux-2.6.25.4/net/netfilter/nf_conntrack_core.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/net/netfilter/nf_conntrack_core.c --- linux-2.6.25.4.orig/net/netfilter/nf_conntrack_core.c
+++ linux-2.6.25.1/net/netfilter/nf_conntrack_core.c +++ linux-2.6.25.4/net/netfilter/nf_conntrack_core.c
@@ -73,19 +73,15 @@ static unsigned int nf_conntrack_hash_rn @@ -73,19 +73,15 @@ static unsigned int nf_conntrack_hash_rn
static u_int32_t __hash_conntrack(const struct nf_conntrack_tuple *tuple, static u_int32_t __hash_conntrack(const struct nf_conntrack_tuple *tuple,
unsigned int size, unsigned int rnd) unsigned int size, unsigned int rnd)