From 6761ddd557729c97c12d19832c70e279839b4d5d Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Sun, 18 May 2008 20:23:20 +0000 Subject: [PATCH] refresh generic 2.6.21 patches SVN-Revision: 11185 --- .../generic-2.6/patches/001-squashfs.patch | 82 ++++---- .../patches/002-lzma_decompress.patch | 25 +-- .../patches/003-squashfs_lzma.patch | 17 +- .../patches/004-extra_optimization.patch | 9 +- .../patches/006-gcc4_inline_fix.patch | 9 +- .../patches/007-samsung_flash.patch | 9 +- .../009-revert_intel_flash_breakage.patch | 23 +-- ...0-disable_old_squashfs_compatibility.patch | 14 +- .../generic-2.6/patches/011-mips_boot.patch | 7 +- .../patches/012-mips_cpu_tlb.patch | 11 +- .../013-mips_generic_gpio_support.patch | 25 +-- .../patches/060-rootfs_split.patch | 12 +- .../patches/065-block2mtd_init.patch | 21 +- .../120-openswan-2.4.0.kernel-2.6-natt.patch | 39 ++-- .../patches/130-netfilter_ipset.patch | 183 ++++++++++-------- .../patches/140-netfilter_time.patch | 32 +-- .../patches/150-netfilter_imq.patch | 122 ++++++------ .../patches/160-netfilter_route.patch | 73 ++++--- .../patches/180-netfilter_depends.patch | 10 +- .../generic-2.6/patches/200-sched_esfq.patch | 34 ++-- .../201-multiple_default_gateways.patch | 94 ++++----- .../patches/202-mips-freestanding.patch | 9 +- .../patches/204-jffs2_eofdetect.patch | 20 +- .../patches/207-powerpc_asm_segment_h.patch | 7 +- .../patches/208-rtl8110sb_fix.patch | 11 +- .../generic-2.6/patches/209-mini_fo.patch | 137 +++++++------ .../patches/210-d80211_compat.patch | 9 +- .../patches/211-no_block2mtd_readahead.patch | 9 +- .../patches/212-block2mtd_erase_scan.patch | 9 +- .../patches/213-kobject_uevent.patch | 10 +- .../linux/generic-2.6/patches/510-Yaffs.patch | 18 +- .../patches/900-headers_type_and_time.patch | 18 +- .../patches/902-darwin_scripts_include.patch | 60 +++--- .../patches/903-hostap_txpower.patch | 60 +++--- .../patches/903-stddef_include.patch | 11 +- .../patches/904-ls_time_locale.patch | 11 +- 36 files changed, 688 insertions(+), 562 deletions(-) diff --git a/target/linux/generic-2.6/patches/001-squashfs.patch b/target/linux/generic-2.6/patches/001-squashfs.patch index 4d52e49db0..e64db466cf 100644 --- a/target/linux/generic-2.6/patches/001-squashfs.patch +++ b/target/linux/generic-2.6/patches/001-squashfs.patch @@ -1,7 +1,8 @@ -diff -urN linux-2.6.21.1.old/fs/Kconfig linux-2.6.21.1.dev/fs/Kconfig ---- linux-2.6.21.1.old/fs/Kconfig 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/fs/Kconfig 2007-05-26 19:00:37.121351760 +0200 -@@ -1371,6 +1371,71 @@ +Index: linux-2.6.21.7/fs/Kconfig +=================================================================== +--- linux-2.6.21.7.orig/fs/Kconfig ++++ linux-2.6.21.7/fs/Kconfig +@@ -1371,6 +1371,71 @@ config CRAMFS If unsure, say N. @@ -73,10 +74,11 @@ diff -urN linux-2.6.21.1.old/fs/Kconfig linux-2.6.21.1.dev/fs/Kconfig config VXFS_FS tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)" depends on BLOCK -diff -urN linux-2.6.21.1.old/fs/Makefile linux-2.6.21.1.dev/fs/Makefile ---- linux-2.6.21.1.old/fs/Makefile 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/fs/Makefile 2007-05-26 19:00:37.121351760 +0200 -@@ -68,6 +68,7 @@ +Index: linux-2.6.21.7/fs/Makefile +=================================================================== +--- linux-2.6.21.7.orig/fs/Makefile ++++ linux-2.6.21.7/fs/Makefile +@@ -68,6 +68,7 @@ obj-$(CONFIG_JBD) += jbd/ obj-$(CONFIG_JBD2) += jbd2/ obj-$(CONFIG_EXT2_FS) += ext2/ obj-$(CONFIG_CRAMFS) += cramfs/ @@ -84,9 +86,10 @@ diff -urN linux-2.6.21.1.old/fs/Makefile linux-2.6.21.1.dev/fs/Makefile obj-$(CONFIG_RAMFS) += ramfs/ obj-$(CONFIG_HUGETLBFS) += hugetlbfs/ obj-$(CONFIG_CODA_FS) += coda/ -diff -urN linux-2.6.21.1.old/fs/squashfs/inode.c linux-2.6.21.1.dev/fs/squashfs/inode.c ---- linux-2.6.21.1.old/fs/squashfs/inode.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/fs/squashfs/inode.c 2007-05-26 19:00:37.123351456 +0200 +Index: linux-2.6.21.7/fs/squashfs/inode.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/fs/squashfs/inode.c @@ -0,0 +1,2124 @@ +/* + * Squashfs - a compressed read only filesystem for Linux @@ -2212,9 +2215,10 @@ diff -urN linux-2.6.21.1.old/fs/squashfs/inode.c linux-2.6.21.1.dev/fs/squashfs/ +MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem"); +MODULE_AUTHOR("Phillip Lougher "); +MODULE_LICENSE("GPL"); -diff -urN linux-2.6.21.1.old/fs/squashfs/Makefile linux-2.6.21.1.dev/fs/squashfs/Makefile ---- linux-2.6.21.1.old/fs/squashfs/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/fs/squashfs/Makefile 2007-05-26 19:00:37.123351456 +0200 +Index: linux-2.6.21.7/fs/squashfs/Makefile +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/fs/squashfs/Makefile @@ -0,0 +1,7 @@ +# +# Makefile for the linux squashfs routines. @@ -2223,9 +2227,10 @@ diff -urN linux-2.6.21.1.old/fs/squashfs/Makefile linux-2.6.21.1.dev/fs/squashfs +obj-$(CONFIG_SQUASHFS) += squashfs.o +squashfs-y += inode.o +squashfs-y += squashfs2_0.o -diff -urN linux-2.6.21.1.old/fs/squashfs/squashfs2_0.c linux-2.6.21.1.dev/fs/squashfs/squashfs2_0.c ---- linux-2.6.21.1.old/fs/squashfs/squashfs2_0.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/fs/squashfs/squashfs2_0.c 2007-05-26 19:00:37.125351152 +0200 +Index: linux-2.6.21.7/fs/squashfs/squashfs2_0.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/fs/squashfs/squashfs2_0.c @@ -0,0 +1,758 @@ +/* + * Squashfs - a compressed read only filesystem for Linux @@ -2985,9 +2990,10 @@ diff -urN linux-2.6.21.1.old/fs/squashfs/squashfs2_0.c linux-2.6.21.1.dev/fs/squ + + return 1; +} -diff -urN linux-2.6.21.1.old/fs/squashfs/squashfs.h linux-2.6.21.1.dev/fs/squashfs/squashfs.h ---- linux-2.6.21.1.old/fs/squashfs/squashfs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/fs/squashfs/squashfs.h 2007-05-26 19:00:37.125351152 +0200 +Index: linux-2.6.21.7/fs/squashfs/squashfs.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/fs/squashfs/squashfs.h @@ -0,0 +1,86 @@ +/* + * Squashfs - a compressed read only filesystem for Linux @@ -3075,9 +3081,10 @@ diff -urN linux-2.6.21.1.old/fs/squashfs/squashfs.h linux-2.6.21.1.dev/fs/squash + return 0; +} +#endif -diff -urN linux-2.6.21.1.old/include/linux/squashfs_fs.h linux-2.6.21.1.dev/include/linux/squashfs_fs.h ---- linux-2.6.21.1.old/include/linux/squashfs_fs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/include/linux/squashfs_fs.h 2007-05-26 19:00:37.143348416 +0200 +Index: linux-2.6.21.7/include/linux/squashfs_fs.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/include/linux/squashfs_fs.h @@ -0,0 +1,911 @@ +#ifndef SQUASHFS_FS +#define SQUASHFS_FS @@ -3990,9 +3997,10 @@ diff -urN linux-2.6.21.1.old/include/linux/squashfs_fs.h linux-2.6.21.1.dev/incl + +#endif +#endif -diff -urN linux-2.6.21.1.old/include/linux/squashfs_fs_i.h linux-2.6.21.1.dev/include/linux/squashfs_fs_i.h ---- linux-2.6.21.1.old/include/linux/squashfs_fs_i.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/include/linux/squashfs_fs_i.h 2007-05-26 19:00:37.143348416 +0200 +Index: linux-2.6.21.7/include/linux/squashfs_fs_i.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/include/linux/squashfs_fs_i.h @@ -0,0 +1,45 @@ +#ifndef SQUASHFS_FS_I +#define SQUASHFS_FS_I @@ -4039,9 +4047,10 @@ diff -urN linux-2.6.21.1.old/include/linux/squashfs_fs_i.h linux-2.6.21.1.dev/in + struct inode vfs_inode; +}; +#endif -diff -urN linux-2.6.21.1.old/include/linux/squashfs_fs_sb.h linux-2.6.21.1.dev/include/linux/squashfs_fs_sb.h ---- linux-2.6.21.1.old/include/linux/squashfs_fs_sb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/include/linux/squashfs_fs_sb.h 2007-05-26 19:00:37.144348264 +0200 +Index: linux-2.6.21.7/include/linux/squashfs_fs_sb.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/include/linux/squashfs_fs_sb.h @@ -0,0 +1,74 @@ +#ifndef SQUASHFS_FS_SB +#define SQUASHFS_FS_SB @@ -4117,9 +4126,10 @@ diff -urN linux-2.6.21.1.old/include/linux/squashfs_fs_sb.h linux-2.6.21.1.dev/i + int (*read_fragment_index_table)(struct super_block *s); +}; +#endif -diff -urN linux-2.6.21.1.old/init/do_mounts_rd.c linux-2.6.21.1.dev/init/do_mounts_rd.c ---- linux-2.6.21.1.old/init/do_mounts_rd.c 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/init/do_mounts_rd.c 2007-05-26 19:00:37.144348264 +0200 +Index: linux-2.6.21.7/init/do_mounts_rd.c +=================================================================== +--- linux-2.6.21.7.orig/init/do_mounts_rd.c ++++ linux-2.6.21.7/init/do_mounts_rd.c @@ -5,6 +5,7 @@ #include #include @@ -4128,7 +4138,7 @@ diff -urN linux-2.6.21.1.old/init/do_mounts_rd.c linux-2.6.21.1.dev/init/do_moun #include #include -@@ -39,6 +40,7 @@ +@@ -39,6 +40,7 @@ static int __init crd_load(int in_fd, in * numbers could not be found. * * We currently check for the following magic numbers: @@ -4136,7 +4146,7 @@ diff -urN linux-2.6.21.1.old/init/do_mounts_rd.c linux-2.6.21.1.dev/init/do_moun * minix * ext2 * romfs -@@ -53,6 +55,7 @@ +@@ -53,6 +55,7 @@ identify_ramdisk_image(int fd, int start struct ext2_super_block *ext2sb; struct romfs_super_block *romfsb; struct cramfs_super *cramfsb; @@ -4144,7 +4154,7 @@ diff -urN linux-2.6.21.1.old/init/do_mounts_rd.c linux-2.6.21.1.dev/init/do_moun int nblocks = -1; unsigned char *buf; -@@ -64,6 +67,7 @@ +@@ -64,6 +67,7 @@ identify_ramdisk_image(int fd, int start ext2sb = (struct ext2_super_block *) buf; romfsb = (struct romfs_super_block *) buf; cramfsb = (struct cramfs_super *) buf; @@ -4152,7 +4162,7 @@ diff -urN linux-2.6.21.1.old/init/do_mounts_rd.c linux-2.6.21.1.dev/init/do_moun memset(buf, 0xe5, size); /* -@@ -101,6 +105,15 @@ +@@ -101,6 +105,15 @@ identify_ramdisk_image(int fd, int start goto done; } diff --git a/target/linux/generic-2.6/patches/002-lzma_decompress.patch b/target/linux/generic-2.6/patches/002-lzma_decompress.patch index 3f15feba38..e4a00692f2 100644 --- a/target/linux/generic-2.6/patches/002-lzma_decompress.patch +++ b/target/linux/generic-2.6/patches/002-lzma_decompress.patch @@ -1,6 +1,7 @@ -diff -urN linux-2.6.21.1.old/include/linux/LzmaDecode.h linux-2.6.21.1.dev/include/linux/LzmaDecode.h ---- linux-2.6.21.1.old/include/linux/LzmaDecode.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/include/linux/LzmaDecode.h 2007-05-26 19:03:45.705682584 +0200 +Index: linux-2.6.21.7/include/linux/LzmaDecode.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/include/linux/LzmaDecode.h @@ -0,0 +1,100 @@ +/* + LzmaDecode.h @@ -102,9 +103,10 @@ diff -urN linux-2.6.21.1.old/include/linux/LzmaDecode.h linux-2.6.21.1.dev/inclu + UInt32 *outSizeProcessed); + +#endif -diff -urN linux-2.6.21.1.old/lib/LzmaDecode.c linux-2.6.21.1.dev/lib/LzmaDecode.c ---- linux-2.6.21.1.old/lib/LzmaDecode.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/lib/LzmaDecode.c 2007-05-26 19:03:45.706682432 +0200 +Index: linux-2.6.21.7/lib/LzmaDecode.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/lib/LzmaDecode.c @@ -0,0 +1,663 @@ +/* + LzmaDecode.c @@ -769,10 +771,11 @@ diff -urN linux-2.6.21.1.old/lib/LzmaDecode.c linux-2.6.21.1.dev/lib/LzmaDecode. + *outSizeProcessed = nowPos; + return LZMA_RESULT_OK; +} -diff -urN linux-2.6.21.1.old/lib/Makefile linux-2.6.21.1.dev/lib/Makefile ---- linux-2.6.21.1.old/lib/Makefile 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/lib/Makefile 2007-05-26 19:03:45.721680152 +0200 -@@ -12,7 +12,7 @@ +Index: linux-2.6.21.7/lib/Makefile +=================================================================== +--- linux-2.6.21.7.orig/lib/Makefile ++++ linux-2.6.21.7/lib/Makefile +@@ -12,7 +12,7 @@ lib-$(CONFIG_SMP) += cpumask.o lib-y += kobject.o kref.o kobject_uevent.o klist.o @@ -781,7 +784,7 @@ diff -urN linux-2.6.21.1.old/lib/Makefile linux-2.6.21.1.dev/lib/Makefile ifeq ($(CONFIG_DEBUG_KOBJECT),y) CFLAGS_kobject.o += -DDEBUG -@@ -56,6 +56,7 @@ +@@ -56,6 +56,7 @@ obj-$(CONFIG_SMP) += percpu_counter.o obj-$(CONFIG_AUDIT_GENERIC) += audit.o obj-$(CONFIG_SWIOTLB) += swiotlb.o diff --git a/target/linux/generic-2.6/patches/003-squashfs_lzma.patch b/target/linux/generic-2.6/patches/003-squashfs_lzma.patch index 1561461d9e..e476c76162 100644 --- a/target/linux/generic-2.6/patches/003-squashfs_lzma.patch +++ b/target/linux/generic-2.6/patches/003-squashfs_lzma.patch @@ -1,6 +1,7 @@ -diff -urN linux-2.6.21.1.old/fs/squashfs/inode.c linux-2.6.21.1.dev/fs/squashfs/inode.c ---- linux-2.6.21.1.old/fs/squashfs/inode.c 2007-05-26 19:03:45.499713896 +0200 -+++ linux-2.6.21.1.dev/fs/squashfs/inode.c 2007-05-26 19:07:27.951896024 +0200 +Index: linux-2.6.21.7/fs/squashfs/inode.c +=================================================================== +--- linux-2.6.21.7.orig/fs/squashfs/inode.c ++++ linux-2.6.21.7/fs/squashfs/inode.c @@ -4,6 +4,9 @@ * Copyright (c) 2002, 2003, 2004, 2005, 2006 * Phillip Lougher @@ -39,7 +40,7 @@ diff -urN linux-2.6.21.1.old/fs/squashfs/inode.c linux-2.6.21.1.dev/fs/squashfs/ static void squashfs_put_super(struct super_block *); static int squashfs_statfs(struct dentry *, struct kstatfs *); static int squashfs_symlink_readpage(struct file *file, struct page *page); -@@ -64,7 +81,11 @@ +@@ -64,7 +81,11 @@ static int squashfs_get_sb(struct file_s const char *, void *, struct vfsmount *); @@ -51,7 +52,7 @@ diff -urN linux-2.6.21.1.old/fs/squashfs/inode.c linux-2.6.21.1.dev/fs/squashfs/ static struct file_system_type squashfs_fs_type = { .owner = THIS_MODULE, -@@ -249,6 +270,15 @@ +@@ -249,6 +270,15 @@ SQSH_EXTERN unsigned int squashfs_read_d if (compressed) { int zlib_err; @@ -67,7 +68,7 @@ diff -urN linux-2.6.21.1.old/fs/squashfs/inode.c linux-2.6.21.1.dev/fs/squashfs/ stream.next_in = c_buffer; stream.avail_in = c_byte; stream.next_out = buffer; -@@ -263,7 +293,7 @@ +@@ -263,7 +293,7 @@ SQSH_EXTERN unsigned int squashfs_read_d bytes = 0; } else bytes = stream.total_out; @@ -76,7 +77,7 @@ diff -urN linux-2.6.21.1.old/fs/squashfs/inode.c linux-2.6.21.1.dev/fs/squashfs/ up(&msblk->read_data_mutex); } -@@ -2045,15 +2075,19 @@ +@@ -2045,15 +2075,19 @@ static int __init init_squashfs_fs(void) printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) " "Phillip Lougher\n"); @@ -96,7 +97,7 @@ diff -urN linux-2.6.21.1.old/fs/squashfs/inode.c linux-2.6.21.1.dev/fs/squashfs/ destroy_inodecache(); } -@@ -2064,7 +2098,9 @@ +@@ -2064,7 +2098,9 @@ out: static void __exit exit_squashfs_fs(void) { diff --git a/target/linux/generic-2.6/patches/004-extra_optimization.patch b/target/linux/generic-2.6/patches/004-extra_optimization.patch index 57bea7ea50..3a08e13431 100644 --- a/target/linux/generic-2.6/patches/004-extra_optimization.patch +++ b/target/linux/generic-2.6/patches/004-extra_optimization.patch @@ -1,7 +1,8 @@ -diff -urN linux-2.6.21.1.old/Makefile linux-2.6.21.1.dev/Makefile ---- linux-2.6.21.1.old/Makefile 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/Makefile 2007-05-26 19:14:22.967804016 +0200 -@@ -507,6 +507,9 @@ +Index: linux-2.6.21.7/Makefile +=================================================================== +--- linux-2.6.21.7.orig/Makefile ++++ linux-2.6.21.7/Makefile +@@ -507,6 +507,9 @@ CFLAGS += $(call cc-option, -fn NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include) CHECKFLAGS += $(NOSTDINC_FLAGS) diff --git a/target/linux/generic-2.6/patches/006-gcc4_inline_fix.patch b/target/linux/generic-2.6/patches/006-gcc4_inline_fix.patch index 49c85a71ee..2c147b5e45 100644 --- a/target/linux/generic-2.6/patches/006-gcc4_inline_fix.patch +++ b/target/linux/generic-2.6/patches/006-gcc4_inline_fix.patch @@ -1,7 +1,8 @@ -diff -urN linux-2.6.21.1.old/include/asm-mips/system.h linux-2.6.21.1.dev/include/asm-mips/system.h ---- linux-2.6.21.1.old/include/asm-mips/system.h 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/include/asm-mips/system.h 2007-05-26 19:26:30.870146040 +0200 -@@ -188,7 +188,7 @@ +Index: linux-2.6.21.7/include/asm-mips/system.h +=================================================================== +--- linux-2.6.21.7.orig/include/asm-mips/system.h ++++ linux-2.6.21.7/include/asm-mips/system.h +@@ -188,7 +188,7 @@ extern __u64 __xchg_u64_unsupported_on_3 if something tries to do an invalid xchg(). */ extern void __xchg_called_with_bad_pointer(void); diff --git a/target/linux/generic-2.6/patches/007-samsung_flash.patch b/target/linux/generic-2.6/patches/007-samsung_flash.patch index 8c94003081..6878633913 100644 --- a/target/linux/generic-2.6/patches/007-samsung_flash.patch +++ b/target/linux/generic-2.6/patches/007-samsung_flash.patch @@ -1,6 +1,7 @@ -diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0002.c linux-2.6.21.1.dev/drivers/mtd/chips/cfi_cmdset_0002.c ---- linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0002.c 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/drivers/mtd/chips/cfi_cmdset_0002.c 2007-05-26 19:30:01.049193968 +0200 +Index: linux-2.6.21.7/drivers/mtd/chips/cfi_cmdset_0002.c +=================================================================== +--- linux-2.6.21.7.orig/drivers/mtd/chips/cfi_cmdset_0002.c ++++ linux-2.6.21.7/drivers/mtd/chips/cfi_cmdset_0002.c @@ -51,6 +51,7 @@ #define SST49LF040B 0x0050 #define SST49LF008A 0x005a @@ -9,7 +10,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0002.c linux-2.6.21.1. static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *); static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *); -@@ -294,12 +295,19 @@ +@@ -294,12 +295,19 @@ struct mtd_info *cfi_cmdset_0002(struct if (extp->MajorVersion != '1' || (extp->MinorVersion < '0' || extp->MinorVersion > '4')) { diff --git a/target/linux/generic-2.6/patches/009-revert_intel_flash_breakage.patch b/target/linux/generic-2.6/patches/009-revert_intel_flash_breakage.patch index d75607392d..8c7684a5fb 100644 --- a/target/linux/generic-2.6/patches/009-revert_intel_flash_breakage.patch +++ b/target/linux/generic-2.6/patches/009-revert_intel_flash_breakage.patch @@ -1,7 +1,8 @@ -diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.21.1.dev/drivers/mtd/chips/cfi_cmdset_0001.c ---- linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0001.c 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/drivers/mtd/chips/cfi_cmdset_0001.c 2007-05-26 19:40:46.809023552 +0200 -@@ -919,7 +919,7 @@ +Index: linux-2.6.21.7/drivers/mtd/chips/cfi_cmdset_0001.c +=================================================================== +--- linux-2.6.21.7.orig/drivers/mtd/chips/cfi_cmdset_0001.c ++++ linux-2.6.21.7/drivers/mtd/chips/cfi_cmdset_0001.c +@@ -919,7 +919,7 @@ static void __xipram xip_enable(struct m static int __xipram xip_wait_for_operation( struct map_info *map, struct flchip *chip, @@ -10,7 +11,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.21.1. { struct cfi_private *cfi = map->fldrv_priv; struct cfi_pri_intelext *cfip = cfi->cmdset_priv; -@@ -928,7 +928,7 @@ +@@ -928,7 +928,7 @@ static int __xipram xip_wait_for_operati flstate_t oldstate, newstate; start = xip_currtime(); @@ -19,7 +20,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.21.1. if (usec == 0) usec = 500000; done = 0; -@@ -1038,8 +1038,8 @@ +@@ -1038,8 +1038,8 @@ static int __xipram xip_wait_for_operati #define XIP_INVAL_CACHED_RANGE(map, from, size) \ INVALIDATE_CACHED_RANGE(map, from, size) @@ -30,7 +31,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.21.1. #else -@@ -1051,65 +1051,65 @@ +@@ -1051,65 +1051,65 @@ static int __xipram xip_wait_for_operati static int inval_cache_and_wait_for_operation( struct map_info *map, struct flchip *chip, unsigned long cmd_adr, unsigned long inval_adr, int inval_len, @@ -131,7 +132,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.21.1. /* Done and happy. */ chip->state = FL_STATUS; return 0; -@@ -1118,7 +1118,8 @@ +@@ -1118,7 +1118,8 @@ static int inval_cache_and_wait_for_oper #endif #define WAIT_TIMEOUT(map, chip, adr, udelay) \ @@ -141,7 +142,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.21.1. static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len) -@@ -1342,7 +1343,7 @@ +@@ -1342,7 +1343,7 @@ static int __xipram do_write_oneword(str ret = INVAL_CACHE_AND_WAIT(map, chip, adr, adr, map_bankwidth(map), @@ -150,7 +151,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.21.1. if (ret) { xip_enable(map, chip, adr); printk(KERN_ERR "%s: word write error (status timeout)\n", map->name); -@@ -1579,7 +1580,7 @@ +@@ -1579,7 +1580,7 @@ static int __xipram do_write_buffer(stru ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr, adr, len, @@ -159,7 +160,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.21.1. if (ret) { map_write(map, CMD(0x70), cmd_adr); chip->state = FL_STATUS; -@@ -1714,7 +1715,7 @@ +@@ -1714,7 +1715,7 @@ static int __xipram do_erase_oneblock(st ret = INVAL_CACHE_AND_WAIT(map, chip, adr, adr, len, diff --git a/target/linux/generic-2.6/patches/010-disable_old_squashfs_compatibility.patch b/target/linux/generic-2.6/patches/010-disable_old_squashfs_compatibility.patch index de205a98ab..55498617af 100644 --- a/target/linux/generic-2.6/patches/010-disable_old_squashfs_compatibility.patch +++ b/target/linux/generic-2.6/patches/010-disable_old_squashfs_compatibility.patch @@ -1,14 +1,16 @@ -diff -urN linux-2.6.21.1.old/fs/squashfs/Makefile linux-2.6.21.1.dev/fs/squashfs/Makefile ---- linux-2.6.21.1.old/fs/squashfs/Makefile 2007-05-26 19:03:45.499713896 +0200 -+++ linux-2.6.21.1.dev/fs/squashfs/Makefile 2007-05-26 19:43:37.064140840 +0200 +Index: linux-2.6.21.7/fs/squashfs/Makefile +=================================================================== +--- linux-2.6.21.7.orig/fs/squashfs/Makefile ++++ linux-2.6.21.7/fs/squashfs/Makefile @@ -4,4 +4,3 @@ obj-$(CONFIG_SQUASHFS) += squashfs.o squashfs-y += inode.o -squashfs-y += squashfs2_0.o -diff -urN linux-2.6.21.1.old/fs/squashfs/squashfs.h linux-2.6.21.1.dev/fs/squashfs/squashfs.h ---- linux-2.6.21.1.old/fs/squashfs/squashfs.h 2007-05-26 19:03:45.500713744 +0200 -+++ linux-2.6.21.1.dev/fs/squashfs/squashfs.h 2007-05-26 19:43:37.075139168 +0200 +Index: linux-2.6.21.7/fs/squashfs/squashfs.h +=================================================================== +--- linux-2.6.21.7.orig/fs/squashfs/squashfs.h ++++ linux-2.6.21.7/fs/squashfs/squashfs.h @@ -24,6 +24,9 @@ #ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY #undef CONFIG_SQUASHFS_1_0_COMPATIBILITY diff --git a/target/linux/generic-2.6/patches/011-mips_boot.patch b/target/linux/generic-2.6/patches/011-mips_boot.patch index 6b3ebf74d9..866b3f01ef 100644 --- a/target/linux/generic-2.6/patches/011-mips_boot.patch +++ b/target/linux/generic-2.6/patches/011-mips_boot.patch @@ -1,6 +1,7 @@ -diff -urN linux-2.6.21.1.old/arch/mips/kernel/head.S linux-2.6.21.1.dev/arch/mips/kernel/head.S ---- linux-2.6.21.1.old/arch/mips/kernel/head.S 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/arch/mips/kernel/head.S 2007-05-26 19:46:49.061952736 +0200 +Index: linux-2.6.21.7/arch/mips/kernel/head.S +=================================================================== +--- linux-2.6.21.7.orig/arch/mips/kernel/head.S ++++ linux-2.6.21.7/arch/mips/kernel/head.S @@ -129,11 +129,15 @@ #endif .endm diff --git a/target/linux/generic-2.6/patches/012-mips_cpu_tlb.patch b/target/linux/generic-2.6/patches/012-mips_cpu_tlb.patch index 85b31e3348..305cef0e3f 100644 --- a/target/linux/generic-2.6/patches/012-mips_cpu_tlb.patch +++ b/target/linux/generic-2.6/patches/012-mips_cpu_tlb.patch @@ -1,7 +1,8 @@ -diff -urN linux-2.6.21.1.old/arch/mips/mm/tlbex.c linux-2.6.21.1.dev/arch/mips/mm/tlbex.c ---- linux-2.6.21.1.old/arch/mips/mm/tlbex.c 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/arch/mips/mm/tlbex.c 2007-05-26 19:50:19.046030304 +0200 -@@ -887,7 +887,6 @@ +Index: linux-2.6.21.7/arch/mips/mm/tlbex.c +=================================================================== +--- linux-2.6.21.7.orig/arch/mips/mm/tlbex.c ++++ linux-2.6.21.7/arch/mips/mm/tlbex.c +@@ -887,7 +887,6 @@ static __init void build_tlb_write_entry case CPU_R10000: case CPU_R12000: case CPU_R14000: @@ -9,7 +10,7 @@ diff -urN linux-2.6.21.1.old/arch/mips/mm/tlbex.c linux-2.6.21.1.dev/arch/mips/m case CPU_SB1: case CPU_SB1A: case CPU_4KSC: -@@ -915,6 +914,7 @@ +@@ -915,6 +914,7 @@ static __init void build_tlb_write_entry tlbw(p); break; diff --git a/target/linux/generic-2.6/patches/013-mips_generic_gpio_support.patch b/target/linux/generic-2.6/patches/013-mips_generic_gpio_support.patch index 489e9acf9d..c23519e378 100644 --- a/target/linux/generic-2.6/patches/013-mips_generic_gpio_support.patch +++ b/target/linux/generic-2.6/patches/013-mips_generic_gpio_support.patch @@ -1,7 +1,8 @@ -diff -urN linux-2.6.21.1.old/arch/mips/defconfig linux-2.6.21.1.dev/arch/mips/defconfig ---- linux-2.6.21.1.old/arch/mips/defconfig 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/arch/mips/defconfig 2007-05-26 19:55:17.542651920 +0200 -@@ -69,6 +69,7 @@ +Index: linux-2.6.21.7/arch/mips/defconfig +=================================================================== +--- linux-2.6.21.7.orig/arch/mips/defconfig ++++ linux-2.6.21.7/arch/mips/defconfig +@@ -69,6 +69,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_TIME=y @@ -9,10 +10,11 @@ diff -urN linux-2.6.21.1.old/arch/mips/defconfig linux-2.6.21.1.dev/arch/mips/de CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set CONFIG_ARC=y -diff -urN linux-2.6.21.1.old/arch/mips/Kconfig linux-2.6.21.1.dev/arch/mips/Kconfig ---- linux-2.6.21.1.old/arch/mips/Kconfig 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/arch/mips/Kconfig 2007-05-26 19:55:17.500658304 +0200 -@@ -869,6 +869,10 @@ +Index: linux-2.6.21.7/arch/mips/Kconfig +=================================================================== +--- linux-2.6.21.7.orig/arch/mips/Kconfig ++++ linux-2.6.21.7/arch/mips/Kconfig +@@ -869,6 +869,10 @@ config GENERIC_TIME bool default y @@ -23,9 +25,10 @@ diff -urN linux-2.6.21.1.old/arch/mips/Kconfig linux-2.6.21.1.dev/arch/mips/Kcon config SCHED_NO_NO_OMIT_FRAME_POINTER bool default y -diff -urN linux-2.6.21.1.old/include/asm-mips/gpio.h linux-2.6.21.1.dev/include/asm-mips/gpio.h ---- linux-2.6.21.1.old/include/asm-mips/gpio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/include/asm-mips/gpio.h 2007-05-26 19:55:17.500658304 +0200 +Index: linux-2.6.21.7/include/asm-mips/gpio.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/include/asm-mips/gpio.h @@ -0,0 +1,6 @@ +#ifndef _ASM_MIPS_GPIO_H +#define _ASM_MIPS_GPIO_H diff --git a/target/linux/generic-2.6/patches/060-rootfs_split.patch b/target/linux/generic-2.6/patches/060-rootfs_split.patch index adafdaacba..210360600e 100644 --- a/target/linux/generic-2.6/patches/060-rootfs_split.patch +++ b/target/linux/generic-2.6/patches/060-rootfs_split.patch @@ -1,7 +1,7 @@ -Index: linux/drivers/mtd/Kconfig +Index: linux-2.6.21.7/drivers/mtd/Kconfig =================================================================== ---- linux.orig/drivers/mtd/Kconfig -+++ linux/drivers/mtd/Kconfig +--- linux-2.6.21.7.orig/drivers/mtd/Kconfig ++++ linux-2.6.21.7/drivers/mtd/Kconfig @@ -49,6 +49,16 @@ config MTD_PARTITIONS devices. Partitioning on NFTL 'devices' is a different - that's the 'normal' form of partitioning used on a block device. @@ -19,10 +19,10 @@ Index: linux/drivers/mtd/Kconfig config MTD_REDBOOT_PARTS tristate "RedBoot partition table parsing" depends on MTD_PARTITIONS -Index: linux/drivers/mtd/mtdpart.c +Index: linux-2.6.21.7/drivers/mtd/mtdpart.c =================================================================== ---- linux.orig/drivers/mtd/mtdpart.c -+++ linux/drivers/mtd/mtdpart.c +--- linux-2.6.21.7.orig/drivers/mtd/mtdpart.c ++++ linux-2.6.21.7/drivers/mtd/mtdpart.c @@ -20,6 +20,8 @@ #include #include diff --git a/target/linux/generic-2.6/patches/065-block2mtd_init.patch b/target/linux/generic-2.6/patches/065-block2mtd_init.patch index bdb19eeccb..0e36f9ad06 100644 --- a/target/linux/generic-2.6/patches/065-block2mtd_init.patch +++ b/target/linux/generic-2.6/patches/065-block2mtd_init.patch @@ -1,6 +1,7 @@ -diff -urN linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c linux-2.6.21.1.dev/drivers/mtd/devices/block2mtd.c ---- linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/drivers/mtd/devices/block2mtd.c 2007-05-26 20:06:13.547923960 +0200 +Index: linux-2.6.21.7/drivers/mtd/devices/block2mtd.c +=================================================================== +--- linux-2.6.21.7.orig/drivers/mtd/devices/block2mtd.c ++++ linux-2.6.21.7/drivers/mtd/devices/block2mtd.c @@ -16,6 +16,7 @@ #include #include @@ -9,7 +10,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c linux-2.6.21.1.dev/ #include #include #include -@@ -288,10 +289,11 @@ +@@ -288,10 +289,11 @@ static void block2mtd_free_device(struct /* FIXME: ensure that mtd->size % erase_size == 0 */ @@ -22,7 +23,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c linux-2.6.21.1.dev/ if (!devname) return NULL; -@@ -330,14 +332,18 @@ +@@ -330,14 +332,18 @@ static struct block2mtd_dev *add_device( /* Setup the MTD structure */ /* make the name contain the block device in */ @@ -46,7 +47,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c linux-2.6.21.1.dev/ dev->mtd.erasesize = erase_size; dev->mtd.writesize = 1; dev->mtd.type = MTD_RAM; -@@ -349,15 +355,18 @@ +@@ -349,15 +355,18 @@ static struct block2mtd_dev *add_device( dev->mtd.read = block2mtd_read; dev->mtd.priv = dev; dev->mtd.owner = THIS_MODULE; @@ -69,7 +70,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c linux-2.6.21.1.dev/ return dev; devinit_err: -@@ -430,9 +439,9 @@ +@@ -430,9 +439,9 @@ static __initdata char block2mtd_paramli static int block2mtd_setup2(const char *val) { @@ -81,7 +82,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c linux-2.6.21.1.dev/ char *name; size_t erase_size = PAGE_SIZE; int i, ret; -@@ -443,7 +452,7 @@ +@@ -443,7 +452,7 @@ static int block2mtd_setup2(const char * strcpy(str, val); kill_final_newline(str); @@ -90,7 +91,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c linux-2.6.21.1.dev/ token[i] = strsep(&str, ","); if (str) -@@ -463,8 +472,10 @@ +@@ -463,8 +472,10 @@ static int block2mtd_setup2(const char * parse_err("illegal erase size"); } } @@ -102,7 +103,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c linux-2.6.21.1.dev/ return 0; } -@@ -498,7 +509,7 @@ +@@ -498,7 +509,7 @@ static int block2mtd_setup(const char *v module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200); diff --git a/target/linux/generic-2.6/patches/120-openswan-2.4.0.kernel-2.6-natt.patch b/target/linux/generic-2.6/patches/120-openswan-2.4.0.kernel-2.6-natt.patch index e6d7b4e5ed..6df04a5a41 100644 --- a/target/linux/generic-2.6/patches/120-openswan-2.4.0.kernel-2.6-natt.patch +++ b/target/linux/generic-2.6/patches/120-openswan-2.4.0.kernel-2.6-natt.patch @@ -1,6 +1,7 @@ -diff -urN linux-2.6.21.1.old/include/net/xfrmudp.h linux-2.6.21.1.dev/include/net/xfrmudp.h ---- linux-2.6.21.1.old/include/net/xfrmudp.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/include/net/xfrmudp.h 2007-05-26 20:24:53.933599448 +0200 +Index: linux-2.6.21.7/include/net/xfrmudp.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/include/net/xfrmudp.h @@ -0,0 +1,10 @@ +/* + * pointer to function for type that xfrm4_input wants, to permit @@ -12,10 +13,11 @@ diff -urN linux-2.6.21.1.old/include/net/xfrmudp.h linux-2.6.21.1.dev/include/ne +extern int udp4_register_esp_rcvencap(xfrm4_rcv_encap_t func + , xfrm4_rcv_encap_t *oldfunc); +extern int udp4_unregister_esp_rcvencap(xfrm4_rcv_encap_t func); -diff -urN linux-2.6.21.1.old/net/ipv4/Kconfig linux-2.6.21.1.dev/net/ipv4/Kconfig ---- linux-2.6.21.1.old/net/ipv4/Kconfig 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/net/ipv4/Kconfig 2007-05-26 20:24:53.965594584 +0200 -@@ -266,6 +266,12 @@ +Index: linux-2.6.21.7/net/ipv4/Kconfig +=================================================================== +--- linux-2.6.21.7.orig/net/ipv4/Kconfig ++++ linux-2.6.21.7/net/ipv4/Kconfig +@@ -266,6 +266,12 @@ config NET_IPGRE_BROADCAST Network), but can be distributed all over the Internet. If you want to do that, say Y here and to "IP multicast routing" below. @@ -28,9 +30,10 @@ diff -urN linux-2.6.21.1.old/net/ipv4/Kconfig linux-2.6.21.1.dev/net/ipv4/Kconfi config IP_MROUTE bool "IP: multicast routing" depends on IP_MULTICAST -diff -urN linux-2.6.21.1.old/net/ipv4/udp.c linux-2.6.21.1.dev/net/ipv4/udp.c ---- linux-2.6.21.1.old/net/ipv4/udp.c 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/net/ipv4/udp.c 2007-05-26 20:24:53.966594432 +0200 +Index: linux-2.6.21.7/net/ipv4/udp.c +=================================================================== +--- linux-2.6.21.7.orig/net/ipv4/udp.c ++++ linux-2.6.21.7/net/ipv4/udp.c @@ -101,12 +101,15 @@ #include #include @@ -47,7 +50,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/udp.c linux-2.6.21.1.dev/net/ipv4/udp.c DEFINE_SNMP_STAT(struct udp_mib, udp_statistics) __read_mostly; struct hlist_head udp_hash[UDP_HTABLE_SIZE]; -@@ -915,6 +918,42 @@ +@@ -915,6 +918,42 @@ int udp_disconnect(struct sock *sk, int return 0; } @@ -90,7 +93,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/udp.c linux-2.6.21.1.dev/net/ipv4/udp.c /* return: * 1 if the the UDP system should process it * 0 if we should drop this packet -@@ -922,7 +961,7 @@ +@@ -922,7 +961,7 @@ int udp_disconnect(struct sock *sk, int */ static int udp_encap_rcv(struct sock * sk, struct sk_buff *skb) { @@ -99,7 +102,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/udp.c linux-2.6.21.1.dev/net/ipv4/udp.c return 1; #else struct udp_sock *up = udp_sk(sk); -@@ -937,11 +976,11 @@ +@@ -937,11 +976,11 @@ static int udp_encap_rcv(struct sock * s /* if we're overly short, let UDP handle it */ len = skb->len - sizeof(struct udphdr); if (len <= 0) @@ -113,7 +116,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/udp.c linux-2.6.21.1.dev/net/ipv4/udp.c /* If this is a paged skb, make sure we pull up * whatever data we need to look at. */ -@@ -964,7 +1003,7 @@ +@@ -964,7 +1003,7 @@ static int udp_encap_rcv(struct sock * s len = sizeof(struct udphdr); } else /* Must be an IKE packet.. pass it through */ @@ -122,7 +125,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/udp.c linux-2.6.21.1.dev/net/ipv4/udp.c break; case UDP_ENCAP_ESPINUDP_NON_IKE: /* Check if this is a keepalive packet. If so, eat it. */ -@@ -977,7 +1016,7 @@ +@@ -977,7 +1016,7 @@ static int udp_encap_rcv(struct sock * s len = sizeof(struct udphdr) + 2 * sizeof(u32); } else /* Must be an IKE packet.. pass it through */ @@ -131,7 +134,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/udp.c linux-2.6.21.1.dev/net/ipv4/udp.c break; } -@@ -988,6 +1027,8 @@ +@@ -988,6 +1027,8 @@ static int udp_encap_rcv(struct sock * s */ if (skb_cloned(skb) && pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) return 0; @@ -140,7 +143,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/udp.c linux-2.6.21.1.dev/net/ipv4/udp.c /* Now we can update and verify the packet length... */ iph = skb->nh.iph; -@@ -1051,9 +1092,13 @@ +@@ -1051,9 +1092,13 @@ int udp_queue_rcv_skb(struct sock * sk, return 0; } if (ret < 0) { @@ -157,7 +160,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/udp.c linux-2.6.21.1.dev/net/ipv4/udp.c return -ret; } /* FALLTHROUGH -- it's a UDP Packet */ -@@ -1733,3 +1778,9 @@ +@@ -1733,3 +1778,9 @@ EXPORT_SYMBOL(udp_poll); EXPORT_SYMBOL(udp_proc_register); EXPORT_SYMBOL(udp_proc_unregister); #endif diff --git a/target/linux/generic-2.6/patches/130-netfilter_ipset.patch b/target/linux/generic-2.6/patches/130-netfilter_ipset.patch index 0a63aa8b70..b59c158652 100644 --- a/target/linux/generic-2.6/patches/130-netfilter_ipset.patch +++ b/target/linux/generic-2.6/patches/130-netfilter_ipset.patch @@ -1,6 +1,7 @@ -diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set.h linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ip_set.h ---- ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ip_set.h 2007-10-12 14:28:29.000000000 +0200 +Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set.h @@ -0,0 +1,498 @@ +#ifndef _IP_SET_H +#define _IP_SET_H @@ -500,9 +501,10 @@ diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set.h linux-2.6.21.5. +#endif /* __KERNEL__ */ + +#endif /*_IP_SET_H*/ -diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_iphash.h linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iphash.h ---- ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_iphash.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iphash.h 2007-10-12 14:28:29.000000000 +0200 +Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_iphash.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_iphash.h @@ -0,0 +1,30 @@ +#ifndef __IP_SET_IPHASH_H +#define __IP_SET_IPHASH_H @@ -534,9 +536,10 @@ diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_iphash.h linux-2. +}; + +#endif /* __IP_SET_IPHASH_H */ -diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_ipmap.h linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ip_set_ipmap.h ---- ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_ipmap.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ip_set_ipmap.h 2007-10-12 14:28:29.000000000 +0200 +Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_ipmap.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_ipmap.h @@ -0,0 +1,56 @@ +#ifndef __IP_SET_IPMAP_H +#define __IP_SET_IPMAP_H @@ -594,9 +597,10 @@ diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_ipmap.h linux-2.6 +} + +#endif /* __IP_SET_IPMAP_H */ -diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_ipporthash.h linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ip_set_ipporthash.h ---- ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_ipporthash.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ip_set_ipporthash.h 2007-10-12 14:28:29.000000000 +0200 +Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_ipporthash.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_ipporthash.h @@ -0,0 +1,34 @@ +#ifndef __IP_SET_IPPORTHASH_H +#define __IP_SET_IPPORTHASH_H @@ -632,9 +636,10 @@ diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_ipporthash.h linu +}; + +#endif /* __IP_SET_IPPORTHASH_H */ -diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_iptree.h linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iptree.h ---- ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_iptree.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iptree.h 2007-10-12 14:28:29.000000000 +0200 +Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_iptree.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_iptree.h @@ -0,0 +1,40 @@ +#ifndef __IP_SET_IPTREE_H +#define __IP_SET_IPTREE_H @@ -676,9 +681,10 @@ diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_iptree.h linux-2. +}; + +#endif /* __IP_SET_IPTREE_H */ -diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_iptreemap.h linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iptreemap.h ---- ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_iptreemap.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iptreemap.h 2007-10-12 14:28:29.000000000 +0200 +Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_iptreemap.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_iptreemap.h @@ -0,0 +1,40 @@ +#ifndef __IP_SET_IPTREEMAP_H +#define __IP_SET_IPTREEMAP_H @@ -720,9 +726,10 @@ diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_iptreemap.h linux +}; + +#endif /* __IP_SET_IPTREEMAP_H */ -diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_jhash.h linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ip_set_jhash.h ---- ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_jhash.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ip_set_jhash.h 2007-10-12 14:28:29.000000000 +0200 +Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_jhash.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_jhash.h @@ -0,0 +1,148 @@ +#ifndef _LINUX_IPSET_JHASH_H +#define _LINUX_IPSET_JHASH_H @@ -872,9 +879,10 @@ diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_jhash.h linux-2.6 +} + +#endif /* _LINUX_IPSET_JHASH_H */ -diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_macipmap.h linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ip_set_macipmap.h ---- ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_macipmap.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ip_set_macipmap.h 2007-10-12 14:28:29.000000000 +0200 +Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_macipmap.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_macipmap.h @@ -0,0 +1,38 @@ +#ifndef __IP_SET_MACIPMAP_H +#define __IP_SET_MACIPMAP_H @@ -914,9 +922,10 @@ diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_macipmap.h linux- +}; + +#endif /* __IP_SET_MACIPMAP_H */ -diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_malloc.h linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ip_set_malloc.h ---- ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_malloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ip_set_malloc.h 2007-10-12 14:28:29.000000000 +0200 +Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_malloc.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_malloc.h @@ -0,0 +1,116 @@ +#ifndef _IP_SET_MALLOC_H +#define _IP_SET_MALLOC_H @@ -1034,9 +1043,10 @@ diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_malloc.h linux-2. +#endif /* __KERNEL__ */ + +#endif /*_IP_SET_MALLOC_H*/ -diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_nethash.h linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ip_set_nethash.h ---- ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_nethash.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ip_set_nethash.h 2007-10-12 14:28:29.000000000 +0200 +Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_nethash.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_nethash.h @@ -0,0 +1,55 @@ +#ifndef __IP_SET_NETHASH_H +#define __IP_SET_NETHASH_H @@ -1093,9 +1103,10 @@ diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_nethash.h linux-2 +} + +#endif /* __IP_SET_NETHASH_H */ -diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_portmap.h linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ip_set_portmap.h ---- ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_portmap.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ip_set_portmap.h 2007-10-12 14:28:29.000000000 +0200 +Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_portmap.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_portmap.h @@ -0,0 +1,25 @@ +#ifndef __IP_SET_PORTMAP_H +#define __IP_SET_PORTMAP_H @@ -1122,9 +1133,10 @@ diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ip_set_portmap.h linux-2 +}; + +#endif /* __IP_SET_PORTMAP_H */ -diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ipt_set.h linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ipt_set.h ---- ./linux-2.6.21.5/include/linux/netfilter_ipv4/ipt_set.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.5.pom2patch.set/include/linux/netfilter_ipv4/ipt_set.h 2007-10-12 14:28:29.000000000 +0200 +Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ipt_set.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/include/linux/netfilter_ipv4/ipt_set.h @@ -0,0 +1,21 @@ +#ifndef _IPT_SET_H +#define _IPT_SET_H @@ -1147,9 +1159,10 @@ diff -Nru ./linux-2.6.21.5/include/linux/netfilter_ipv4/ipt_set.h linux-2.6.21.5 +}; + +#endif /*_IPT_SET_H*/ -diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/ip_set.c linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/ip_set.c ---- ./linux-2.6.21.5/net/ipv4/netfilter/ip_set.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/ip_set.c 2007-10-12 14:28:29.000000000 +0200 +Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/net/ipv4/netfilter/ip_set.c @@ -0,0 +1,2003 @@ +/* Copyright (C) 2000-2002 Joakim Axelsson + * Patrick Schaaf @@ -3154,9 +3167,10 @@ diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/ip_set.c linux-2.6.21.5.pom2patch. + +module_init(ip_set_init); +module_exit(ip_set_fini); -diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_iphash.c linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/ip_set_iphash.c ---- ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_iphash.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/ip_set_iphash.c 2007-10-12 14:28:29.000000000 +0200 +Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_iphash.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/net/ipv4/netfilter/ip_set_iphash.c @@ -0,0 +1,429 @@ +/* Copyright (C) 2003-2004 Jozsef Kadlecsik + * @@ -3587,9 +3601,10 @@ diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_iphash.c linux-2.6.21.5.pom + +module_init(ip_set_iphash_init); +module_exit(ip_set_iphash_fini); -diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_ipmap.c linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/ip_set_ipmap.c ---- ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_ipmap.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/ip_set_ipmap.c 2007-10-12 14:28:29.000000000 +0200 +Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_ipmap.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/net/ipv4/netfilter/ip_set_ipmap.c @@ -0,0 +1,336 @@ +/* Copyright (C) 2000-2002 Joakim Axelsson + * Patrick Schaaf @@ -3927,9 +3942,10 @@ diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_ipmap.c linux-2.6.21.5.pom2 + +module_init(ip_set_ipmap_init); +module_exit(ip_set_ipmap_fini); -diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_ipporthash.c linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/ip_set_ipporthash.c ---- ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_ipporthash.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/ip_set_ipporthash.c 2007-10-12 14:28:29.000000000 +0200 +Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_ipporthash.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/net/ipv4/netfilter/ip_set_ipporthash.c @@ -0,0 +1,581 @@ +/* Copyright (C) 2003-2004 Jozsef Kadlecsik + * @@ -4512,9 +4528,10 @@ diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_ipporthash.c linux-2.6.21.5 + +module_init(ip_set_ipporthash_init); +module_exit(ip_set_ipporthash_fini); -diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_iptree.c linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/ip_set_iptree.c ---- ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_iptree.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/ip_set_iptree.c 2007-10-12 14:28:29.000000000 +0200 +Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_iptree.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/net/ipv4/netfilter/ip_set_iptree.c @@ -0,0 +1,612 @@ +/* Copyright (C) 2005 Jozsef Kadlecsik + * @@ -5128,9 +5145,10 @@ diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_iptree.c linux-2.6.21.5.pom + +module_init(ip_set_iptree_init); +module_exit(ip_set_iptree_fini); -diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_iptreemap.c linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/ip_set_iptreemap.c ---- ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_iptreemap.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/ip_set_iptreemap.c 2007-10-12 14:28:29.000000000 +0200 +Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_iptreemap.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/net/ipv4/netfilter/ip_set_iptreemap.c @@ -0,0 +1,829 @@ +/* Copyright (C) 2007 Sven Wegener + * @@ -5961,9 +5979,10 @@ diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_iptreemap.c linux-2.6.21.5. + +module_init(ip_set_iptreemap_init); +module_exit(ip_set_iptreemap_fini); -diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_macipmap.c linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/ip_set_macipmap.c ---- ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_macipmap.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/ip_set_macipmap.c 2007-10-12 14:28:29.000000000 +0200 +Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_macipmap.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/net/ipv4/netfilter/ip_set_macipmap.c @@ -0,0 +1,375 @@ +/* Copyright (C) 2000-2002 Joakim Axelsson + * Patrick Schaaf @@ -6340,9 +6359,10 @@ diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_macipmap.c linux-2.6.21.5.p + +module_init(ip_set_macipmap_init); +module_exit(ip_set_macipmap_fini); -diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_nethash.c linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/ip_set_nethash.c ---- ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_nethash.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/ip_set_nethash.c 2007-10-12 14:28:29.000000000 +0200 +Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_nethash.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/net/ipv4/netfilter/ip_set_nethash.c @@ -0,0 +1,497 @@ +/* Copyright (C) 2003-2004 Jozsef Kadlecsik + * @@ -6841,9 +6861,10 @@ diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_nethash.c linux-2.6.21.5.po + +module_init(ip_set_nethash_init); +module_exit(ip_set_nethash_fini); -diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_portmap.c linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/ip_set_portmap.c ---- ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_portmap.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/ip_set_portmap.c 2007-10-12 14:28:29.000000000 +0200 +Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_portmap.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/net/ipv4/netfilter/ip_set_portmap.c @@ -0,0 +1,346 @@ +/* Copyright (C) 2003-2004 Jozsef Kadlecsik + * @@ -7191,9 +7212,10 @@ diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/ip_set_portmap.c linux-2.6.21.5.po + +module_init(ip_set_portmap_init); +module_exit(ip_set_portmap_fini); -diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/ipt_set.c linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/ipt_set.c ---- ./linux-2.6.21.5/net/ipv4/netfilter/ipt_set.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/ipt_set.c 2007-10-12 14:28:29.000000000 +0200 +Index: linux-2.6.21.7/net/ipv4/netfilter/ipt_set.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/net/ipv4/netfilter/ipt_set.c @@ -0,0 +1,160 @@ +/* Copyright (C) 2000-2002 Joakim Axelsson + * Patrick Schaaf @@ -7355,9 +7377,10 @@ diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/ipt_set.c linux-2.6.21.5.pom2patch + +module_init(ipt_ipset_init); +module_exit(ipt_ipset_fini); -diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/ipt_SET.c linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/ipt_SET.c ---- ./linux-2.6.21.5/net/ipv4/netfilter/ipt_SET.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/ipt_SET.c 2007-10-12 14:28:29.000000000 +0200 +Index: linux-2.6.21.7/net/ipv4/netfilter/ipt_SET.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/net/ipv4/netfilter/ipt_SET.c @@ -0,0 +1,172 @@ +/* Copyright (C) 2000-2002 Joakim Axelsson + * Patrick Schaaf @@ -7531,10 +7554,11 @@ diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/ipt_SET.c linux-2.6.21.5.pom2patch + +module_init(ipt_SET_init); +module_exit(ipt_SET_fini); -diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/Kconfig linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/Kconfig ---- ./linux-2.6.21.5/net/ipv4/netfilter/Kconfig 2007-06-11 20:37:06.000000000 +0200 -+++ linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/Kconfig 2007-10-12 14:28:29.000000000 +0200 -@@ -657,5 +657,122 @@ +Index: linux-2.6.21.7/net/ipv4/netfilter/Kconfig +=================================================================== +--- linux-2.6.21.7.orig/net/ipv4/netfilter/Kconfig ++++ linux-2.6.21.7/net/ipv4/netfilter/Kconfig +@@ -663,5 +663,122 @@ config IP_NF_ARP_MANGLE Allows altering the ARP packet payload: source and destination hardware and network addresses. @@ -7657,18 +7681,19 @@ diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/Kconfig linux-2.6.21.5.pom2patch.s + endmenu -diff -Nru ./linux-2.6.21.5/net/ipv4/netfilter/Makefile linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/Makefile ---- ./linux-2.6.21.5/net/ipv4/netfilter/Makefile 2007-06-11 20:37:06.000000000 +0200 -+++ linux-2.6.21.5.pom2patch.set/net/ipv4/netfilter/Makefile 2007-10-12 14:28:29.000000000 +0200 -@@ -90,6 +90,7 @@ +Index: linux-2.6.21.7/net/ipv4/netfilter/Makefile +=================================================================== +--- linux-2.6.21.7.orig/net/ipv4/netfilter/Makefile ++++ linux-2.6.21.7/net/ipv4/netfilter/Makefile +@@ -90,6 +90,7 @@ obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o +obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o obj-$(CONFIG_IP_NF_MATCH_ADDRTYPE) += ipt_addrtype.o + obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o - # targets -@@ -105,6 +106,18 @@ +@@ -106,6 +107,18 @@ obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LO obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o diff --git a/target/linux/generic-2.6/patches/140-netfilter_time.patch b/target/linux/generic-2.6/patches/140-netfilter_time.patch index 01dfb1e924..f1feaf6c0d 100644 --- a/target/linux/generic-2.6/patches/140-netfilter_time.patch +++ b/target/linux/generic-2.6/patches/140-netfilter_time.patch @@ -1,6 +1,7 @@ -diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_time.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_time.h ---- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_time.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_time.h 2007-05-26 20:31:03.596402160 +0200 +Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ipt_time.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/include/linux/netfilter_ipv4/ipt_time.h @@ -0,0 +1,18 @@ +#ifndef __ipt_time_h_included__ +#define __ipt_time_h_included__ @@ -20,9 +21,10 @@ diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_time.h linux-2.6.2 + + +#endif /* __ipt_time_h_included__ */ -diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ipt_time.c linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_time.c ---- linux-2.6.21.1.old/net/ipv4/netfilter/ipt_time.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_time.c 2007-05-26 20:31:03.596402160 +0200 +Index: linux-2.6.21.7/net/ipv4/netfilter/ipt_time.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/net/ipv4/netfilter/ipt_time.c @@ -0,0 +1,178 @@ +/* + This is a module which is used for time matching @@ -202,10 +204,11 @@ diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ipt_time.c linux-2.6.21.1.dev/ne + r->tm_mon=i; + r->tm_mday=work-__spm[i]+1; +} -diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig ---- linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig 2007-05-26 20:31:03.452424048 +0200 -+++ linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig 2007-05-26 20:31:03.597402008 +0200 -@@ -278,6 +278,22 @@ +Index: linux-2.6.21.7/net/ipv4/netfilter/Kconfig +=================================================================== +--- linux-2.6.21.7.orig/net/ipv4/netfilter/Kconfig ++++ linux-2.6.21.7/net/ipv4/netfilter/Kconfig +@@ -260,6 +260,22 @@ config IP_NF_MATCH_TOS To compile it as a module, choose M here. If unsure, say N. @@ -228,10 +231,11 @@ diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig linux-2.6.21.1.dev/net/i config IP_NF_MATCH_RECENT tristate "recent match support" depends on IP_NF_IPTABLES -diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Makefile linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile ---- linux-2.6.21.1.old/net/ipv4/netfilter/Makefile 2007-05-26 20:31:03.452424048 +0200 -+++ linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile 2007-05-26 20:31:03.597402008 +0200 -@@ -86,6 +86,7 @@ +Index: linux-2.6.21.7/net/ipv4/netfilter/Makefile +=================================================================== +--- linux-2.6.21.7.orig/net/ipv4/netfilter/Makefile ++++ linux-2.6.21.7/net/ipv4/netfilter/Makefile +@@ -86,6 +86,7 @@ obj-$(CONFIG_IP_NF_RAW) += iptable_raw.o obj-$(CONFIG_IP_NF_MATCH_IPRANGE) += ipt_iprange.o obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_owner.o obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o diff --git a/target/linux/generic-2.6/patches/150-netfilter_imq.patch b/target/linux/generic-2.6/patches/150-netfilter_imq.patch index 3bab0131e7..66fb99bfb1 100644 --- a/target/linux/generic-2.6/patches/150-netfilter_imq.patch +++ b/target/linux/generic-2.6/patches/150-netfilter_imq.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.21.5/drivers/net/imq.c +Index: linux-2.6.21.7/drivers/net/imq.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21.5/drivers/net/imq.c 2007-07-02 08:26:03.223788000 +0200 +--- /dev/null ++++ linux-2.6.21.7/drivers/net/imq.c @@ -0,0 +1,402 @@ +/* + * Pseudo-driver for the intermediate queue device. @@ -405,11 +405,11 @@ Index: linux-2.6.21.5/drivers/net/imq.c +MODULE_AUTHOR("http://www.linuximq.net"); +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information."); +MODULE_LICENSE("GPL"); -Index: linux-2.6.21.5/drivers/net/Kconfig +Index: linux-2.6.21.7/drivers/net/Kconfig =================================================================== ---- linux-2.6.21.5.orig/drivers/net/Kconfig 2007-07-02 08:25:36.554121250 +0200 -+++ linux-2.6.21.5/drivers/net/Kconfig 2007-07-02 08:26:03.719819000 +0200 -@@ -96,6 +96,129 @@ +--- linux-2.6.21.7.orig/drivers/net/Kconfig ++++ linux-2.6.21.7/drivers/net/Kconfig +@@ -96,6 +96,129 @@ config EQUALIZER To compile this driver as a module, choose M here: the module will be called eql. If unsure, say N. @@ -539,11 +539,11 @@ Index: linux-2.6.21.5/drivers/net/Kconfig config TUN tristate "Universal TUN/TAP device driver support" select CRC32 -Index: linux-2.6.21.5/drivers/net/Makefile +Index: linux-2.6.21.7/drivers/net/Makefile =================================================================== ---- linux-2.6.21.5.orig/drivers/net/Makefile 2007-07-02 08:25:36.566122000 +0200 -+++ linux-2.6.21.5/drivers/net/Makefile 2007-07-02 08:26:03.859827750 +0200 -@@ -124,6 +124,7 @@ +--- linux-2.6.21.7.orig/drivers/net/Makefile ++++ linux-2.6.21.7/drivers/net/Makefile +@@ -124,6 +124,7 @@ obj-$(CONFIG_SLIP) += slip.o obj-$(CONFIG_SLHC) += slhc.o obj-$(CONFIG_DUMMY) += dummy.o @@ -551,10 +551,10 @@ Index: linux-2.6.21.5/drivers/net/Makefile obj-$(CONFIG_IFB) += ifb.o obj-$(CONFIG_DE600) += de600.o obj-$(CONFIG_DE620) += de620.o -Index: linux-2.6.21.5/include/linux/imq.h +Index: linux-2.6.21.7/include/linux/imq.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21.5/include/linux/imq.h 2007-07-02 08:26:04.311856000 +0200 +--- /dev/null ++++ linux-2.6.21.7/include/linux/imq.h @@ -0,0 +1,9 @@ +#ifndef _IMQ_H +#define _IMQ_H @@ -565,10 +565,10 @@ Index: linux-2.6.21.5/include/linux/imq.h +#define IMQ_F_ENQUEUE 0x80 + +#endif /* _IMQ_H */ -Index: linux-2.6.21.5/include/linux/netfilter_ipv4/ipt_IMQ.h +Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ipt_IMQ.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21.5/include/linux/netfilter_ipv4/ipt_IMQ.h 2007-07-02 08:26:04.607874500 +0200 +--- /dev/null ++++ linux-2.6.21.7/include/linux/netfilter_ipv4/ipt_IMQ.h @@ -0,0 +1,8 @@ +#ifndef _IPT_IMQ_H +#define _IPT_IMQ_H @@ -578,10 +578,10 @@ Index: linux-2.6.21.5/include/linux/netfilter_ipv4/ipt_IMQ.h +}; + +#endif /* _IPT_IMQ_H */ -Index: linux-2.6.21.5/include/linux/netfilter_ipv6/ip6t_IMQ.h +Index: linux-2.6.21.7/include/linux/netfilter_ipv6/ip6t_IMQ.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21.5/include/linux/netfilter_ipv6/ip6t_IMQ.h 2007-07-02 08:26:04.927894500 +0200 +--- /dev/null ++++ linux-2.6.21.7/include/linux/netfilter_ipv6/ip6t_IMQ.h @@ -0,0 +1,8 @@ +#ifndef _IP6T_IMQ_H +#define _IP6T_IMQ_H @@ -591,11 +591,11 @@ Index: linux-2.6.21.5/include/linux/netfilter_ipv6/ip6t_IMQ.h +}; + +#endif /* _IP6T_IMQ_H */ -Index: linux-2.6.21.5/include/linux/skbuff.h +Index: linux-2.6.21.7/include/linux/skbuff.h =================================================================== ---- linux-2.6.21.5.orig/include/linux/skbuff.h 2007-07-02 08:25:36.598124000 +0200 -+++ linux-2.6.21.5/include/linux/skbuff.h 2007-07-02 08:26:04.983898000 +0200 -@@ -294,6 +294,10 @@ +--- linux-2.6.21.7.orig/include/linux/skbuff.h ++++ linux-2.6.21.7/include/linux/skbuff.h +@@ -294,6 +294,10 @@ struct sk_buff { #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) struct sk_buff *nfct_reasm; #endif @@ -606,10 +606,10 @@ Index: linux-2.6.21.5/include/linux/skbuff.h #ifdef CONFIG_BRIDGE_NETFILTER struct nf_bridge_info *nf_bridge; #endif -Index: linux-2.6.21.5/net/core/dev.c +Index: linux-2.6.21.7/net/core/dev.c =================================================================== ---- linux-2.6.21.5.orig/net/core/dev.c 2007-07-02 08:25:36.606124500 +0200 -+++ linux-2.6.21.5/net/core/dev.c 2007-07-02 08:26:04.983898000 +0200 +--- linux-2.6.21.7.orig/net/core/dev.c ++++ linux-2.6.21.7/net/core/dev.c @@ -94,6 +94,9 @@ #include #include @@ -620,7 +620,7 @@ Index: linux-2.6.21.5/net/core/dev.c #include #include #include -@@ -1340,7 +1343,11 @@ +@@ -1340,7 +1343,11 @@ static int dev_gso_segment(struct sk_buf int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) { if (likely(!skb->next)) { @@ -633,11 +633,11 @@ Index: linux-2.6.21.5/net/core/dev.c dev_queue_xmit_nit(skb, dev); if (netif_needs_gso(dev, skb)) { -Index: linux-2.6.21.5/net/core/skbuff.c +Index: linux-2.6.21.7/net/core/skbuff.c =================================================================== ---- linux-2.6.21.5.orig/net/core/skbuff.c 2007-07-02 08:25:36.618125250 +0200 -+++ linux-2.6.21.5/net/core/skbuff.c 2007-07-02 08:26:05.007899500 +0200 -@@ -430,6 +430,10 @@ +--- linux-2.6.21.7.orig/net/core/skbuff.c ++++ linux-2.6.21.7/net/core/skbuff.c +@@ -430,6 +430,10 @@ struct sk_buff *skb_clone(struct sk_buff C(nfct_reasm); nf_conntrack_get_reasm(skb->nfct_reasm); #endif @@ -648,7 +648,7 @@ Index: linux-2.6.21.5/net/core/skbuff.c #ifdef CONFIG_BRIDGE_NETFILTER C(nf_bridge); nf_bridge_get(skb->nf_bridge); -@@ -494,6 +498,10 @@ +@@ -494,6 +498,10 @@ static void copy_skb_header(struct sk_bu #if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE) new->ipvs_property = old->ipvs_property; #endif @@ -659,10 +659,10 @@ Index: linux-2.6.21.5/net/core/skbuff.c #ifdef CONFIG_BRIDGE_NETFILTER new->nf_bridge = old->nf_bridge; nf_bridge_get(old->nf_bridge); -Index: linux-2.6.21.5/net/ipv4/netfilter/ipt_IMQ.c +Index: linux-2.6.21.7/net/ipv4/netfilter/ipt_IMQ.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21.5/net/ipv4/netfilter/ipt_IMQ.c 2007-07-02 08:26:05.055902500 +0200 +--- /dev/null ++++ linux-2.6.21.7/net/ipv4/netfilter/ipt_IMQ.c @@ -0,0 +1,69 @@ +/* + * This target marks packets to be enqueued to an imq device @@ -733,11 +733,11 @@ Index: linux-2.6.21.5/net/ipv4/netfilter/ipt_IMQ.c +MODULE_AUTHOR("http://www.linuximq.net"); +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information."); +MODULE_LICENSE("GPL"); -Index: linux-2.6.21.5/net/ipv4/netfilter/Kconfig +Index: linux-2.6.21.7/net/ipv4/netfilter/Kconfig =================================================================== ---- linux-2.6.21.5.orig/net/ipv4/netfilter/Kconfig 2007-07-02 08:25:36.630126000 +0200 -+++ linux-2.6.21.5/net/ipv4/netfilter/Kconfig 2007-07-02 08:26:05.115906250 +0200 -@@ -605,6 +605,17 @@ +--- linux-2.6.21.7.orig/net/ipv4/netfilter/Kconfig ++++ linux-2.6.21.7/net/ipv4/netfilter/Kconfig +@@ -587,6 +587,17 @@ config IP_NF_MANGLE To compile it as a module, choose M here. If unsure, say N. @@ -755,11 +755,11 @@ Index: linux-2.6.21.5/net/ipv4/netfilter/Kconfig config IP_NF_TARGET_TOS tristate "TOS target support" depends on IP_NF_MANGLE -Index: linux-2.6.21.5/net/ipv4/netfilter/Makefile +Index: linux-2.6.21.7/net/ipv4/netfilter/Makefile =================================================================== ---- linux-2.6.21.5.orig/net/ipv4/netfilter/Makefile 2007-07-02 08:25:36.714131250 +0200 -+++ linux-2.6.21.5/net/ipv4/netfilter/Makefile 2007-07-02 08:26:05.175910000 +0200 -@@ -100,6 +100,7 @@ +--- linux-2.6.21.7.orig/net/ipv4/netfilter/Makefile ++++ linux-2.6.21.7/net/ipv4/netfilter/Makefile +@@ -99,6 +99,7 @@ obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_i obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o @@ -767,10 +767,10 @@ Index: linux-2.6.21.5/net/ipv4/netfilter/Makefile obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o -Index: linux-2.6.21.5/net/ipv6/netfilter/ip6t_IMQ.c +Index: linux-2.6.21.7/net/ipv6/netfilter/ip6t_IMQ.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21.5/net/ipv6/netfilter/ip6t_IMQ.c 2007-07-02 08:26:05.231913500 +0200 +--- /dev/null ++++ linux-2.6.21.7/net/ipv6/netfilter/ip6t_IMQ.c @@ -0,0 +1,69 @@ +/* + * This target marks packets to be enqueued to an imq device @@ -841,11 +841,11 @@ Index: linux-2.6.21.5/net/ipv6/netfilter/ip6t_IMQ.c +MODULE_AUTHOR("http://www.linuximq.net"); +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information."); +MODULE_LICENSE("GPL"); -Index: linux-2.6.21.5/net/ipv6/netfilter/Kconfig +Index: linux-2.6.21.7/net/ipv6/netfilter/Kconfig =================================================================== ---- linux-2.6.21.5.orig/net/ipv6/netfilter/Kconfig 2007-07-02 08:25:36.726132000 +0200 -+++ linux-2.6.21.5/net/ipv6/netfilter/Kconfig 2007-07-02 08:26:05.267915750 +0200 -@@ -173,6 +173,15 @@ +--- linux-2.6.21.7.orig/net/ipv6/netfilter/Kconfig ++++ linux-2.6.21.7/net/ipv6/netfilter/Kconfig +@@ -173,6 +173,15 @@ config IP6_NF_MANGLE To compile it as a module, choose M here. If unsure, say N. @@ -861,11 +861,11 @@ Index: linux-2.6.21.5/net/ipv6/netfilter/Kconfig config IP6_NF_TARGET_HL tristate 'HL (hoplimit) target support' depends on IP6_NF_MANGLE -Index: linux-2.6.21.5/net/ipv6/netfilter/Makefile +Index: linux-2.6.21.7/net/ipv6/netfilter/Makefile =================================================================== ---- linux-2.6.21.5.orig/net/ipv6/netfilter/Makefile 2007-07-02 08:25:36.738132750 +0200 -+++ linux-2.6.21.5/net/ipv6/netfilter/Makefile 2007-07-02 08:26:05.319919000 +0200 -@@ -13,6 +13,7 @@ +--- linux-2.6.21.7.orig/net/ipv6/netfilter/Makefile ++++ linux-2.6.21.7/net/ipv6/netfilter/Makefile +@@ -13,6 +13,7 @@ obj-$(CONFIG_IP6_NF_MATCH_EUI64) += ip6t obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t_owner.o obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o obj-$(CONFIG_IP6_NF_MANGLE) += ip6table_mangle.o @@ -873,11 +873,11 @@ Index: linux-2.6.21.5/net/ipv6/netfilter/Makefile obj-$(CONFIG_IP6_NF_TARGET_HL) += ip6t_HL.o obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o -Index: linux-2.6.21.5/net/sched/sch_generic.c +Index: linux-2.6.21.7/net/sched/sch_generic.c =================================================================== ---- linux-2.6.21.5.orig/net/sched/sch_generic.c 2007-07-02 08:25:36.750133500 +0200 -+++ linux-2.6.21.5/net/sched/sch_generic.c 2007-07-02 08:26:05.343920500 +0200 -@@ -87,7 +87,6 @@ +--- linux-2.6.21.7.orig/net/sched/sch_generic.c ++++ linux-2.6.21.7/net/sched/sch_generic.c +@@ -87,7 +87,6 @@ void qdisc_unlock_tree(struct net_device NOTE: Called under dev->queue_lock with locally disabled BH. */ @@ -885,7 +885,7 @@ Index: linux-2.6.21.5/net/sched/sch_generic.c static inline int qdisc_restart(struct net_device *dev) { struct Qdisc *q = dev->qdisc; -@@ -181,6 +180,11 @@ +@@ -181,6 +180,11 @@ requeue: return q->q.qlen; } @@ -897,7 +897,7 @@ Index: linux-2.6.21.5/net/sched/sch_generic.c void __qdisc_run(struct net_device *dev) { if (unlikely(dev->qdisc == &noop_qdisc)) -@@ -617,3 +621,4 @@ +@@ -617,3 +621,4 @@ EXPORT_SYMBOL(qdisc_destroy); EXPORT_SYMBOL(qdisc_reset); EXPORT_SYMBOL(qdisc_lock_tree); EXPORT_SYMBOL(qdisc_unlock_tree); diff --git a/target/linux/generic-2.6/patches/160-netfilter_route.patch b/target/linux/generic-2.6/patches/160-netfilter_route.patch index ca342af668..9bd7d2a416 100644 --- a/target/linux/generic-2.6/patches/160-netfilter_route.patch +++ b/target/linux/generic-2.6/patches/160-netfilter_route.patch @@ -1,6 +1,7 @@ -diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_ROUTE.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_ROUTE.h ---- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_ROUTE.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_ROUTE.h 2007-05-26 20:37:08.971856648 +0200 +Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ipt_ROUTE.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/include/linux/netfilter_ipv4/ipt_ROUTE.h @@ -0,0 +1,23 @@ +/* Header file for iptables ipt_ROUTE target + * @@ -25,9 +26,10 @@ diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_ROUTE.h linux-2.6. +#define IPT_ROUTE_TEE 0x02 + +#endif /*_IPT_ROUTE_H_target*/ -diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv6/ip6t_ROUTE.h linux-2.6.21.1.dev/include/linux/netfilter_ipv6/ip6t_ROUTE.h ---- linux-2.6.21.1.old/include/linux/netfilter_ipv6/ip6t_ROUTE.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv6/ip6t_ROUTE.h 2007-05-26 20:37:09.001852088 +0200 +Index: linux-2.6.21.7/include/linux/netfilter_ipv6/ip6t_ROUTE.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/include/linux/netfilter_ipv6/ip6t_ROUTE.h @@ -0,0 +1,23 @@ +/* Header file for iptables ip6t_ROUTE target + * @@ -52,9 +54,10 @@ diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv6/ip6t_ROUTE.h linux-2.6 +#define IP6T_ROUTE_TEE 0x02 + +#endif /*_IP6T_ROUTE_H_target*/ -diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ipt_ROUTE.c linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_ROUTE.c ---- linux-2.6.21.1.old/net/ipv4/netfilter/ipt_ROUTE.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_ROUTE.c 2007-05-26 20:37:09.001852088 +0200 +Index: linux-2.6.21.7/net/ipv4/netfilter/ipt_ROUTE.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/net/ipv4/netfilter/ipt_ROUTE.c @@ -0,0 +1,483 @@ +/* + * This implements the ROUTE target, which enables you to setup unusual @@ -539,10 +542,11 @@ diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ipt_ROUTE.c linux-2.6.21.1.dev/n + +module_init(init); +module_exit(fini); -diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig ---- linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig 2007-05-26 20:37:08.734892672 +0200 -+++ linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig 2007-05-26 20:37:09.002851936 +0200 -@@ -817,5 +817,22 @@ +Index: linux-2.6.21.7/net/ipv4/netfilter/Kconfig +=================================================================== +--- linux-2.6.21.7.orig/net/ipv4/netfilter/Kconfig ++++ linux-2.6.21.7/net/ipv4/netfilter/Kconfig +@@ -807,5 +807,22 @@ config IP_NF_TARGET_SET To compile it as a module, choose M here. If unsure, say N. @@ -565,10 +569,11 @@ diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig linux-2.6.21.1.dev/net/i + endmenu -diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Makefile linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile ---- linux-2.6.21.1.old/net/ipv4/netfilter/Makefile 2007-05-26 20:37:08.735892520 +0200 -+++ linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile 2007-05-26 20:37:09.002851936 +0200 -@@ -103,6 +103,7 @@ +Index: linux-2.6.21.7/net/ipv4/netfilter/Makefile +=================================================================== +--- linux-2.6.21.7.orig/net/ipv4/netfilter/Makefile ++++ linux-2.6.21.7/net/ipv4/netfilter/Makefile +@@ -102,6 +102,7 @@ obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_EC obj-$(CONFIG_IP_NF_TARGET_IMQ) += ipt_IMQ.o obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o @@ -576,10 +581,11 @@ diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Makefile linux-2.6.21.1.dev/net/ obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o obj-$(CONFIG_IP_NF_TARGET_SAME) += ipt_SAME.o obj-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += ip_nat_snmp_basic.o -diff -urN linux-2.6.21.1.old/net/ipv6/ipv6_syms.c linux-2.6.21.1.dev/net/ipv6/ipv6_syms.c ---- linux-2.6.21.1.old/net/ipv6/ipv6_syms.c 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/net/ipv6/ipv6_syms.c 2007-05-26 20:37:09.002851936 +0200 -@@ -10,6 +10,7 @@ +Index: linux-2.6.21.7/net/ipv6/ipv6_syms.c +=================================================================== +--- linux-2.6.21.7.orig/net/ipv6/ipv6_syms.c ++++ linux-2.6.21.7/net/ipv6/ipv6_syms.c +@@ -10,6 +10,7 @@ EXPORT_SYMBOL(icmpv6_send); EXPORT_SYMBOL(icmpv6_statistics); EXPORT_SYMBOL(icmpv6_err_convert); EXPORT_SYMBOL(ndisc_mc_map); @@ -587,9 +593,10 @@ diff -urN linux-2.6.21.1.old/net/ipv6/ipv6_syms.c linux-2.6.21.1.dev/net/ipv6/ip EXPORT_SYMBOL(register_inet6addr_notifier); EXPORT_SYMBOL(unregister_inet6addr_notifier); EXPORT_SYMBOL(ip6_route_output); -diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/ip6t_ROUTE.c linux-2.6.21.1.dev/net/ipv6/netfilter/ip6t_ROUTE.c ---- linux-2.6.21.1.old/net/ipv6/netfilter/ip6t_ROUTE.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/net/ipv6/netfilter/ip6t_ROUTE.c 2007-05-26 20:37:09.003851784 +0200 +Index: linux-2.6.21.7/net/ipv6/netfilter/ip6t_ROUTE.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/net/ipv6/netfilter/ip6t_ROUTE.c @@ -0,0 +1,330 @@ +/* + * This implements the ROUTE v6 target, which enables you to setup unusual @@ -921,10 +928,11 @@ diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/ip6t_ROUTE.c linux-2.6.21.1.dev/ +module_init(init); +module_exit(fini); +MODULE_LICENSE("GPL"); -diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv6/netfilter/Kconfig ---- linux-2.6.21.1.old/net/ipv6/netfilter/Kconfig 2007-05-26 20:37:08.809881272 +0200 -+++ linux-2.6.21.1.dev/net/ipv6/netfilter/Kconfig 2007-05-26 20:37:09.003851784 +0200 -@@ -209,5 +209,18 @@ +Index: linux-2.6.21.7/net/ipv6/netfilter/Kconfig +=================================================================== +--- linux-2.6.21.7.orig/net/ipv6/netfilter/Kconfig ++++ linux-2.6.21.7/net/ipv6/netfilter/Kconfig +@@ -209,5 +209,18 @@ config IP6_NF_RAW If you want to compile it as a module, say M here and read . If unsure, say `N'. @@ -943,10 +951,11 @@ diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/Kconfig linux-2.6.21.1.dev/net/i + endmenu -diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/Makefile linux-2.6.21.1.dev/net/ipv6/netfilter/Makefile ---- linux-2.6.21.1.old/net/ipv6/netfilter/Makefile 2007-05-26 20:37:08.809881272 +0200 -+++ linux-2.6.21.1.dev/net/ipv6/netfilter/Makefile 2007-05-26 20:37:09.003851784 +0200 -@@ -20,6 +20,7 @@ +Index: linux-2.6.21.7/net/ipv6/netfilter/Makefile +=================================================================== +--- linux-2.6.21.7.orig/net/ipv6/netfilter/Makefile ++++ linux-2.6.21.7/net/ipv6/netfilter/Makefile +@@ -20,6 +20,7 @@ obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_ obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o obj-$(CONFIG_IP6_NF_MATCH_HL) += ip6t_hl.o obj-$(CONFIG_IP6_NF_TARGET_REJECT) += ip6t_REJECT.o diff --git a/target/linux/generic-2.6/patches/180-netfilter_depends.patch b/target/linux/generic-2.6/patches/180-netfilter_depends.patch index 1816f0fdb3..e155ecc3c4 100644 --- a/target/linux/generic-2.6/patches/180-netfilter_depends.patch +++ b/target/linux/generic-2.6/patches/180-netfilter_depends.patch @@ -1,6 +1,8 @@ ---- linux.old/net/netfilter/Kconfig 2007-05-26 20:05:39.270134976 +0200 -+++ linux.dev/net/netfilter/Kconfig 2007-05-26 20:12:44.258526920 +0200 -@@ -165,7 +165,7 @@ +Index: linux-2.6.21.7/net/netfilter/Kconfig +=================================================================== +--- linux-2.6.21.7.orig/net/netfilter/Kconfig ++++ linux-2.6.21.7/net/netfilter/Kconfig +@@ -165,7 +165,7 @@ config NF_CONNTRACK_FTP config NF_CONNTRACK_H323 tristate "H.323 protocol support (EXPERIMENTAL)" @@ -9,7 +11,7 @@ help H.323 is a VoIP signalling protocol from ITU-T. As one of the most important VoIP protocols, it is widely used by voice hardware and -@@ -416,7 +416,7 @@ +@@ -433,7 +433,7 @@ config NETFILTER_XT_TARGET_TARPIT config NETFILTER_XT_TARGET_TCPMSS tristate '"TCPMSS" target support' diff --git a/target/linux/generic-2.6/patches/200-sched_esfq.patch b/target/linux/generic-2.6/patches/200-sched_esfq.patch index ee4307474c..38efcea6d5 100644 --- a/target/linux/generic-2.6/patches/200-sched_esfq.patch +++ b/target/linux/generic-2.6/patches/200-sched_esfq.patch @@ -1,7 +1,8 @@ -diff -urN linux-2.6.21.1.old/include/linux/pkt_sched.h linux-2.6.21.1.dev/include/linux/pkt_sched.h ---- linux-2.6.21.1.old/include/linux/pkt_sched.h 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/include/linux/pkt_sched.h 2007-05-26 20:43:12.530587320 +0200 -@@ -146,8 +146,40 @@ +Index: linux-2.6.21.7/include/linux/pkt_sched.h +=================================================================== +--- linux-2.6.21.7.orig/include/linux/pkt_sched.h ++++ linux-2.6.21.7/include/linux/pkt_sched.h +@@ -146,8 +146,40 @@ struct tc_sfq_qopt * * The only reason for this is efficiency, it is possible * to change these parameters in compile time. @@ -42,10 +43,11 @@ diff -urN linux-2.6.21.1.old/include/linux/pkt_sched.h linux-2.6.21.1.dev/includ /* RED section */ enum -diff -urN linux-2.6.21.1.old/net/sched/Kconfig linux-2.6.21.1.dev/net/sched/Kconfig ---- linux-2.6.21.1.old/net/sched/Kconfig 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/net/sched/Kconfig 2007-05-26 20:43:12.572580936 +0200 -@@ -189,6 +189,26 @@ +Index: linux-2.6.21.7/net/sched/Kconfig +=================================================================== +--- linux-2.6.21.7.orig/net/sched/Kconfig ++++ linux-2.6.21.7/net/sched/Kconfig +@@ -189,6 +189,26 @@ config NET_SCH_SFQ To compile this code as a module, choose M here: the module will be called sch_sfq. @@ -72,10 +74,11 @@ diff -urN linux-2.6.21.1.old/net/sched/Kconfig linux-2.6.21.1.dev/net/sched/Kcon config NET_SCH_TEQL tristate "True Link Equalizer (TEQL)" ---help--- -diff -urN linux-2.6.21.1.old/net/sched/Makefile linux-2.6.21.1.dev/net/sched/Makefile ---- linux-2.6.21.1.old/net/sched/Makefile 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/net/sched/Makefile 2007-05-26 20:43:12.577580176 +0200 -@@ -23,6 +23,7 @@ +Index: linux-2.6.21.7/net/sched/Makefile +=================================================================== +--- linux-2.6.21.7.orig/net/sched/Makefile ++++ linux-2.6.21.7/net/sched/Makefile +@@ -23,6 +23,7 @@ obj-$(CONFIG_NET_SCH_GRED) += sch_gred.o obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o obj-$(CONFIG_NET_SCH_DSMARK) += sch_dsmark.o obj-$(CONFIG_NET_SCH_SFQ) += sch_sfq.o @@ -83,9 +86,10 @@ diff -urN linux-2.6.21.1.old/net/sched/Makefile linux-2.6.21.1.dev/net/sched/Mak obj-$(CONFIG_NET_SCH_TBF) += sch_tbf.o obj-$(CONFIG_NET_SCH_TEQL) += sch_teql.o obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o -diff -urN linux-2.6.21.1.old/net/sched/sch_esfq.c linux-2.6.21.1.dev/net/sched/sch_esfq.c ---- linux-2.6.21.1.old/net/sched/sch_esfq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/net/sched/sch_esfq.c 2007-05-26 20:43:12.578580024 +0200 +Index: linux-2.6.21.7/net/sched/sch_esfq.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/net/sched/sch_esfq.c @@ -0,0 +1,704 @@ +/* + * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline. diff --git a/target/linux/generic-2.6/patches/201-multiple_default_gateways.patch b/target/linux/generic-2.6/patches/201-multiple_default_gateways.patch index 00acf2d71b..b0acd9a6fa 100644 --- a/target/linux/generic-2.6/patches/201-multiple_default_gateways.patch +++ b/target/linux/generic-2.6/patches/201-multiple_default_gateways.patch @@ -1,7 +1,8 @@ -diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_nat.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_nat.h ---- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_nat.h 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ip_nat.h 2007-05-26 20:46:11.801334024 +0200 -@@ -64,6 +64,13 @@ +Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_nat.h +=================================================================== +--- linux-2.6.21.7.orig/include/linux/netfilter_ipv4/ip_nat.h ++++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_nat.h +@@ -64,6 +64,13 @@ struct ip_nat_info struct ip_conntrack; @@ -15,10 +16,11 @@ diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ip_nat.h linux-2.6.21. /* Set up the info structure to map into this range. */ extern unsigned int ip_nat_setup_info(struct ip_conntrack *conntrack, const struct ip_nat_range *range, -diff -urN linux-2.6.21.1.old/include/linux/rtnetlink.h linux-2.6.21.1.dev/include/linux/rtnetlink.h ---- linux-2.6.21.1.old/include/linux/rtnetlink.h 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/include/linux/rtnetlink.h 2007-05-26 20:46:11.883321560 +0200 -@@ -293,6 +293,8 @@ +Index: linux-2.6.21.7/include/linux/rtnetlink.h +=================================================================== +--- linux-2.6.21.7.orig/include/linux/rtnetlink.h ++++ linux-2.6.21.7/include/linux/rtnetlink.h +@@ -293,6 +293,8 @@ struct rtnexthop #define RTNH_F_DEAD 1 /* Nexthop is dead (used by multipath) */ #define RTNH_F_PERVASIVE 2 /* Do recursive gateway lookup */ #define RTNH_F_ONLINK 4 /* Gateway is forced on link */ @@ -27,10 +29,11 @@ diff -urN linux-2.6.21.1.old/include/linux/rtnetlink.h linux-2.6.21.1.dev/includ /* Macros to handle hexthops */ -diff -urN linux-2.6.21.1.old/include/net/flow.h linux-2.6.21.1.dev/include/net/flow.h ---- linux-2.6.21.1.old/include/net/flow.h 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/include/net/flow.h 2007-05-26 20:46:11.922315632 +0200 -@@ -19,6 +19,8 @@ +Index: linux-2.6.21.7/include/net/flow.h +=================================================================== +--- linux-2.6.21.7.orig/include/net/flow.h ++++ linux-2.6.21.7/include/net/flow.h +@@ -19,6 +19,8 @@ struct flowi { struct { __be32 daddr; __be32 saddr; @@ -39,7 +42,7 @@ diff -urN linux-2.6.21.1.old/include/net/flow.h linux-2.6.21.1.dev/include/net/f __u8 tos; __u8 scope; } ip4_u; -@@ -43,6 +45,8 @@ +@@ -43,6 +45,8 @@ struct flowi { #define fl6_flowlabel nl_u.ip6_u.flowlabel #define fl4_dst nl_u.ip4_u.daddr #define fl4_src nl_u.ip4_u.saddr @@ -48,10 +51,11 @@ diff -urN linux-2.6.21.1.old/include/net/flow.h linux-2.6.21.1.dev/include/net/f #define fl4_tos nl_u.ip4_u.tos #define fl4_scope nl_u.ip4_u.scope -diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.c ---- linux-2.6.21.1.old/net/ipv4/route.c 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/net/ipv4/route.c 2007-05-26 20:46:11.967308792 +0200 -@@ -1208,6 +1208,7 @@ +Index: linux-2.6.21.7/net/ipv4/route.c +=================================================================== +--- linux-2.6.21.7.orig/net/ipv4/route.c ++++ linux-2.6.21.7/net/ipv4/route.c +@@ -1208,6 +1208,7 @@ void ip_rt_redirect(__be32 old_gw, __be3 /* Gateway is different ... */ rt->rt_gateway = new_gw; @@ -59,7 +63,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. /* Redirect received -> path was valid */ dst_confirm(&rth->u.dst); -@@ -1643,6 +1644,7 @@ +@@ -1643,6 +1644,7 @@ static int ip_route_input_mc(struct sk_b rth->fl.fl4_tos = tos; rth->fl.mark = skb->mark; rth->fl.fl4_src = saddr; @@ -67,7 +71,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. rth->rt_src = saddr; #ifdef CONFIG_NET_CLS_ROUTE rth->u.dst.tclassid = itag; -@@ -1653,6 +1655,7 @@ +@@ -1653,6 +1655,7 @@ static int ip_route_input_mc(struct sk_b dev_hold(rth->u.dst.dev); rth->idev = in_dev_get(rth->u.dst.dev); rth->fl.oif = 0; @@ -75,7 +79,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. rth->rt_gateway = daddr; rth->rt_spec_dst= spec_dst; rth->rt_type = RTN_MULTICAST; -@@ -1716,7 +1719,7 @@ +@@ -1716,7 +1719,7 @@ static void ip_handle_martian_source(str static inline int __mkroute_input(struct sk_buff *skb, struct fib_result* res, struct in_device *in_dev, @@ -84,7 +88,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. struct rtable **result) { -@@ -1751,6 +1754,7 @@ +@@ -1751,6 +1754,7 @@ static inline int __mkroute_input(struct flags |= RTCF_DIRECTSRC; if (out_dev == in_dev && err && !(flags & (RTCF_NAT | RTCF_MASQ)) && @@ -92,7 +96,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. (IN_DEV_SHARED_MEDIA(out_dev) || inet_addr_onlink(out_dev, saddr, FIB_RES_GW(*res)))) flags |= RTCF_DOREDIRECT; -@@ -1788,6 +1792,7 @@ +@@ -1788,6 +1792,7 @@ static inline int __mkroute_input(struct rth->fl.mark = skb->mark; rth->fl.fl4_src = saddr; rth->rt_src = saddr; @@ -100,7 +104,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. rth->rt_gateway = daddr; rth->rt_iif = rth->fl.iif = in_dev->dev->ifindex; -@@ -1795,6 +1800,7 @@ +@@ -1795,6 +1800,7 @@ static inline int __mkroute_input(struct dev_hold(rth->u.dst.dev); rth->idev = in_dev_get(rth->u.dst.dev); rth->fl.oif = 0; @@ -108,7 +112,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. rth->rt_spec_dst= spec_dst; rth->u.dst.input = ip_forward; -@@ -1816,19 +1822,21 @@ +@@ -1816,19 +1822,21 @@ static inline int ip_mkroute_input_def(s struct fib_result* res, const struct flowi *fl, struct in_device *in_dev, @@ -133,7 +137,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. if (err) return err; -@@ -1841,7 +1849,8 @@ +@@ -1841,7 +1849,8 @@ static inline int ip_mkroute_input(struc struct fib_result* res, const struct flowi *fl, struct in_device *in_dev, @@ -143,7 +147,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. { #ifdef CONFIG_IP_ROUTE_MULTIPATH_CACHED struct rtable* rth = NULL, *rtres; -@@ -1857,7 +1866,7 @@ +@@ -1857,7 +1866,7 @@ static inline int ip_mkroute_input(struc /* distinguish between multipath and singlepath */ if (hopcount < 2) return ip_mkroute_input_def(skb, res, fl, in_dev, daddr, @@ -152,7 +156,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. /* add all alternatives to the routing cache */ for (hop = 0; hop < hopcount; hop++) { -@@ -1869,7 +1878,7 @@ +@@ -1869,7 +1878,7 @@ static inline int ip_mkroute_input(struc /* create a routing cache entry */ err = __mkroute_input(skb, res, in_dev, daddr, saddr, tos, @@ -161,7 +165,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. if (err) return err; -@@ -1889,7 +1898,7 @@ +@@ -1889,7 +1898,7 @@ static inline int ip_mkroute_input(struc skb->dst = &rtres->u.dst; return err; #else /* CONFIG_IP_ROUTE_MULTIPATH_CACHED */ @@ -170,7 +174,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. #endif /* CONFIG_IP_ROUTE_MULTIPATH_CACHED */ } -@@ -1905,18 +1914,18 @@ +@@ -1905,18 +1914,18 @@ static inline int ip_mkroute_input(struc */ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr, @@ -192,7 +196,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. unsigned flags = 0; u32 itag = 0; struct rtable * rth; -@@ -1949,6 +1958,12 @@ +@@ -1949,6 +1958,12 @@ static int ip_route_input_slow(struct sk if (BADCLASS(daddr) || ZERONET(daddr) || LOOPBACK(daddr)) goto martian_destination; @@ -205,7 +209,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. /* * Now we are ready to route packet. */ -@@ -1958,6 +1973,10 @@ +@@ -1958,6 +1973,10 @@ static int ip_route_input_slow(struct sk goto no_route; } free_res = 1; @@ -216,7 +220,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. RT_CACHE_STAT_INC(in_slow_tot); -@@ -1982,7 +2001,7 @@ +@@ -1982,7 +2001,7 @@ static int ip_route_input_slow(struct sk if (res.type != RTN_UNICAST) goto martian_destination; @@ -225,7 +229,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. if (err == -ENOBUFS) goto e_nobufs; if (err == -EINVAL) -@@ -1997,6 +2016,8 @@ +@@ -1997,6 +2016,8 @@ out: return err; brd_input: if (skb->protocol != htons(ETH_P_IP)) goto e_inval; @@ -234,7 +238,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. if (ZERONET(saddr)) spec_dst = inet_select_addr(dev, 0, RT_SCOPE_LINK); -@@ -2037,6 +2058,7 @@ +@@ -2037,6 +2058,7 @@ local_input: rth->u.dst.dev = &loopback_dev; dev_hold(rth->u.dst.dev); rth->idev = in_dev_get(rth->u.dst.dev); @@ -242,7 +246,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. rth->rt_gateway = daddr; rth->rt_spec_dst= spec_dst; rth->u.dst.input= ip_local_deliver; -@@ -2086,8 +2108,9 @@ +@@ -2086,8 +2108,9 @@ martian_source: goto e_inval; } @@ -254,7 +258,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. { struct rtable * rth; unsigned hash; -@@ -2102,6 +2125,7 @@ +@@ -2102,6 +2125,7 @@ int ip_route_input(struct sk_buff *skb, if (rth->fl.fl4_dst == daddr && rth->fl.fl4_src == saddr && rth->fl.iif == iif && @@ -262,7 +266,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. rth->fl.oif == 0 && rth->fl.mark == skb->mark && rth->fl.fl4_tos == tos) { -@@ -2148,7 +2172,19 @@ +@@ -2148,7 +2172,19 @@ int ip_route_input(struct sk_buff *skb, rcu_read_unlock(); return -EINVAL; } @@ -283,7 +287,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. } static inline int __mkroute_output(struct rtable **result, -@@ -2227,6 +2263,7 @@ +@@ -2227,6 +2263,7 @@ static inline int __mkroute_output(struc rth->fl.fl4_tos = tos; rth->fl.fl4_src = oldflp->fl4_src; rth->fl.oif = oldflp->oif; @@ -291,7 +295,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. rth->fl.mark = oldflp->mark; rth->rt_dst = fl->fl4_dst; rth->rt_src = fl->fl4_src; -@@ -2367,6 +2404,7 @@ +@@ -2367,6 +2404,7 @@ static int ip_route_output_slow(struct r struct flowi fl = { .nl_u = { .ip4_u = { .daddr = oldflp->fl4_dst, .saddr = oldflp->fl4_src, @@ -299,7 +303,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. .tos = tos & IPTOS_RT_MASK, .scope = ((tos & RTO_ONLINK) ? RT_SCOPE_LINK : -@@ -2470,6 +2508,7 @@ +@@ -2470,6 +2508,7 @@ static int ip_route_output_slow(struct r dev_out = &loopback_dev; dev_hold(dev_out); fl.oif = loopback_dev.ifindex; @@ -307,7 +311,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. res.type = RTN_LOCAL; flags |= RTCF_LOCAL; goto make_route; -@@ -2477,7 +2516,7 @@ +@@ -2477,7 +2516,7 @@ static int ip_route_output_slow(struct r if (fib_lookup(&fl, &res)) { res.fi = NULL; @@ -316,7 +320,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. /* Apparently, routing tables are wrong. Assume, that the destination is on link. -@@ -2517,6 +2556,7 @@ +@@ -2517,6 +2556,7 @@ static int ip_route_output_slow(struct r dev_out = &loopback_dev; dev_hold(dev_out); fl.oif = dev_out->ifindex; @@ -324,7 +328,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. if (res.fi) fib_info_put(res.fi); res.fi = NULL; -@@ -2524,13 +2564,12 @@ +@@ -2524,13 +2564,12 @@ static int ip_route_output_slow(struct r goto make_route; } @@ -341,7 +345,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. if (!fl.fl4_src) fl.fl4_src = FIB_RES_PREFSRC(res); -@@ -2567,6 +2606,7 @@ +@@ -2567,6 +2606,7 @@ int __ip_route_output_key(struct rtable rth->fl.fl4_src == flp->fl4_src && rth->fl.iif == 0 && rth->fl.oif == flp->oif && @@ -349,7 +353,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route. rth->fl.mark == flp->mark && !((rth->fl.fl4_tos ^ flp->fl4_tos) & (IPTOS_RT_MASK | RTO_ONLINK))) { -@@ -3199,3 +3239,4 @@ +@@ -3199,3 +3239,4 @@ int __init ip_rt_init(void) EXPORT_SYMBOL(__ip_select_ident); EXPORT_SYMBOL(ip_route_input); EXPORT_SYMBOL(ip_route_output_key); diff --git a/target/linux/generic-2.6/patches/202-mips-freestanding.patch b/target/linux/generic-2.6/patches/202-mips-freestanding.patch index 8ddd7ff955..51a96a40ad 100644 --- a/target/linux/generic-2.6/patches/202-mips-freestanding.patch +++ b/target/linux/generic-2.6/patches/202-mips-freestanding.patch @@ -1,7 +1,8 @@ -diff -urN linux-2.6.21.1.old/arch/mips/Makefile linux-2.6.21.1.dev/arch/mips/Makefile ---- linux-2.6.21.1.old/arch/mips/Makefile 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/arch/mips/Makefile 2007-05-26 20:49:09.358341256 +0200 -@@ -605,6 +605,9 @@ +Index: linux-2.6.21.7/arch/mips/Makefile +=================================================================== +--- linux-2.6.21.7.orig/arch/mips/Makefile ++++ linux-2.6.21.7/arch/mips/Makefile +@@ -605,6 +605,9 @@ core-$(CONFIG_TOSHIBA_RBTX4938) += arch/ core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/common/ load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000 diff --git a/target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch index b18854a223..5c301b47d2 100644 --- a/target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch +++ b/target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch @@ -1,7 +1,8 @@ -diff -urN linux-2.6.21.1.old/fs/jffs2/build.c linux-2.6.21.1.dev/fs/jffs2/build.c ---- linux-2.6.21.1.old/fs/jffs2/build.c 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/fs/jffs2/build.c 2007-05-26 20:52:04.425726968 +0200 -@@ -107,6 +107,17 @@ +Index: linux-2.6.21.7/fs/jffs2/build.c +=================================================================== +--- linux-2.6.21.7.orig/fs/jffs2/build.c ++++ linux-2.6.21.7/fs/jffs2/build.c +@@ -107,6 +107,17 @@ static int jffs2_build_filesystem(struct dbg_fsbuild("scanned flash completely\n"); jffs2_dbg_dump_block_lists_nolock(c); @@ -19,10 +20,11 @@ diff -urN linux-2.6.21.1.old/fs/jffs2/build.c linux-2.6.21.1.dev/fs/jffs2/build. dbg_fsbuild("pass 1 starting\n"); c->flags |= JFFS2_SB_FLAG_BUILDING; /* Now scan the directory tree, increasing nlink according to every dirent found. */ -diff -urN linux-2.6.21.1.old/fs/jffs2/scan.c linux-2.6.21.1.dev/fs/jffs2/scan.c ---- linux-2.6.21.1.old/fs/jffs2/scan.c 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/fs/jffs2/scan.c 2007-05-26 20:52:04.491716936 +0200 -@@ -143,9 +143,12 @@ +Index: linux-2.6.21.7/fs/jffs2/scan.c +=================================================================== +--- linux-2.6.21.7.orig/fs/jffs2/scan.c ++++ linux-2.6.21.7/fs/jffs2/scan.c +@@ -143,9 +143,12 @@ int jffs2_scan_medium(struct jffs2_sb_in /* reset summary info for next eraseblock scan */ jffs2_sum_reset_collected(s); @@ -38,7 +40,7 @@ diff -urN linux-2.6.21.1.old/fs/jffs2/scan.c linux-2.6.21.1.dev/fs/jffs2/scan.c if (ret < 0) goto out; -@@ -546,6 +549,17 @@ +@@ -546,6 +549,17 @@ static int jffs2_scan_eraseblock (struct return err; } diff --git a/target/linux/generic-2.6/patches/207-powerpc_asm_segment_h.patch b/target/linux/generic-2.6/patches/207-powerpc_asm_segment_h.patch index 4640c9f4e4..963ecd182b 100644 --- a/target/linux/generic-2.6/patches/207-powerpc_asm_segment_h.patch +++ b/target/linux/generic-2.6/patches/207-powerpc_asm_segment_h.patch @@ -1,6 +1,7 @@ -diff -urN linux-2.6.21.1.old/include/asm-powerpc/segment.h linux-2.6.21.1.dev/include/asm-powerpc/segment.h ---- linux-2.6.21.1.old/include/asm-powerpc/segment.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/include/asm-powerpc/segment.h 2007-05-26 20:55:12.738099136 +0200 +Index: linux-2.6.21.7/include/asm-powerpc/segment.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/include/asm-powerpc/segment.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SEGMENT_H +#define _ASM_SEGMENT_H diff --git a/target/linux/generic-2.6/patches/208-rtl8110sb_fix.patch b/target/linux/generic-2.6/patches/208-rtl8110sb_fix.patch index 98d9e5155b..2b8cebe9df 100644 --- a/target/linux/generic-2.6/patches/208-rtl8110sb_fix.patch +++ b/target/linux/generic-2.6/patches/208-rtl8110sb_fix.patch @@ -1,7 +1,8 @@ -diff -urN linux-2.6.21.1.old/drivers/net/r8169.c linux-2.6.21.1.dev/drivers/net/r8169.c ---- linux-2.6.21.1.old/drivers/net/r8169.c 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/drivers/net/r8169.c 2007-05-26 20:58:17.370030816 +0200 -@@ -494,7 +494,7 @@ +Index: linux-2.6.21.7/drivers/net/r8169.c +=================================================================== +--- linux-2.6.21.7.orig/drivers/net/r8169.c ++++ linux-2.6.21.7/drivers/net/r8169.c +@@ -494,7 +494,7 @@ static int rtl8169_poll(struct net_devic #endif static const u16 rtl8169_intr_mask = @@ -10,7 +11,7 @@ diff -urN linux-2.6.21.1.old/drivers/net/r8169.c linux-2.6.21.1.dev/drivers/net/ static const u16 rtl8169_napi_event = RxOK | RxOverflow | RxFIFOOver | TxOK | TxErr; static const unsigned int rtl8169_rx_config = -@@ -2652,10 +2652,12 @@ +@@ -2652,10 +2652,12 @@ rtl8169_interrupt(int irq, void *dev_ins if (!(status & rtl8169_intr_mask)) break; diff --git a/target/linux/generic-2.6/patches/209-mini_fo.patch b/target/linux/generic-2.6/patches/209-mini_fo.patch index 35c9ec2f09..10cabec40c 100644 --- a/target/linux/generic-2.6/patches/209-mini_fo.patch +++ b/target/linux/generic-2.6/patches/209-mini_fo.patch @@ -1,7 +1,8 @@ -diff -urN linux-2.6.21.1.old/fs/Kconfig linux-2.6.21.1.dev/fs/Kconfig ---- linux-2.6.21.1.old/fs/Kconfig 2007-05-26 19:03:45.497714200 +0200 -+++ linux-2.6.21.1.dev/fs/Kconfig 2007-05-26 21:01:26.154331240 +0200 -@@ -461,6 +461,9 @@ +Index: linux-2.6.21.7/fs/Kconfig +=================================================================== +--- linux-2.6.21.7.orig/fs/Kconfig ++++ linux-2.6.21.7/fs/Kconfig +@@ -461,6 +461,9 @@ config OCFS2_DEBUG_MASKLOG This option will enlarge your kernel, but it allows debugging of ocfs2 filesystem issues. @@ -11,10 +12,11 @@ diff -urN linux-2.6.21.1.old/fs/Kconfig linux-2.6.21.1.dev/fs/Kconfig config MINIX_FS tristate "Minix fs support" help -diff -urN linux-2.6.21.1.old/fs/Makefile linux-2.6.21.1.dev/fs/Makefile ---- linux-2.6.21.1.old/fs/Makefile 2007-05-26 19:03:45.497714200 +0200 -+++ linux-2.6.21.1.dev/fs/Makefile 2007-05-26 21:01:26.160330328 +0200 -@@ -72,6 +72,7 @@ +Index: linux-2.6.21.7/fs/Makefile +=================================================================== +--- linux-2.6.21.7.orig/fs/Makefile ++++ linux-2.6.21.7/fs/Makefile +@@ -72,6 +72,7 @@ obj-$(CONFIG_SQUASHFS) += squashfs/ obj-$(CONFIG_RAMFS) += ramfs/ obj-$(CONFIG_HUGETLBFS) += hugetlbfs/ obj-$(CONFIG_CODA_FS) += coda/ @@ -22,9 +24,10 @@ diff -urN linux-2.6.21.1.old/fs/Makefile linux-2.6.21.1.dev/fs/Makefile obj-$(CONFIG_MINIX_FS) += minix/ obj-$(CONFIG_FAT_FS) += fat/ obj-$(CONFIG_MSDOS_FS) += msdos/ -diff -urN linux-2.6.21.1.old/fs/mini_fo/aux.c linux-2.6.21.1.dev/fs/mini_fo/aux.c ---- linux-2.6.21.1.old/fs/mini_fo/aux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/fs/mini_fo/aux.c 2007-05-26 21:01:26.160330328 +0200 +Index: linux-2.6.21.7/fs/mini_fo/aux.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/fs/mini_fo/aux.c @@ -0,0 +1,580 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -606,9 +609,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/aux.c linux-2.6.21.1.dev/fs/mini_fo/aux. + +#endif /* unused */ + -diff -urN linux-2.6.21.1.old/fs/mini_fo/ChangeLog linux-2.6.21.1.dev/fs/mini_fo/ChangeLog ---- linux-2.6.21.1.old/fs/mini_fo/ChangeLog 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/fs/mini_fo/ChangeLog 2007-05-26 21:01:26.161330176 +0200 +Index: linux-2.6.21.7/fs/mini_fo/ChangeLog +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/fs/mini_fo/ChangeLog @@ -0,0 +1,281 @@ +2006-01-24 Markus Klotzbuecher + @@ -891,9 +895,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/ChangeLog linux-2.6.21.1.dev/fs/mini_fo/ + * Implementation of mini_fo_mknod and mini_fo_rename, support + for device files. + -diff -urN linux-2.6.21.1.old/fs/mini_fo/dentry.c linux-2.6.21.1.dev/fs/mini_fo/dentry.c ---- linux-2.6.21.1.old/fs/mini_fo/dentry.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/fs/mini_fo/dentry.c 2007-05-26 21:01:26.161330176 +0200 +Index: linux-2.6.21.7/fs/mini_fo/dentry.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/fs/mini_fo/dentry.c @@ -0,0 +1,244 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -1139,9 +1144,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/dentry.c linux-2.6.21.1.dev/fs/mini_fo/d + d_delete: mini_fo_d_delete, + d_iput: mini_fo_d_iput, +}; -diff -urN linux-2.6.21.1.old/fs/mini_fo/file.c linux-2.6.21.1.dev/fs/mini_fo/file.c ---- linux-2.6.21.1.old/fs/mini_fo/file.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/fs/mini_fo/file.c 2007-05-26 21:01:26.162330024 +0200 +Index: linux-2.6.21.7/fs/mini_fo/file.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/fs/mini_fo/file.c @@ -0,0 +1,713 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -1856,9 +1862,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/file.c linux-2.6.21.1.dev/fs/mini_fo/fil + /* not implemented: sendpage */ + /* not implemented: get_unmapped_area */ + }; -diff -urN linux-2.6.21.1.old/fs/mini_fo/fist.h linux-2.6.21.1.dev/fs/mini_fo/fist.h ---- linux-2.6.21.1.old/fs/mini_fo/fist.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/fs/mini_fo/fist.h 2007-05-26 21:01:26.162330024 +0200 +Index: linux-2.6.21.7/fs/mini_fo/fist.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/fs/mini_fo/fist.h @@ -0,0 +1,252 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -2112,9 +2119,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/fist.h linux-2.6.21.1.dev/fs/mini_fo/fis +# define FIST_IOCTL_SET_DEBUG_VALUE _IOW(0x15, 2, int) + +#endif /* not __FIST_H_ */ -diff -urN linux-2.6.21.1.old/fs/mini_fo/inode.c linux-2.6.21.1.dev/fs/mini_fo/inode.c ---- linux-2.6.21.1.old/fs/mini_fo/inode.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/fs/mini_fo/inode.c 2007-05-26 21:01:26.164329720 +0200 +Index: linux-2.6.21.7/fs/mini_fo/inode.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/fs/mini_fo/inode.c @@ -0,0 +1,1564 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -3680,9 +3688,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/inode.c linux-2.6.21.1.dev/fs/mini_fo/in + removexattr: mini_fo_removexattr +# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */ + }; -diff -urN linux-2.6.21.1.old/fs/mini_fo/main.c linux-2.6.21.1.dev/fs/mini_fo/main.c ---- linux-2.6.21.1.old/fs/mini_fo/main.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/fs/mini_fo/main.c 2007-05-26 21:01:26.164329720 +0200 +Index: linux-2.6.21.7/fs/mini_fo/main.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/fs/mini_fo/main.c @@ -0,0 +1,423 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -4107,9 +4116,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/main.c linux-2.6.21.1.dev/fs/mini_fo/mai + +module_init(init_mini_fo_fs) +module_exit(exit_mini_fo_fs) -diff -urN linux-2.6.21.1.old/fs/mini_fo/Makefile linux-2.6.21.1.dev/fs/mini_fo/Makefile ---- linux-2.6.21.1.old/fs/mini_fo/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/fs/mini_fo/Makefile 2007-05-26 21:01:26.164329720 +0200 +Index: linux-2.6.21.7/fs/mini_fo/Makefile +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/fs/mini_fo/Makefile @@ -0,0 +1,17 @@ +# +# Makefile for mini_fo 2.4 and 2.6 Linux kernels @@ -4128,9 +4138,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/Makefile linux-2.6.21.1.dev/fs/mini_fo/M +# dependencies +${mini_fo-objs}: mini_fo.h fist.h + -diff -urN linux-2.6.21.1.old/fs/mini_fo/meta.c linux-2.6.21.1.dev/fs/mini_fo/meta.c ---- linux-2.6.21.1.old/fs/mini_fo/meta.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/fs/mini_fo/meta.c 2007-05-26 21:01:26.166329416 +0200 +Index: linux-2.6.21.7/fs/mini_fo/meta.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/fs/mini_fo/meta.c @@ -0,0 +1,1000 @@ +/* + * Copyright (C) 2004, 2005 Markus Klotzbuecher @@ -5132,9 +5143,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/meta.c linux-2.6.21.1.dev/fs/mini_fo/met + return 0; +} + -diff -urN linux-2.6.21.1.old/fs/mini_fo/mini_fo.h linux-2.6.21.1.dev/fs/mini_fo/mini_fo.h ---- linux-2.6.21.1.old/fs/mini_fo/mini_fo.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/fs/mini_fo/mini_fo.h 2007-05-26 21:01:26.167329264 +0200 +Index: linux-2.6.21.7/fs/mini_fo/mini_fo.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/fs/mini_fo/mini_fo.h @@ -0,0 +1,510 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -5646,9 +5658,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/mini_fo.h linux-2.6.21.1.dev/fs/mini_fo/ +/* ioctls */ + +#endif /* not __MINI_FO_H_ */ -diff -urN linux-2.6.21.1.old/fs/mini_fo/mini_fo-merge linux-2.6.21.1.dev/fs/mini_fo/mini_fo-merge ---- linux-2.6.21.1.old/fs/mini_fo/mini_fo-merge 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/fs/mini_fo/mini_fo-merge 2007-05-26 21:01:26.167329264 +0200 +Index: linux-2.6.21.7/fs/mini_fo/mini_fo-merge +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/fs/mini_fo/mini_fo-merge @@ -0,0 +1,180 @@ +#!/bin/bash +# @@ -5830,9 +5843,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/mini_fo-merge linux-2.6.21.1.dev/fs/mini +#rm $TMP/$SKIP_DEL_LIST + +echo "Done!" -diff -urN linux-2.6.21.1.old/fs/mini_fo/mini_fo-overlay linux-2.6.21.1.dev/fs/mini_fo/mini_fo-overlay ---- linux-2.6.21.1.old/fs/mini_fo/mini_fo-overlay 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/fs/mini_fo/mini_fo-overlay 2007-05-26 21:01:26.167329264 +0200 +Index: linux-2.6.21.7/fs/mini_fo/mini_fo-overlay +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/fs/mini_fo/mini_fo-overlay @@ -0,0 +1,130 @@ +#!/bin/bash +# @@ -5964,9 +5978,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/mini_fo-overlay linux-2.6.21.1.dev/fs/mi +if [ $? -ne 0 ]; then + echo "Error, mounting failed, maybe no permisson to mount?" +fi -diff -urN linux-2.6.21.1.old/fs/mini_fo/mmap.c linux-2.6.21.1.dev/fs/mini_fo/mmap.c ---- linux-2.6.21.1.old/fs/mini_fo/mmap.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/fs/mini_fo/mmap.c 2007-05-26 21:01:26.168329112 +0200 +Index: linux-2.6.21.7/fs/mini_fo/mmap.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/fs/mini_fo/mmap.c @@ -0,0 +1,637 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -6605,9 +6620,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/mmap.c linux-2.6.21.1.dev/fs/mini_fo/mma + print_exit_status(err); + return err; +} -diff -urN linux-2.6.21.1.old/fs/mini_fo/README linux-2.6.21.1.dev/fs/mini_fo/README ---- linux-2.6.21.1.old/fs/mini_fo/README 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/fs/mini_fo/README 2007-05-26 21:01:26.168329112 +0200 +Index: linux-2.6.21.7/fs/mini_fo/README +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/fs/mini_fo/README @@ -0,0 +1,163 @@ +README for the mini_fo overlay file system +========================================= @@ -6772,9 +6788,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/README linux-2.6.21.1.dev/fs/mini_fo/REA +2 of the License, or (at your option) any later version. + + -diff -urN linux-2.6.21.1.old/fs/mini_fo/RELEASE_NOTES linux-2.6.21.1.dev/fs/mini_fo/RELEASE_NOTES ---- linux-2.6.21.1.old/fs/mini_fo/RELEASE_NOTES 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/fs/mini_fo/RELEASE_NOTES 2007-05-26 21:01:26.168329112 +0200 +Index: linux-2.6.21.7/fs/mini_fo/RELEASE_NOTES +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/fs/mini_fo/RELEASE_NOTES @@ -0,0 +1,111 @@ +Release: mini_fo-0.6.1 (v0-6-1) +Date: 21.09.2005 @@ -6887,9 +6904,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/RELEASE_NOTES linux-2.6.21.1.dev/fs/mini +original state. I hope to fix this someday. Please note that this does +not effect the special hard links '.' and '..', that are handled +seperately by the lower fs. -diff -urN linux-2.6.21.1.old/fs/mini_fo/state.c linux-2.6.21.1.dev/fs/mini_fo/state.c ---- linux-2.6.21.1.old/fs/mini_fo/state.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/fs/mini_fo/state.c 2007-05-26 21:01:26.169328960 +0200 +Index: linux-2.6.21.7/fs/mini_fo/state.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/fs/mini_fo/state.c @@ -0,0 +1,620 @@ +/* + * Copyright (C) 2005 Markus Klotzbuecher @@ -7511,9 +7529,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/state.c linux-2.6.21.1.dev/fs/mini_fo/st + return err; +} + -diff -urN linux-2.6.21.1.old/fs/mini_fo/super.c linux-2.6.21.1.dev/fs/mini_fo/super.c ---- linux-2.6.21.1.old/fs/mini_fo/super.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/fs/mini_fo/super.c 2007-05-26 21:01:26.169328960 +0200 +Index: linux-2.6.21.7/fs/mini_fo/super.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/fs/mini_fo/super.c @@ -0,0 +1,281 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok diff --git a/target/linux/generic-2.6/patches/210-d80211_compat.patch b/target/linux/generic-2.6/patches/210-d80211_compat.patch index 04548e2bcc..9d57f1fa7a 100644 --- a/target/linux/generic-2.6/patches/210-d80211_compat.patch +++ b/target/linux/generic-2.6/patches/210-d80211_compat.patch @@ -1,7 +1,8 @@ -diff -urN linux-2.6.21.1.old/include/linux/netdevice.h linux-2.6.21.1.dev/include/linux/netdevice.h ---- linux-2.6.21.1.old/include/linux/netdevice.h 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/include/linux/netdevice.h 2007-05-26 21:04:21.537668920 +0200 -@@ -532,6 +532,8 @@ +Index: linux-2.6.21.7/include/linux/netdevice.h +=================================================================== +--- linux-2.6.21.7.orig/include/linux/netdevice.h ++++ linux-2.6.21.7/include/linux/netdevice.h +@@ -532,6 +532,8 @@ struct net_device struct device dev; /* space for optional statistics and wireless sysfs groups */ struct attribute_group *sysfs_groups[3]; diff --git a/target/linux/generic-2.6/patches/211-no_block2mtd_readahead.patch b/target/linux/generic-2.6/patches/211-no_block2mtd_readahead.patch index 6313bc027c..3cad44ed3a 100644 --- a/target/linux/generic-2.6/patches/211-no_block2mtd_readahead.patch +++ b/target/linux/generic-2.6/patches/211-no_block2mtd_readahead.patch @@ -1,7 +1,8 @@ -diff -urN linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c linux-2.6.21.1.dev/drivers/mtd/devices/block2mtd.c ---- linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c 2007-05-26 20:13:39.192175736 +0200 -+++ linux-2.6.21.1.dev/drivers/mtd/devices/block2mtd.c 2007-05-26 21:07:17.921854448 +0200 -@@ -41,7 +41,7 @@ +Index: linux-2.6.21.7/drivers/mtd/devices/block2mtd.c +=================================================================== +--- linux-2.6.21.7.orig/drivers/mtd/devices/block2mtd.c ++++ linux-2.6.21.7/drivers/mtd/devices/block2mtd.c +@@ -41,7 +41,7 @@ struct block2mtd_dev { static LIST_HEAD(blkmtd_device_list); diff --git a/target/linux/generic-2.6/patches/212-block2mtd_erase_scan.patch b/target/linux/generic-2.6/patches/212-block2mtd_erase_scan.patch index 931cca9568..6c68f99fe0 100644 --- a/target/linux/generic-2.6/patches/212-block2mtd_erase_scan.patch +++ b/target/linux/generic-2.6/patches/212-block2mtd_erase_scan.patch @@ -1,7 +1,8 @@ -diff -urN linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c linux-2.6.21.1.dev/drivers/mtd/devices/block2mtd.c ---- linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c 2007-05-26 21:10:15.776816384 +0200 -+++ linux-2.6.21.1.dev/drivers/mtd/devices/block2mtd.c 2007-05-26 21:10:16.513704360 +0200 -@@ -112,7 +112,7 @@ +Index: linux-2.6.21.7/drivers/mtd/devices/block2mtd.c +=================================================================== +--- linux-2.6.21.7.orig/drivers/mtd/devices/block2mtd.c ++++ linux-2.6.21.7/drivers/mtd/devices/block2mtd.c +@@ -112,7 +112,7 @@ static int _block2mtd_erase(struct block if (IS_ERR(page)) return PTR_ERR(page); diff --git a/target/linux/generic-2.6/patches/213-kobject_uevent.patch b/target/linux/generic-2.6/patches/213-kobject_uevent.patch index 62af2a182b..0039b9f3e8 100644 --- a/target/linux/generic-2.6/patches/213-kobject_uevent.patch +++ b/target/linux/generic-2.6/patches/213-kobject_uevent.patch @@ -1,6 +1,8 @@ ---- linux-2.6.22-rc5/lib/kobject_uevent.c.old 2007-06-25 07:34:27.002266528 +0200 -+++ linux-2.6.22-rc5/lib/kobject_uevent.c 2007-06-25 08:39:53.762308264 +0200 -@@ -30,9 +30,22 @@ +Index: linux-2.6.21.7/lib/kobject_uevent.c +=================================================================== +--- linux-2.6.21.7.orig/lib/kobject_uevent.c ++++ linux-2.6.21.7/lib/kobject_uevent.c +@@ -30,9 +30,22 @@ u64 uevent_seqnum; char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug"; static DEFINE_SPINLOCK(sequence_lock); #if defined(CONFIG_NET) @@ -24,7 +26,7 @@ static char *action_to_string(enum kobject_action action) { switch (action) { -@@ -169,9 +182,7 @@ +@@ -171,9 +184,7 @@ int kobject_uevent_env(struct kobject *k } /* we will send an event, request a new sequence number */ diff --git a/target/linux/generic-2.6/patches/510-Yaffs.patch b/target/linux/generic-2.6/patches/510-Yaffs.patch index 255c3a8a35..233cd20392 100644 --- a/target/linux/generic-2.6/patches/510-Yaffs.patch +++ b/target/linux/generic-2.6/patches/510-Yaffs.patch @@ -1,7 +1,8 @@ -diff -urN linux-2.6.21.1/fs/Kconfig linux-2.6.21.1.new/fs/Kconfig ---- linux-2.6.21.1/fs/Kconfig 2007-06-08 14:07:09.000000000 +0200 -+++ linux-2.6.21.1.new/fs/Kconfig 2007-06-08 14:09:26.000000000 +0200 -@@ -419,6 +419,7 @@ +Index: linux-2.6.21.7/fs/Kconfig +=================================================================== +--- linux-2.6.21.7.orig/fs/Kconfig ++++ linux-2.6.21.7/fs/Kconfig +@@ -419,6 +419,7 @@ config FS_POSIX_ACL source "fs/xfs/Kconfig" source "fs/gfs2/Kconfig" @@ -9,10 +10,11 @@ diff -urN linux-2.6.21.1/fs/Kconfig linux-2.6.21.1.new/fs/Kconfig config OCFS2_FS tristate "OCFS2 file system support" -diff -urN linux-2.6.21.1/fs/Makefile linux-2.6.21.1.new/fs/Makefile ---- linux-2.6.21.1/fs/Makefile 2007-06-08 14:07:09.000000000 +0200 -+++ linux-2.6.21.1.new/fs/Makefile 2007-06-08 14:09:51.000000000 +0200 -@@ -116,3 +116,4 @@ +Index: linux-2.6.21.7/fs/Makefile +=================================================================== +--- linux-2.6.21.7.orig/fs/Makefile ++++ linux-2.6.21.7/fs/Makefile +@@ -116,3 +116,4 @@ obj-$(CONFIG_HPPFS) += hppfs/ obj-$(CONFIG_DEBUG_FS) += debugfs/ obj-$(CONFIG_OCFS2_FS) += ocfs2/ obj-$(CONFIG_GFS2_FS) += gfs2/ diff --git a/target/linux/generic-2.6/patches/900-headers_type_and_time.patch b/target/linux/generic-2.6/patches/900-headers_type_and_time.patch index d72e809ef2..3029ce28ec 100644 --- a/target/linux/generic-2.6/patches/900-headers_type_and_time.patch +++ b/target/linux/generic-2.6/patches/900-headers_type_and_time.patch @@ -1,6 +1,7 @@ -diff -urN linux-2.6.21.1.old/include/linux/time.h linux-2.6.21.1.dev/include/linux/time.h ---- linux-2.6.21.1.old/include/linux/time.h 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/include/linux/time.h 2007-05-26 21:23:19.859617680 +0200 +Index: linux-2.6.21.7/include/linux/time.h +=================================================================== +--- linux-2.6.21.7.orig/include/linux/time.h ++++ linux-2.6.21.7/include/linux/time.h @@ -1,6 +1,10 @@ #ifndef _LINUX_TIME_H #define _LINUX_TIME_H @@ -12,16 +13,17 @@ diff -urN linux-2.6.21.1.old/include/linux/time.h linux-2.6.21.1.dev/include/lin #include #ifdef __KERNEL__ -@@ -224,4 +228,6 @@ +@@ -224,4 +228,6 @@ struct itimerval { */ #define TIMER_ABSTIME 0x01 +#endif /* __KERNEL__ DEBIAN */ + #endif -diff -urN linux-2.6.21.1.old/include/linux/types.h linux-2.6.21.1.dev/include/linux/types.h ---- linux-2.6.21.1.old/include/linux/types.h 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/include/linux/types.h 2007-05-26 21:23:19.859617680 +0200 +Index: linux-2.6.21.7/include/linux/types.h +=================================================================== +--- linux-2.6.21.7.orig/include/linux/types.h ++++ linux-2.6.21.7/include/linux/types.h @@ -1,6 +1,14 @@ #ifndef _LINUX_TYPES_H #define _LINUX_TYPES_H @@ -37,7 +39,7 @@ diff -urN linux-2.6.21.1.old/include/linux/types.h linux-2.6.21.1.dev/include/li #ifdef __KERNEL__ #define BITS_TO_LONGS(bits) \ -@@ -162,6 +170,8 @@ +@@ -162,6 +170,8 @@ typedef unsigned long blkcnt_t; #endif /* __KERNEL_STRICT_NAMES */ diff --git a/target/linux/generic-2.6/patches/902-darwin_scripts_include.patch b/target/linux/generic-2.6/patches/902-darwin_scripts_include.patch index 3f9f9b6dbe..0e981def57 100644 --- a/target/linux/generic-2.6/patches/902-darwin_scripts_include.patch +++ b/target/linux/generic-2.6/patches/902-darwin_scripts_include.patch @@ -1,6 +1,7 @@ -diff -urN linux-2.6.21.1.old/scripts/genksyms/parse.c_shipped linux-2.6.21.1.dev/scripts/genksyms/parse.c_shipped ---- linux-2.6.21.1.old/scripts/genksyms/parse.c_shipped 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/scripts/genksyms/parse.c_shipped 2007-05-26 21:26:23.565690112 +0200 +Index: linux-2.6.21.7/scripts/genksyms/parse.c_shipped +=================================================================== +--- linux-2.6.21.7.orig/scripts/genksyms/parse.c_shipped ++++ linux-2.6.21.7/scripts/genksyms/parse.c_shipped @@ -144,7 +144,9 @@ @@ -11,9 +12,10 @@ diff -urN linux-2.6.21.1.old/scripts/genksyms/parse.c_shipped linux-2.6.21.1.dev #include "genksyms.h" static int is_typedef; -diff -urN linux-2.6.21.1.old/scripts/genksyms/parse.y linux-2.6.21.1.dev/scripts/genksyms/parse.y ---- linux-2.6.21.1.old/scripts/genksyms/parse.y 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/scripts/genksyms/parse.y 2007-05-26 21:26:23.563690416 +0200 +Index: linux-2.6.21.7/scripts/genksyms/parse.y +=================================================================== +--- linux-2.6.21.7.orig/scripts/genksyms/parse.y ++++ linux-2.6.21.7/scripts/genksyms/parse.y @@ -24,7 +24,9 @@ %{ @@ -24,9 +26,10 @@ diff -urN linux-2.6.21.1.old/scripts/genksyms/parse.y linux-2.6.21.1.dev/scripts #include "genksyms.h" static int is_typedef; -diff -urN linux-2.6.21.1.old/scripts/kallsyms.c linux-2.6.21.1.dev/scripts/kallsyms.c ---- linux-2.6.21.1.old/scripts/kallsyms.c 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/scripts/kallsyms.c 2007-05-26 21:26:23.579687984 +0200 +Index: linux-2.6.21.7/scripts/kallsyms.c +=================================================================== +--- linux-2.6.21.7.orig/scripts/kallsyms.c ++++ linux-2.6.21.7/scripts/kallsyms.c @@ -30,6 +30,35 @@ #include #include @@ -63,10 +66,11 @@ diff -urN linux-2.6.21.1.old/scripts/kallsyms.c linux-2.6.21.1.dev/scripts/kalls #define KSYM_NAME_LEN 127 -diff -urN linux-2.6.21.1.old/scripts/kconfig/Makefile linux-2.6.21.1.dev/scripts/kconfig/Makefile ---- linux-2.6.21.1.old/scripts/kconfig/Makefile 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/scripts/kconfig/Makefile 2007-05-26 21:26:23.553691936 +0200 -@@ -87,6 +87,9 @@ +Index: linux-2.6.21.7/scripts/kconfig/Makefile +=================================================================== +--- linux-2.6.21.7.orig/scripts/kconfig/Makefile ++++ linux-2.6.21.7/scripts/kconfig/Makefile +@@ -87,6 +87,9 @@ check-lxdialog := $(srctree)/$(src)/lxd # we really need to do so. (Do not call gcc as part of make mrproper) HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) @@ -76,10 +80,11 @@ diff -urN linux-2.6.21.1.old/scripts/kconfig/Makefile linux-2.6.21.1.dev/scripts HOST_EXTRACFLAGS += -DLOCALE -diff -urN linux-2.6.21.1.old/scripts/mod/file2alias.c linux-2.6.21.1.dev/scripts/mod/file2alias.c ---- linux-2.6.21.1.old/scripts/mod/file2alias.c 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/scripts/mod/file2alias.c 2007-05-26 21:26:23.552692088 +0200 -@@ -37,7 +37,21 @@ +Index: linux-2.6.21.7/scripts/mod/file2alias.c +=================================================================== +--- linux-2.6.21.7.orig/scripts/mod/file2alias.c ++++ linux-2.6.21.7/scripts/mod/file2alias.c +@@ -37,7 +37,21 @@ typedef unsigned char __u8; * even potentially has different endianness and word sizes, since * we handle those differences explicitly below */ #include "../../include/linux/mod_devicetable.h" @@ -101,9 +106,10 @@ diff -urN linux-2.6.21.1.old/scripts/mod/file2alias.c linux-2.6.21.1.dev/scripts #define ADD(str, sep, cond, field) \ do { \ -diff -urN linux-2.6.21.1.old/scripts/mod/mk_elfconfig.c linux-2.6.21.1.dev/scripts/mod/mk_elfconfig.c ---- linux-2.6.21.1.old/scripts/mod/mk_elfconfig.c 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/scripts/mod/mk_elfconfig.c 2007-05-26 21:26:23.553691936 +0200 +Index: linux-2.6.21.7/scripts/mod/mk_elfconfig.c +=================================================================== +--- linux-2.6.21.7.orig/scripts/mod/mk_elfconfig.c ++++ linux-2.6.21.7/scripts/mod/mk_elfconfig.c @@ -1,7 +1,11 @@ #include #include @@ -116,9 +122,10 @@ diff -urN linux-2.6.21.1.old/scripts/mod/mk_elfconfig.c linux-2.6.21.1.dev/scrip int main(int argc, char **argv) -diff -urN linux-2.6.21.1.old/scripts/mod/modpost.h linux-2.6.21.1.dev/scripts/mod/modpost.h ---- linux-2.6.21.1.old/scripts/mod/modpost.h 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/scripts/mod/modpost.h 2007-05-26 21:26:23.553691936 +0200 +Index: linux-2.6.21.7/scripts/mod/modpost.h +=================================================================== +--- linux-2.6.21.7.orig/scripts/mod/modpost.h ++++ linux-2.6.21.7/scripts/mod/modpost.h @@ -7,7 +7,11 @@ #include #include @@ -131,9 +138,10 @@ diff -urN linux-2.6.21.1.old/scripts/mod/modpost.h linux-2.6.21.1.dev/scripts/mo #include "elfconfig.h" -diff -urN linux-2.6.21.1.old/scripts/mod/sumversion.c linux-2.6.21.1.dev/scripts/mod/sumversion.c ---- linux-2.6.21.1.old/scripts/mod/sumversion.c 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/scripts/mod/sumversion.c 2007-05-26 21:26:23.553691936 +0200 +Index: linux-2.6.21.7/scripts/mod/sumversion.c +=================================================================== +--- linux-2.6.21.7.orig/scripts/mod/sumversion.c ++++ linux-2.6.21.7/scripts/mod/sumversion.c @@ -8,6 +8,9 @@ #include #include diff --git a/target/linux/generic-2.6/patches/903-hostap_txpower.patch b/target/linux/generic-2.6/patches/903-hostap_txpower.patch index 6f82cdb033..474fbeea0b 100644 --- a/target/linux/generic-2.6/patches/903-hostap_txpower.patch +++ b/target/linux/generic-2.6/patches/903-hostap_txpower.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_ap.c linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_ap.c ---- linux-2.6.17/drivers/net/wireless/hostap/hostap_ap.c 2006-06-18 04:49:35.000000000 +0300 -+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_ap.c 2006-12-10 19:13:33.000000000 +0200 -@@ -2345,13 +2345,13 @@ +Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap_ap.c +=================================================================== +--- linux-2.6.21.7.orig/drivers/net/wireless/hostap/hostap_ap.c ++++ linux-2.6.21.7/drivers/net/wireless/hostap/hostap_ap.c +@@ -2346,13 +2346,13 @@ int prism2_ap_get_sta_qual(local_info_t addr[count].sa_family = ARPHRD_ETHER; memcpy(addr[count].sa_data, sta->addr, ETH_ALEN); if (sta->last_rx_silence == 0) @@ -21,7 +22,7 @@ diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_ap.c linux-2.6.17-patc qual[count].updated = sta->last_rx_updated; sta->last_rx_updated = IW_QUAL_DBM; -@@ -2416,13 +2416,13 @@ +@@ -2417,13 +2417,13 @@ int prism2_ap_translate_scan(struct net_ memset(&iwe, 0, sizeof(iwe)); iwe.cmd = IWEVQUAL; if (sta->last_rx_silence == 0) @@ -41,9 +42,10 @@ diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_ap.c linux-2.6.17-patc iwe.u.qual.updated = sta->last_rx_updated; iwe.len = IW_EV_QUAL_LEN; current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, -diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_config.h linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_config.h ---- linux-2.6.17/drivers/net/wireless/hostap/hostap_config.h 2006-06-18 04:49:35.000000000 +0300 -+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_config.h 2006-12-10 19:13:33.000000000 +0200 +Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap_config.h +=================================================================== +--- linux-2.6.21.7.orig/drivers/net/wireless/hostap/hostap_config.h ++++ linux-2.6.21.7/drivers/net/wireless/hostap/hostap_config.h @@ -47,4 +47,9 @@ */ /* #define PRISM2_NO_STATION_MODES */ @@ -54,32 +56,35 @@ diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_config.h linux-2.6.17- +#define RAW_TXPOWER_SETTING + #endif /* HOSTAP_CONFIG_H */ -diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap.h linux-2.6.17-patched/drivers/net/wireless/hostap/hostap.h ---- linux-2.6.17/drivers/net/wireless/hostap/hostap.h 2006-06-18 04:49:35.000000000 +0300 -+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap.h 2006-12-10 19:20:00.000000000 +0200 -@@ -89,6 +89,7 @@ - extern struct ethtool_ops prism2_ethtool_ops; +Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap.h +=================================================================== +--- linux-2.6.21.7.orig/drivers/net/wireless/hostap/hostap.h ++++ linux-2.6.21.7/drivers/net/wireless/hostap/hostap.h +@@ -90,6 +90,7 @@ extern const struct iw_handler_def hosta + extern const struct ethtool_ops prism2_ethtool_ops; int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); +int hostap_restore_power(struct net_device *dev); #endif /* HOSTAP_H */ -diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_hw.c linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_hw.c ---- linux-2.6.17/drivers/net/wireless/hostap/hostap_hw.c 2006-06-18 04:49:35.000000000 +0300 -+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_hw.c 2006-12-10 19:13:33.000000000 +0200 -@@ -1043,6 +1043,7 @@ - dev->name, local->fragm_threshold); +Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap_hw.c +=================================================================== +--- linux-2.6.21.7.orig/drivers/net/wireless/hostap/hostap_hw.c ++++ linux-2.6.21.7/drivers/net/wireless/hostap/hostap_hw.c +@@ -933,6 +933,7 @@ static int hfa384x_set_rid(struct net_de + prism2_hw_reset(dev); } + hostap_restore_power(dev); return res; } -diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_info.c linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_info.c ---- linux-2.6.17/drivers/net/wireless/hostap/hostap_info.c 2006-06-18 04:49:35.000000000 +0300 -+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_info.c 2006-12-10 19:13:33.000000000 +0200 -@@ -429,6 +429,11 @@ +Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap_info.c +=================================================================== +--- linux-2.6.21.7.orig/drivers/net/wireless/hostap/hostap_info.c ++++ linux-2.6.21.7/drivers/net/wireless/hostap/hostap_info.c +@@ -428,6 +428,11 @@ static void handle_info_queue_linkstatus } /* Get BSSID if we have a valid AP address */ @@ -91,10 +96,11 @@ diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_info.c linux-2.6.17-pa if (connected) { netif_carrier_on(local->dev); netif_carrier_on(local->ddev); -diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_ioctl.c linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_ioctl.c ---- linux-2.6.17/drivers/net/wireless/hostap/hostap_ioctl.c 2006-06-18 04:49:35.000000000 +0300 -+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_ioctl.c 2006-12-10 21:21:03.000000000 +0200 -@@ -1506,23 +1506,20 @@ +Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap_ioctl.c +=================================================================== +--- linux-2.6.21.7.orig/drivers/net/wireless/hostap/hostap_ioctl.c ++++ linux-2.6.21.7/drivers/net/wireless/hostap/hostap_ioctl.c +@@ -1504,23 +1504,20 @@ static int prism2_txpower_hfa386x_to_dBm val = 255; tmp = val; @@ -122,7 +128,7 @@ diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_ioctl.c linux-2.6.17-p return (unsigned char) tmp; } -@@ -4086,3 +4083,35 @@ +@@ -4080,3 +4077,35 @@ int hostap_ioctl(struct net_device *dev, return ret; } diff --git a/target/linux/generic-2.6/patches/903-stddef_include.patch b/target/linux/generic-2.6/patches/903-stddef_include.patch index 9de81aafbb..3b40ced971 100644 --- a/target/linux/generic-2.6/patches/903-stddef_include.patch +++ b/target/linux/generic-2.6/patches/903-stddef_include.patch @@ -1,7 +1,8 @@ -diff -urN linux-2.6.21.1.old/include/linux/stddef.h linux-2.6.21.1.dev/include/linux/stddef.h ---- linux-2.6.21.1.old/include/linux/stddef.h 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/include/linux/stddef.h 2007-05-26 21:29:46.108898864 +0200 -@@ -16,6 +16,7 @@ +Index: linux-2.6.21.7/include/linux/stddef.h +=================================================================== +--- linux-2.6.21.7.orig/include/linux/stddef.h ++++ linux-2.6.21.7/include/linux/stddef.h +@@ -16,6 +16,7 @@ enum { false = 0, true = 1 }; @@ -9,7 +10,7 @@ diff -urN linux-2.6.21.1.old/include/linux/stddef.h linux-2.6.21.1.dev/include/l #undef offsetof #ifdef __compiler_offsetof -@@ -23,6 +24,5 @@ +@@ -23,6 +24,5 @@ enum { #else #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) #endif diff --git a/target/linux/generic-2.6/patches/904-ls_time_locale.patch b/target/linux/generic-2.6/patches/904-ls_time_locale.patch index 175a93ba73..c34e180d13 100644 --- a/target/linux/generic-2.6/patches/904-ls_time_locale.patch +++ b/target/linux/generic-2.6/patches/904-ls_time_locale.patch @@ -1,7 +1,8 @@ -diff -urN linux-2.6.21.1.old/scripts/gen_initramfs_list.sh linux-2.6.21.1.dev/scripts/gen_initramfs_list.sh ---- linux-2.6.21.1.old/scripts/gen_initramfs_list.sh 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/scripts/gen_initramfs_list.sh 2007-05-26 21:32:53.679383816 +0200 -@@ -125,7 +125,7 @@ +Index: linux-2.6.21.7/scripts/gen_initramfs_list.sh +=================================================================== +--- linux-2.6.21.7.orig/scripts/gen_initramfs_list.sh ++++ linux-2.6.21.7/scripts/gen_initramfs_list.sh +@@ -125,7 +125,7 @@ parse() { str="${ftype} ${name} ${location} ${str}" ;; "nod") @@ -10,7 +11,7 @@ diff -urN linux-2.6.21.1.old/scripts/gen_initramfs_list.sh linux-2.6.21.1.dev/sc local maj=`field 5 ${dev}` local min=`field 6 ${dev}` maj=${maj%,} -@@ -135,7 +135,7 @@ +@@ -135,7 +135,7 @@ parse() { str="${ftype} ${name} ${str} ${dev} ${maj} ${min}" ;; "slink")