ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-20 14:13:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

generic-2.6/2.6.21: refresh patches

Browse Source 
SVN-Revision: 14453
This commit is contained in:
Gabor Juhos 2009-02-08 19:33:57 +00:00
parent 1200d62f66
commit 29e1ac054c
44 changed files with 280 additions and 630 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
target/linux/generic-2.6/patches-2.6.21/001-squashfs.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/fs/Kconfig --- a/fs/Kconfig
=================================================================== +++ b/fs/Kconfig
--- linux-2.6.21.7.orig/fs/Kconfig
+++ linux-2.6.21.7/fs/Kconfig
@@ -1371,6 +1371,71 @@ config CRAMFS @@ -1371,6 +1371,71 @@ config CRAMFS
If unsure, say N. If unsure, say N.
@ -74,10 +72,8 @@ Index: linux-2.6.21.7/fs/Kconfig
config VXFS_FS config VXFS_FS
tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)" tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
depends on BLOCK depends on BLOCK
Index: linux-2.6.21.7/fs/Makefile --- a/fs/Makefile
=================================================================== +++ b/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/ @@ -68,6 +68,7 @@ obj-$(CONFIG_JBD) += jbd/
obj-$(CONFIG_JBD2) += jbd2/ obj-$(CONFIG_JBD2) += jbd2/
obj-$(CONFIG_EXT2_FS) += ext2/ obj-$(CONFIG_EXT2_FS) += ext2/
@ -86,10 +82,8 @@ Index: linux-2.6.21.7/fs/Makefile
obj-$(CONFIG_RAMFS) += ramfs/ obj-$(CONFIG_RAMFS) += ramfs/
obj-$(CONFIG_HUGETLBFS) += hugetlbfs/ obj-$(CONFIG_HUGETLBFS) += hugetlbfs/
obj-$(CONFIG_CODA_FS) += coda/ obj-$(CONFIG_CODA_FS) += coda/
Index: linux-2.6.21.7/fs/squashfs/inode.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/fs/squashfs/inode.c +++ b/fs/squashfs/inode.c
@@ -0,0 +1,2124 @@ @@ -0,0 +1,2124 @@
+/* +/*
+ * Squashfs - a compressed read only filesystem for Linux + * Squashfs - a compressed read only filesystem for Linux
@ -2215,10 +2209,8 @@ Index: linux-2.6.21.7/fs/squashfs/inode.c
+MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem"); +MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem");
+MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>"); +MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
Index: linux-2.6.21.7/fs/squashfs/Makefile
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/fs/squashfs/Makefile +++ b/fs/squashfs/Makefile
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
+# +#
+# Makefile for the linux squashfs routines. +# Makefile for the linux squashfs routines.
@ -2227,10 +2219,8 @@ Index: linux-2.6.21.7/fs/squashfs/Makefile
+obj-$(CONFIG_SQUASHFS) += squashfs.o +obj-$(CONFIG_SQUASHFS) += squashfs.o
+squashfs-y += inode.o +squashfs-y += inode.o
+squashfs-y += squashfs2_0.o +squashfs-y += squashfs2_0.o
Index: linux-2.6.21.7/fs/squashfs/squashfs2_0.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/fs/squashfs/squashfs2_0.c +++ b/fs/squashfs/squashfs2_0.c
@@ -0,0 +1,758 @@ @@ -0,0 +1,758 @@
+/* +/*
+ * Squashfs - a compressed read only filesystem for Linux + * Squashfs - a compressed read only filesystem for Linux
@ -2990,10 +2980,8 @@ Index: linux-2.6.21.7/fs/squashfs/squashfs2_0.c
+ +
+ return 1; + return 1;
+} +}
Index: linux-2.6.21.7/fs/squashfs/squashfs.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/fs/squashfs/squashfs.h +++ b/fs/squashfs/squashfs.h
@@ -0,0 +1,86 @@ @@ -0,0 +1,86 @@
+/* +/*
+ * Squashfs - a compressed read only filesystem for Linux + * Squashfs - a compressed read only filesystem for Linux
@ -3081,10 +3069,8 @@ Index: linux-2.6.21.7/fs/squashfs/squashfs.h
+ return 0; + return 0;
+} +}
+#endif +#endif
Index: linux-2.6.21.7/include/linux/squashfs_fs.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/squashfs_fs.h +++ b/include/linux/squashfs_fs.h
@@ -0,0 +1,911 @@ @@ -0,0 +1,911 @@
+#ifndef SQUASHFS_FS +#ifndef SQUASHFS_FS
+#define SQUASHFS_FS +#define SQUASHFS_FS
@ -3997,10 +3983,8 @@ Index: linux-2.6.21.7/include/linux/squashfs_fs.h
+ +
+#endif +#endif
+#endif +#endif
Index: linux-2.6.21.7/include/linux/squashfs_fs_i.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/squashfs_fs_i.h +++ b/include/linux/squashfs_fs_i.h
@@ -0,0 +1,45 @@ @@ -0,0 +1,45 @@
+#ifndef SQUASHFS_FS_I +#ifndef SQUASHFS_FS_I
+#define SQUASHFS_FS_I +#define SQUASHFS_FS_I
@ -4047,10 +4031,8 @@ Index: linux-2.6.21.7/include/linux/squashfs_fs_i.h
+ struct inode vfs_inode; + struct inode vfs_inode;
+}; +};
+#endif +#endif
Index: linux-2.6.21.7/include/linux/squashfs_fs_sb.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/squashfs_fs_sb.h +++ b/include/linux/squashfs_fs_sb.h
@@ -0,0 +1,74 @@ @@ -0,0 +1,74 @@
+#ifndef SQUASHFS_FS_SB +#ifndef SQUASHFS_FS_SB
+#define SQUASHFS_FS_SB +#define SQUASHFS_FS_SB
@ -4126,10 +4108,8 @@ Index: linux-2.6.21.7/include/linux/squashfs_fs_sb.h
+ int (*read_fragment_index_table)(struct super_block *s); + int (*read_fragment_index_table)(struct super_block *s);
+}; +};
+#endif +#endif
Index: linux-2.6.21.7/init/do_mounts_rd.c --- a/init/do_mounts_rd.c
=================================================================== +++ b/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 @@ @@ -5,6 +5,7 @@
#include <linux/ext2_fs.h> #include <linux/ext2_fs.h>
#include <linux/romfs_fs.h> #include <linux/romfs_fs.h>

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

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/include/linux/LzmaDecode.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/LzmaDecode.h +++ b/include/linux/LzmaDecode.h
@@ -0,0 +1,100 @@ @@ -0,0 +1,100 @@
+/* +/*
+ LzmaDecode.h + LzmaDecode.h
@ -103,10 +101,8 @@ Index: linux-2.6.21.7/include/linux/LzmaDecode.h
+ UInt32 *outSizeProcessed); + UInt32 *outSizeProcessed);
+ +
+#endif +#endif
Index: linux-2.6.21.7/lib/LzmaDecode.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/lib/LzmaDecode.c +++ b/lib/LzmaDecode.c
@@ -0,0 +1,663 @@ @@ -0,0 +1,663 @@
+/* +/*
+ LzmaDecode.c + LzmaDecode.c
@ -771,10 +767,8 @@ Index: linux-2.6.21.7/lib/LzmaDecode.c
+ *outSizeProcessed = nowPos; + *outSizeProcessed = nowPos;
+ return LZMA_RESULT_OK; + return LZMA_RESULT_OK;
+} +}
Index: linux-2.6.21.7/lib/Makefile --- a/lib/Makefile
=================================================================== +++ b/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 @@ -12,7 +12,7 @@ lib-$(CONFIG_SMP) += cpumask.o
lib-y += kobject.o kref.o kobject_uevent.o klist.o lib-y += kobject.o kref.o kobject_uevent.o klist.o

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

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/fs/squashfs/inode.c --- a/fs/squashfs/inode.c
=================================================================== +++ b/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 @@ @@ -4,6 +4,9 @@
* Copyright (c) 2002, 2003, 2004, 2005, 2006 * Copyright (c) 2002, 2003, 2004, 2005, 2006
* Phillip Lougher <phillip@lougher.org.uk> * Phillip Lougher <phillip@lougher.org.uk>

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

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/Makefile --- a/Makefile
=================================================================== +++ b/Makefile
--- linux-2.6.21.7.orig/Makefile
+++ linux-2.6.21.7/Makefile
@@ -507,6 +507,9 @@ CFLAGS += $(call cc-option, -fn @@ -507,6 +507,9 @@ CFLAGS += $(call cc-option, -fn
NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include) NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
CHECKFLAGS += $(NOSTDINC_FLAGS) CHECKFLAGS += $(NOSTDINC_FLAGS)

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

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/include/asm-mips/system.h --- a/include/asm-mips/system.h
=================================================================== +++ b/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 @@ -188,7 +188,7 @@ extern __u64 __xchg_u64_unsupported_on_3
if something tries to do an invalid xchg(). */ if something tries to do an invalid xchg(). */
extern void __xchg_called_with_bad_pointer(void); extern void __xchg_called_with_bad_pointer(void);

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

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/drivers/mtd/chips/cfi_cmdset_0002.c --- a/drivers/mtd/chips/cfi_cmdset_0002.c
=================================================================== +++ b/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 @@ @@ -51,6 +51,7 @@
#define SST49LF040B 0x0050 #define SST49LF040B 0x0050
#define SST49LF008A 0x005a #define SST49LF008A 0x005a

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

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/drivers/mtd/chips/cfi_cmdset_0001.c --- a/drivers/mtd/chips/cfi_cmdset_0001.c
=================================================================== +++ b/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 @@ -919,7 +919,7 @@ static void __xipram xip_enable(struct m
static int __xipram xip_wait_for_operation( static int __xipram xip_wait_for_operation(

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

@ -1,16 +1,12 @@
Index: linux-2.6.21.7/fs/squashfs/Makefile --- a/fs/squashfs/Makefile
=================================================================== +++ b/fs/squashfs/Makefile
--- linux-2.6.21.7.orig/fs/squashfs/Makefile
+++ linux-2.6.21.7/fs/squashfs/Makefile
@@ -4,4 +4,3 @@ @@ -4,4 +4,3 @@
obj-$(CONFIG_SQUASHFS) += squashfs.o obj-$(CONFIG_SQUASHFS) += squashfs.o
squashfs-y += inode.o squashfs-y += inode.o
-squashfs-y += squashfs2_0.o -squashfs-y += squashfs2_0.o
Index: linux-2.6.21.7/fs/squashfs/squashfs.h --- a/fs/squashfs/squashfs.h
=================================================================== +++ b/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 @@ @@ -24,6 +24,9 @@
#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY #ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
#undef CONFIG_SQUASHFS_1_0_COMPATIBILITY #undef CONFIG_SQUASHFS_1_0_COMPATIBILITY

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

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/arch/mips/kernel/head.S --- a/arch/mips/kernel/head.S
=================================================================== +++ b/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 @@ @@ -129,11 +129,15 @@
#endif #endif
.endm .endm

6
target/linux/generic-2.6/patches-2.6.21/012-mips_cpu_tlb.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/arch/mips/mm/tlbex.c --- a/arch/mips/mm/tlbex.c
=================================================================== +++ b/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 @@ -887,7 +887,6 @@ static __init void build_tlb_write_entry
case CPU_R10000: case CPU_R10000:
case CPU_R12000: case CPU_R12000:

16
target/linux/generic-2.6/patches-2.6.21/013-mips_generic_gpio_support.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/arch/mips/defconfig --- a/arch/mips/defconfig
=================================================================== +++ b/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 @@ -69,6 +69,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_CALIBRATE_DELAY=y
@ -10,10 +8,8 @@ Index: linux-2.6.21.7/arch/mips/defconfig
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
CONFIG_ARC=y CONFIG_ARC=y
Index: linux-2.6.21.7/arch/mips/Kconfig --- a/arch/mips/Kconfig
=================================================================== +++ b/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 @@ -869,6 +869,10 @@ config GENERIC_TIME
bool bool
default y default y
@ -25,10 +21,8 @@ Index: linux-2.6.21.7/arch/mips/Kconfig
config SCHED_NO_NO_OMIT_FRAME_POINTER config SCHED_NO_NO_OMIT_FRAME_POINTER
bool bool
default y default y
Index: linux-2.6.21.7/include/asm-mips/gpio.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/asm-mips/gpio.h +++ b/include/asm-mips/gpio.h
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
+#ifndef _ASM_MIPS_GPIO_H +#ifndef _ASM_MIPS_GPIO_H
+#define _ASM_MIPS_GPIO_H +#define _ASM_MIPS_GPIO_H

12
target/linux/generic-2.6/patches-2.6.21/060-rootfs_split.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/drivers/mtd/Kconfig --- a/drivers/mtd/Kconfig
=================================================================== +++ b/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 @@ -49,6 +49,16 @@ config MTD_PARTITIONS
devices. Partitioning on NFTL 'devices' is a different - that's the devices. Partitioning on NFTL 'devices' is a different - that's the
'normal' form of partitioning used on a block device. 'normal' form of partitioning used on a block device.
@ -19,10 +17,8 @@ Index: linux-2.6.21.7/drivers/mtd/Kconfig
config MTD_REDBOOT_PARTS config MTD_REDBOOT_PARTS
tristate "RedBoot partition table parsing" tristate "RedBoot partition table parsing"
depends on MTD_PARTITIONS depends on MTD_PARTITIONS
Index: linux-2.6.21.7/drivers/mtd/mtdpart.c --- a/drivers/mtd/mtdpart.c
=================================================================== +++ b/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 @@ @@ -20,6 +20,8 @@
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>

6
target/linux/generic-2.6/patches-2.6.21/065-block2mtd_init.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/drivers/mtd/devices/block2mtd.c --- a/drivers/mtd/devices/block2mtd.c
=================================================================== +++ b/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 @@ @@ -16,6 +16,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/init.h> #include <linux/init.h>

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

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

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

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

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

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ipt_ipp2p.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/netfilter_ipv4/ipt_ipp2p.h +++ b/include/linux/netfilter_ipv4/ipt_ipp2p.h
@@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
+#ifndef __IPT_IPP2P_H +#ifndef __IPT_IPP2P_H
+#define __IPT_IPP2P_H +#define __IPT_IPP2P_H
@ -34,10 +32,8 @@ Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ipt_ipp2p.h
+#define IPP2P_MUTE (1 << 14) +#define IPP2P_MUTE (1 << 14)
+#define IPP2P_WASTE (1 << 15) +#define IPP2P_WASTE (1 << 15)
+#define IPP2P_XDCC (1 << 16) +#define IPP2P_XDCC (1 << 16)
Index: linux-2.6.21.7/net/ipv4/netfilter/ipt_ipp2p.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/net/ipv4/netfilter/ipt_ipp2p.c +++ b/net/ipv4/netfilter/ipt_ipp2p.c
@@ -0,0 +1,882 @@ @@ -0,0 +1,882 @@
+#if defined(MODVERSIONS) +#if defined(MODVERSIONS)
+#include <linux/modversions.h> +#include <linux/modversions.h>
@ -921,10 +917,8 @@ Index: linux-2.6.21.7/net/ipv4/netfilter/ipt_ipp2p.c
+module_exit(fini); +module_exit(fini);
+ +
+ +
Index: linux-2.6.21.7/net/ipv4/netfilter/Kconfig --- a/net/ipv4/netfilter/Kconfig
=================================================================== +++ b/net/ipv4/netfilter/Kconfig
--- linux-2.6.21.7.orig/net/ipv4/netfilter/Kconfig
+++ linux-2.6.21.7/net/ipv4/netfilter/Kconfig
@@ -245,6 +245,12 @@ config IP_NF_MATCH_IPRANGE @@ -245,6 +245,12 @@ config IP_NF_MATCH_IPRANGE
To compile it as a module, choose M here. If unsure, say N. To compile it as a module, choose M here. If unsure, say N.
@ -938,10 +932,8 @@ Index: linux-2.6.21.7/net/ipv4/netfilter/Kconfig
config IP_NF_MATCH_TOS config IP_NF_MATCH_TOS
tristate "TOS match support" tristate "TOS match support"
depends on IP_NF_IPTABLES depends on IP_NF_IPTABLES
Index: linux-2.6.21.7/net/ipv4/netfilter/Makefile --- a/net/ipv4/netfilter/Makefile
=================================================================== +++ b/net/ipv4/netfilter/Makefile
--- linux-2.6.21.7.orig/net/ipv4/netfilter/Makefile
+++ linux-2.6.21.7/net/ipv4/netfilter/Makefile
@@ -91,6 +91,7 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn @@ -91,6 +91,7 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn
obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o

16
target/linux/generic-2.6/patches-2.6.21/120-openswan-2.4.0.kernel-2.6-natt.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/include/net/xfrmudp.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/net/xfrmudp.h +++ b/include/net/xfrmudp.h
@@ -0,0 +1,10 @@ @@ -0,0 +1,10 @@
+/* +/*
+ * pointer to function for type that xfrm4_input wants, to permit + * pointer to function for type that xfrm4_input wants, to permit
@ -13,10 +11,8 @@ Index: linux-2.6.21.7/include/net/xfrmudp.h
+extern int udp4_register_esp_rcvencap(xfrm4_rcv_encap_t func +extern int udp4_register_esp_rcvencap(xfrm4_rcv_encap_t func
+ , xfrm4_rcv_encap_t *oldfunc); + , xfrm4_rcv_encap_t *oldfunc);
+extern int udp4_unregister_esp_rcvencap(xfrm4_rcv_encap_t func); +extern int udp4_unregister_esp_rcvencap(xfrm4_rcv_encap_t func);
Index: linux-2.6.21.7/net/ipv4/Kconfig --- a/net/ipv4/Kconfig
=================================================================== +++ b/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 @@ -266,6 +266,12 @@ config NET_IPGRE_BROADCAST
Network), but can be distributed all over the Internet. If you want Network), but can be distributed all over the Internet. If you want
to do that, say Y here and to "IP multicast routing" below. to do that, say Y here and to "IP multicast routing" below.
@ -30,10 +26,8 @@ Index: linux-2.6.21.7/net/ipv4/Kconfig
config IP_MROUTE config IP_MROUTE
bool "IP: multicast routing" bool "IP: multicast routing"
depends on IP_MULTICAST depends on IP_MULTICAST
Index: linux-2.6.21.7/net/ipv4/udp.c --- a/net/ipv4/udp.c
=================================================================== +++ b/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 @@ @@ -101,12 +101,15 @@
#include <net/route.h> #include <net/route.h>
#include <net/checksum.h> #include <net/checksum.h>

106
target/linux/generic-2.6/patches-2.6.21/130-netfilter_ipset.patch
View File

@ -1,6 +1,6 @@
--- a/include/linux/netfilter_ipv4/Kbuild --- a/include/linux/netfilter_ipv4/Kbuild
+++ b/include/linux/netfilter_ipv4/Kbuild +++ b/include/linux/netfilter_ipv4/Kbuild
@@ -59,3 +59,14 @@ @@ -59,3 +59,14 @@ unifdef-y += ip_nat.h
unifdef-y += ip_nat_rule.h unifdef-y += ip_nat_rule.h
unifdef-y += ip_queue.h unifdef-y += ip_queue.h
unifdef-y += ip_tables.h unifdef-y += ip_tables.h
@ -15,10 +15,8 @@
+header-y += ip_set_macipmap.h +header-y += ip_set_macipmap.h
+unifdef-y += ip_set_nethash.h +unifdef-y += ip_set_nethash.h
+header-y += ip_set_portmap.h +header-y += ip_set_portmap.h
Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set.h +++ b/include/linux/netfilter_ipv4/ip_set.h
@@ -0,0 +1,498 @@ @@ -0,0 +1,498 @@
+#ifndef _IP_SET_H +#ifndef _IP_SET_H
+#define _IP_SET_H +#define _IP_SET_H
@ -518,10 +516,8 @@ Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set.h
+#endif /* __KERNEL__ */ +#endif /* __KERNEL__ */
+ +
+#endif /*_IP_SET_H*/ +#endif /*_IP_SET_H*/
Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_iphash.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_iphash.h +++ b/include/linux/netfilter_ipv4/ip_set_iphash.h
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
+#ifndef __IP_SET_IPHASH_H +#ifndef __IP_SET_IPHASH_H
+#define __IP_SET_IPHASH_H +#define __IP_SET_IPHASH_H
@ -553,10 +549,8 @@ Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_iphash.h
+}; +};
+ +
+#endif /* __IP_SET_IPHASH_H */ +#endif /* __IP_SET_IPHASH_H */
Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_ipmap.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_ipmap.h +++ b/include/linux/netfilter_ipv4/ip_set_ipmap.h
@@ -0,0 +1,56 @@ @@ -0,0 +1,56 @@
+#ifndef __IP_SET_IPMAP_H +#ifndef __IP_SET_IPMAP_H
+#define __IP_SET_IPMAP_H +#define __IP_SET_IPMAP_H
@ -614,10 +608,8 @@ Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_ipmap.h
+} +}
+ +
+#endif /* __IP_SET_IPMAP_H */ +#endif /* __IP_SET_IPMAP_H */
Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_ipporthash.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_ipporthash.h +++ b/include/linux/netfilter_ipv4/ip_set_ipporthash.h
@@ -0,0 +1,34 @@ @@ -0,0 +1,34 @@
+#ifndef __IP_SET_IPPORTHASH_H +#ifndef __IP_SET_IPPORTHASH_H
+#define __IP_SET_IPPORTHASH_H +#define __IP_SET_IPPORTHASH_H
@ -653,10 +645,8 @@ Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_ipporthash.h
+}; +};
+ +
+#endif /* __IP_SET_IPPORTHASH_H */ +#endif /* __IP_SET_IPPORTHASH_H */
Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_iptree.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_iptree.h +++ b/include/linux/netfilter_ipv4/ip_set_iptree.h
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+#ifndef __IP_SET_IPTREE_H +#ifndef __IP_SET_IPTREE_H
+#define __IP_SET_IPTREE_H +#define __IP_SET_IPTREE_H
@ -698,10 +688,8 @@ Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_iptree.h
+}; +};
+ +
+#endif /* __IP_SET_IPTREE_H */ +#endif /* __IP_SET_IPTREE_H */
Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_iptreemap.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_iptreemap.h +++ b/include/linux/netfilter_ipv4/ip_set_iptreemap.h
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+#ifndef __IP_SET_IPTREEMAP_H +#ifndef __IP_SET_IPTREEMAP_H
+#define __IP_SET_IPTREEMAP_H +#define __IP_SET_IPTREEMAP_H
@ -743,10 +731,8 @@ Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_iptreemap.h
+}; +};
+ +
+#endif /* __IP_SET_IPTREEMAP_H */ +#endif /* __IP_SET_IPTREEMAP_H */
Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_jhash.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_jhash.h +++ b/include/linux/netfilter_ipv4/ip_set_jhash.h
@@ -0,0 +1,148 @@ @@ -0,0 +1,148 @@
+#ifndef _LINUX_IPSET_JHASH_H +#ifndef _LINUX_IPSET_JHASH_H
+#define _LINUX_IPSET_JHASH_H +#define _LINUX_IPSET_JHASH_H
@ -896,10 +882,8 @@ Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_jhash.h
+} +}
+ +
+#endif /* _LINUX_IPSET_JHASH_H */ +#endif /* _LINUX_IPSET_JHASH_H */
Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_macipmap.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_macipmap.h +++ b/include/linux/netfilter_ipv4/ip_set_macipmap.h
@@ -0,0 +1,38 @@ @@ -0,0 +1,38 @@
+#ifndef __IP_SET_MACIPMAP_H +#ifndef __IP_SET_MACIPMAP_H
+#define __IP_SET_MACIPMAP_H +#define __IP_SET_MACIPMAP_H
@ -939,10 +923,8 @@ Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_macipmap.h
+}; +};
+ +
+#endif /* __IP_SET_MACIPMAP_H */ +#endif /* __IP_SET_MACIPMAP_H */
Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_malloc.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_malloc.h +++ b/include/linux/netfilter_ipv4/ip_set_malloc.h
@@ -0,0 +1,116 @@ @@ -0,0 +1,116 @@
+#ifndef _IP_SET_MALLOC_H +#ifndef _IP_SET_MALLOC_H
+#define _IP_SET_MALLOC_H +#define _IP_SET_MALLOC_H
@ -1060,10 +1042,8 @@ Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_malloc.h
+#endif /* __KERNEL__ */ +#endif /* __KERNEL__ */
+ +
+#endif /*_IP_SET_MALLOC_H*/ +#endif /*_IP_SET_MALLOC_H*/
Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_nethash.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_nethash.h +++ b/include/linux/netfilter_ipv4/ip_set_nethash.h
@@ -0,0 +1,55 @@ @@ -0,0 +1,55 @@
+#ifndef __IP_SET_NETHASH_H +#ifndef __IP_SET_NETHASH_H
+#define __IP_SET_NETHASH_H +#define __IP_SET_NETHASH_H
@ -1120,10 +1100,8 @@ Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_nethash.h
+} +}
+ +
+#endif /* __IP_SET_NETHASH_H */ +#endif /* __IP_SET_NETHASH_H */
Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_portmap.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_portmap.h +++ b/include/linux/netfilter_ipv4/ip_set_portmap.h
@@ -0,0 +1,25 @@ @@ -0,0 +1,25 @@
+#ifndef __IP_SET_PORTMAP_H +#ifndef __IP_SET_PORTMAP_H
+#define __IP_SET_PORTMAP_H +#define __IP_SET_PORTMAP_H
@ -1150,10 +1128,8 @@ Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_set_portmap.h
+}; +};
+ +
+#endif /* __IP_SET_PORTMAP_H */ +#endif /* __IP_SET_PORTMAP_H */
Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ipt_set.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/netfilter_ipv4/ipt_set.h +++ b/include/linux/netfilter_ipv4/ipt_set.h
@@ -0,0 +1,21 @@ @@ -0,0 +1,21 @@
+#ifndef _IPT_SET_H +#ifndef _IPT_SET_H
+#define _IPT_SET_H +#define _IPT_SET_H
@ -1176,10 +1152,8 @@ Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ipt_set.h
+}; +};
+ +
+#endif /*_IPT_SET_H*/ +#endif /*_IPT_SET_H*/
Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/net/ipv4/netfilter/ip_set.c +++ b/net/ipv4/netfilter/ip_set.c
@@ -0,0 +1,2003 @@ @@ -0,0 +1,2003 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu> +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de> + * Patrick Schaaf <bof@bof.de>
@ -3184,10 +3158,8 @@ Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set.c
+ +
+module_init(ip_set_init); +module_init(ip_set_init);
+module_exit(ip_set_fini); +module_exit(ip_set_fini);
Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_iphash.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/net/ipv4/netfilter/ip_set_iphash.c +++ b/net/ipv4/netfilter/ip_set_iphash.c
@@ -0,0 +1,429 @@ @@ -0,0 +1,429 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ * + *
@ -3618,10 +3590,8 @@ Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_iphash.c
+ +
+module_init(ip_set_iphash_init); +module_init(ip_set_iphash_init);
+module_exit(ip_set_iphash_fini); +module_exit(ip_set_iphash_fini);
Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_ipmap.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/net/ipv4/netfilter/ip_set_ipmap.c +++ b/net/ipv4/netfilter/ip_set_ipmap.c
@@ -0,0 +1,336 @@ @@ -0,0 +1,336 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu> +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de> + * Patrick Schaaf <bof@bof.de>
@ -3959,10 +3929,8 @@ Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_ipmap.c
+ +
+module_init(ip_set_ipmap_init); +module_init(ip_set_ipmap_init);
+module_exit(ip_set_ipmap_fini); +module_exit(ip_set_ipmap_fini);
Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_ipporthash.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/net/ipv4/netfilter/ip_set_ipporthash.c +++ b/net/ipv4/netfilter/ip_set_ipporthash.c
@@ -0,0 +1,581 @@ @@ -0,0 +1,581 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ * + *
@ -4545,10 +4513,8 @@ Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_ipporthash.c
+ +
+module_init(ip_set_ipporthash_init); +module_init(ip_set_ipporthash_init);
+module_exit(ip_set_ipporthash_fini); +module_exit(ip_set_ipporthash_fini);
Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_iptree.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/net/ipv4/netfilter/ip_set_iptree.c +++ b/net/ipv4/netfilter/ip_set_iptree.c
@@ -0,0 +1,612 @@ @@ -0,0 +1,612 @@
+/* Copyright (C) 2005 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> +/* Copyright (C) 2005 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ * + *
@ -5162,10 +5128,8 @@ Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_iptree.c
+ +
+module_init(ip_set_iptree_init); +module_init(ip_set_iptree_init);
+module_exit(ip_set_iptree_fini); +module_exit(ip_set_iptree_fini);
Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_iptreemap.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/net/ipv4/netfilter/ip_set_iptreemap.c +++ b/net/ipv4/netfilter/ip_set_iptreemap.c
@@ -0,0 +1,829 @@ @@ -0,0 +1,829 @@
+/* Copyright (C) 2007 Sven Wegener <sven.wegener@stealer.net> +/* Copyright (C) 2007 Sven Wegener <sven.wegener@stealer.net>
+ * + *
@ -5996,10 +5960,8 @@ Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_iptreemap.c
+ +
+module_init(ip_set_iptreemap_init); +module_init(ip_set_iptreemap_init);
+module_exit(ip_set_iptreemap_fini); +module_exit(ip_set_iptreemap_fini);
Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_macipmap.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/net/ipv4/netfilter/ip_set_macipmap.c +++ b/net/ipv4/netfilter/ip_set_macipmap.c
@@ -0,0 +1,375 @@ @@ -0,0 +1,375 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu> +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de> + * Patrick Schaaf <bof@bof.de>
@ -6376,10 +6338,8 @@ Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_macipmap.c
+ +
+module_init(ip_set_macipmap_init); +module_init(ip_set_macipmap_init);
+module_exit(ip_set_macipmap_fini); +module_exit(ip_set_macipmap_fini);
Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_nethash.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/net/ipv4/netfilter/ip_set_nethash.c +++ b/net/ipv4/netfilter/ip_set_nethash.c
@@ -0,0 +1,497 @@ @@ -0,0 +1,497 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ * + *
@ -6878,10 +6838,8 @@ Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_nethash.c
+ +
+module_init(ip_set_nethash_init); +module_init(ip_set_nethash_init);
+module_exit(ip_set_nethash_fini); +module_exit(ip_set_nethash_fini);
Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_portmap.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/net/ipv4/netfilter/ip_set_portmap.c +++ b/net/ipv4/netfilter/ip_set_portmap.c
@@ -0,0 +1,346 @@ @@ -0,0 +1,346 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ * + *
@ -7229,10 +7187,8 @@ Index: linux-2.6.21.7/net/ipv4/netfilter/ip_set_portmap.c
+ +
+module_init(ip_set_portmap_init); +module_init(ip_set_portmap_init);
+module_exit(ip_set_portmap_fini); +module_exit(ip_set_portmap_fini);
Index: linux-2.6.21.7/net/ipv4/netfilter/ipt_set.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/net/ipv4/netfilter/ipt_set.c +++ b/net/ipv4/netfilter/ipt_set.c
@@ -0,0 +1,160 @@ @@ -0,0 +1,160 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu> +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de> + * Patrick Schaaf <bof@bof.de>
@ -7394,10 +7350,8 @@ Index: linux-2.6.21.7/net/ipv4/netfilter/ipt_set.c
+ +
+module_init(ipt_ipset_init); +module_init(ipt_ipset_init);
+module_exit(ipt_ipset_fini); +module_exit(ipt_ipset_fini);
Index: linux-2.6.21.7/net/ipv4/netfilter/ipt_SET.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/net/ipv4/netfilter/ipt_SET.c +++ b/net/ipv4/netfilter/ipt_SET.c
@@ -0,0 +1,172 @@ @@ -0,0 +1,172 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu> +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de> + * Patrick Schaaf <bof@bof.de>
@ -7571,10 +7525,8 @@ Index: linux-2.6.21.7/net/ipv4/netfilter/ipt_SET.c
+ +
+module_init(ipt_SET_init); +module_init(ipt_SET_init);
+module_exit(ipt_SET_fini); +module_exit(ipt_SET_fini);
Index: linux-2.6.21.7/net/ipv4/netfilter/Kconfig --- a/net/ipv4/netfilter/Kconfig
=================================================================== +++ b/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 @@ -663,5 +663,122 @@ config IP_NF_ARP_MANGLE
Allows altering the ARP packet payload: source and destination Allows altering the ARP packet payload: source and destination
hardware and network addresses. hardware and network addresses.
@ -7698,10 +7650,8 @@ Index: linux-2.6.21.7/net/ipv4/netfilter/Kconfig
+ +
endmenu endmenu
Index: linux-2.6.21.7/net/ipv4/netfilter/Makefile --- a/net/ipv4/netfilter/Makefile
=================================================================== +++ b/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_ @@ -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_ECN) += ipt_ecn.o
obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o

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

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ipt_time.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/netfilter_ipv4/ipt_time.h +++ b/include/linux/netfilter_ipv4/ipt_time.h
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
+#ifndef __ipt_time_h_included__ +#ifndef __ipt_time_h_included__
+#define __ipt_time_h_included__ +#define __ipt_time_h_included__
@ -21,10 +19,8 @@ Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ipt_time.h
+ +
+ +
+#endif /* __ipt_time_h_included__ */ +#endif /* __ipt_time_h_included__ */
Index: linux-2.6.21.7/net/ipv4/netfilter/ipt_time.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/net/ipv4/netfilter/ipt_time.c +++ b/net/ipv4/netfilter/ipt_time.c
@@ -0,0 +1,178 @@ @@ -0,0 +1,178 @@
+/* +/*
+ This is a module which is used for time matching + This is a module which is used for time matching
@ -204,10 +200,8 @@ Index: linux-2.6.21.7/net/ipv4/netfilter/ipt_time.c
+ r->tm_mon=i; + r->tm_mon=i;
+ r->tm_mday=work-__spm[i]+1; + r->tm_mday=work-__spm[i]+1;
+} +}
Index: linux-2.6.21.7/net/ipv4/netfilter/Kconfig --- a/net/ipv4/netfilter/Kconfig
=================================================================== +++ b/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 @@ -260,6 +260,22 @@ config IP_NF_MATCH_TOS
To compile it as a module, choose M here. If unsure, say N. To compile it as a module, choose M here. If unsure, say N.
@ -231,10 +225,8 @@ Index: linux-2.6.21.7/net/ipv4/netfilter/Kconfig
config IP_NF_MATCH_RECENT config IP_NF_MATCH_RECENT
tristate "recent match support" tristate "recent match support"
depends on IP_NF_IPTABLES depends on IP_NF_IPTABLES
Index: linux-2.6.21.7/net/ipv4/netfilter/Makefile --- a/net/ipv4/netfilter/Makefile
=================================================================== +++ b/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 @@ -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_IPRANGE) += ipt_iprange.o
obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_owner.o obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_owner.o

84
target/linux/generic-2.6/patches-2.6.21/150-netfilter_imq.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/drivers/net/imq.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/drivers/net/imq.c +++ b/drivers/net/imq.c
@@ -0,0 +1,402 @@ @@ -0,0 +1,402 @@
+/* +/*
+ * Pseudo-driver for the intermediate queue device. + * Pseudo-driver for the intermediate queue device.
@ -405,10 +403,8 @@ Index: linux-2.6.21.7/drivers/net/imq.c
+MODULE_AUTHOR("http://www.linuximq.net"); +MODULE_AUTHOR("http://www.linuximq.net");
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information."); +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
Index: linux-2.6.21.7/drivers/net/Kconfig --- a/drivers/net/Kconfig
=================================================================== +++ b/drivers/net/Kconfig
--- linux-2.6.21.7.orig/drivers/net/Kconfig
+++ linux-2.6.21.7/drivers/net/Kconfig
@@ -96,6 +96,129 @@ config EQUALIZER @@ -96,6 +96,129 @@ config EQUALIZER
To compile this driver as a module, choose M here: the module To compile this driver as a module, choose M here: the module
will be called eql. If unsure, say N. will be called eql. If unsure, say N.
@ -539,10 +535,8 @@ Index: linux-2.6.21.7/drivers/net/Kconfig
config TUN config TUN
tristate "Universal TUN/TAP device driver support" tristate "Universal TUN/TAP device driver support"
select CRC32 select CRC32
Index: linux-2.6.21.7/drivers/net/Makefile --- a/drivers/net/Makefile
=================================================================== +++ b/drivers/net/Makefile
--- 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 @@ -124,6 +124,7 @@ obj-$(CONFIG_SLIP) += slip.o
obj-$(CONFIG_SLHC) += slhc.o obj-$(CONFIG_SLHC) += slhc.o
@ -551,10 +545,8 @@ Index: linux-2.6.21.7/drivers/net/Makefile
obj-$(CONFIG_IFB) += ifb.o obj-$(CONFIG_IFB) += ifb.o
obj-$(CONFIG_DE600) += de600.o obj-$(CONFIG_DE600) += de600.o
obj-$(CONFIG_DE620) += de620.o obj-$(CONFIG_DE620) += de620.o
Index: linux-2.6.21.7/include/linux/imq.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/imq.h +++ b/include/linux/imq.h
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
+#ifndef _IMQ_H +#ifndef _IMQ_H
+#define _IMQ_H +#define _IMQ_H
@ -565,10 +557,8 @@ Index: linux-2.6.21.7/include/linux/imq.h
+#define IMQ_F_ENQUEUE 0x80 +#define IMQ_F_ENQUEUE 0x80
+ +
+#endif /* _IMQ_H */ +#endif /* _IMQ_H */
Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ipt_IMQ.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/netfilter_ipv4/ipt_IMQ.h +++ b/include/linux/netfilter_ipv4/ipt_IMQ.h
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
+#ifndef _IPT_IMQ_H +#ifndef _IPT_IMQ_H
+#define _IPT_IMQ_H +#define _IPT_IMQ_H
@ -578,10 +568,8 @@ Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ipt_IMQ.h
+}; +};
+ +
+#endif /* _IPT_IMQ_H */ +#endif /* _IPT_IMQ_H */
Index: linux-2.6.21.7/include/linux/netfilter_ipv6/ip6t_IMQ.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/netfilter_ipv6/ip6t_IMQ.h +++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
+#ifndef _IP6T_IMQ_H +#ifndef _IP6T_IMQ_H
+#define _IP6T_IMQ_H +#define _IP6T_IMQ_H
@ -591,10 +579,8 @@ Index: linux-2.6.21.7/include/linux/netfilter_ipv6/ip6t_IMQ.h
+}; +};
+ +
+#endif /* _IP6T_IMQ_H */ +#endif /* _IP6T_IMQ_H */
Index: linux-2.6.21.7/include/linux/skbuff.h --- a/include/linux/skbuff.h
=================================================================== +++ b/include/linux/skbuff.h
--- 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 { @@ -294,6 +294,10 @@ struct sk_buff {
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
struct sk_buff *nfct_reasm; struct sk_buff *nfct_reasm;
@ -606,10 +592,8 @@ Index: linux-2.6.21.7/include/linux/skbuff.h
#ifdef CONFIG_BRIDGE_NETFILTER #ifdef CONFIG_BRIDGE_NETFILTER
struct nf_bridge_info *nf_bridge; struct nf_bridge_info *nf_bridge;
#endif #endif
Index: linux-2.6.21.7/net/core/dev.c --- a/net/core/dev.c
=================================================================== +++ b/net/core/dev.c
--- linux-2.6.21.7.orig/net/core/dev.c
+++ linux-2.6.21.7/net/core/dev.c
@@ -94,6 +94,9 @@ @@ -94,6 +94,9 @@
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <net/sock.h> #include <net/sock.h>
@ -633,10 +617,8 @@ Index: linux-2.6.21.7/net/core/dev.c
dev_queue_xmit_nit(skb, dev); dev_queue_xmit_nit(skb, dev);
if (netif_needs_gso(dev, skb)) { if (netif_needs_gso(dev, skb)) {
Index: linux-2.6.21.7/net/core/skbuff.c --- a/net/core/skbuff.c
=================================================================== +++ b/net/core/skbuff.c
--- 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 @@ -430,6 +430,10 @@ struct sk_buff *skb_clone(struct sk_buff
C(nfct_reasm); C(nfct_reasm);
nf_conntrack_get_reasm(skb->nfct_reasm); nf_conntrack_get_reasm(skb->nfct_reasm);
@ -659,10 +641,8 @@ Index: linux-2.6.21.7/net/core/skbuff.c
#ifdef CONFIG_BRIDGE_NETFILTER #ifdef CONFIG_BRIDGE_NETFILTER
new->nf_bridge = old->nf_bridge; new->nf_bridge = old->nf_bridge;
nf_bridge_get(old->nf_bridge); nf_bridge_get(old->nf_bridge);
Index: linux-2.6.21.7/net/ipv4/netfilter/ipt_IMQ.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/net/ipv4/netfilter/ipt_IMQ.c +++ b/net/ipv4/netfilter/ipt_IMQ.c
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
+/* +/*
+ * This target marks packets to be enqueued to an imq device + * This target marks packets to be enqueued to an imq device
@ -733,10 +713,8 @@ Index: linux-2.6.21.7/net/ipv4/netfilter/ipt_IMQ.c
+MODULE_AUTHOR("http://www.linuximq.net"); +MODULE_AUTHOR("http://www.linuximq.net");
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information."); +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
Index: linux-2.6.21.7/net/ipv4/netfilter/Kconfig --- a/net/ipv4/netfilter/Kconfig
=================================================================== +++ b/net/ipv4/netfilter/Kconfig
--- 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 @@ -587,6 +587,17 @@ config IP_NF_MANGLE
To compile it as a module, choose M here. If unsure, say N. To compile it as a module, choose M here. If unsure, say N.
@ -755,10 +733,8 @@ Index: linux-2.6.21.7/net/ipv4/netfilter/Kconfig
config IP_NF_TARGET_TOS config IP_NF_TARGET_TOS
tristate "TOS target support" tristate "TOS target support"
depends on IP_NF_MANGLE depends on IP_NF_MANGLE
Index: linux-2.6.21.7/net/ipv4/netfilter/Makefile --- a/net/ipv4/netfilter/Makefile
=================================================================== +++ b/net/ipv4/netfilter/Makefile
--- 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 @@ -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_REJECT) += ipt_REJECT.o
obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
@ -767,10 +743,8 @@ Index: linux-2.6.21.7/net/ipv4/netfilter/Makefile
obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
Index: linux-2.6.21.7/net/ipv6/netfilter/ip6t_IMQ.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/net/ipv6/netfilter/ip6t_IMQ.c +++ b/net/ipv6/netfilter/ip6t_IMQ.c
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
+/* +/*
+ * This target marks packets to be enqueued to an imq device + * This target marks packets to be enqueued to an imq device
@ -841,10 +815,8 @@ Index: linux-2.6.21.7/net/ipv6/netfilter/ip6t_IMQ.c
+MODULE_AUTHOR("http://www.linuximq.net"); +MODULE_AUTHOR("http://www.linuximq.net");
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information."); +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
Index: linux-2.6.21.7/net/ipv6/netfilter/Kconfig --- a/net/ipv6/netfilter/Kconfig
=================================================================== +++ b/net/ipv6/netfilter/Kconfig
--- 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 @@ -173,6 +173,15 @@ config IP6_NF_MANGLE
To compile it as a module, choose M here. If unsure, say N. To compile it as a module, choose M here. If unsure, say N.
@ -861,10 +833,8 @@ Index: linux-2.6.21.7/net/ipv6/netfilter/Kconfig
config IP6_NF_TARGET_HL config IP6_NF_TARGET_HL
tristate 'HL (hoplimit) target support' tristate 'HL (hoplimit) target support'
depends on IP6_NF_MANGLE depends on IP6_NF_MANGLE
Index: linux-2.6.21.7/net/ipv6/netfilter/Makefile --- a/net/ipv6/netfilter/Makefile
=================================================================== +++ b/net/ipv6/netfilter/Makefile
--- 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 @@ -13,6 +13,7 @@ obj-$(CONFIG_IP6_NF_MATCH_EUI64) += ip6t
obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t_owner.o obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t_owner.o
obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
@ -873,10 +843,8 @@ Index: linux-2.6.21.7/net/ipv6/netfilter/Makefile
obj-$(CONFIG_IP6_NF_TARGET_HL) += ip6t_HL.o obj-$(CONFIG_IP6_NF_TARGET_HL) += ip6t_HL.o
obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o
Index: linux-2.6.21.7/net/sched/sch_generic.c --- a/net/sched/sch_generic.c
=================================================================== +++ b/net/sched/sch_generic.c
--- 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 @@ -87,7 +87,6 @@ void qdisc_unlock_tree(struct net_device
NOTE: Called under dev->queue_lock with locally disabled BH. NOTE: Called under dev->queue_lock with locally disabled BH.

46
target/linux/generic-2.6/patches-2.6.21/160-netfilter_route.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ipt_ROUTE.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/netfilter_ipv4/ipt_ROUTE.h +++ b/include/linux/netfilter_ipv4/ipt_ROUTE.h
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
+/* Header file for iptables ipt_ROUTE target +/* Header file for iptables ipt_ROUTE target
+ * + *
@ -26,10 +24,8 @@ Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ipt_ROUTE.h
+#define IPT_ROUTE_TEE 0x02 +#define IPT_ROUTE_TEE 0x02
+ +
+#endif /*_IPT_ROUTE_H_target*/ +#endif /*_IPT_ROUTE_H_target*/
Index: linux-2.6.21.7/include/linux/netfilter_ipv6/ip6t_ROUTE.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/netfilter_ipv6/ip6t_ROUTE.h +++ b/include/linux/netfilter_ipv6/ip6t_ROUTE.h
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
+/* Header file for iptables ip6t_ROUTE target +/* Header file for iptables ip6t_ROUTE target
+ * + *
@ -54,10 +50,8 @@ Index: linux-2.6.21.7/include/linux/netfilter_ipv6/ip6t_ROUTE.h
+#define IP6T_ROUTE_TEE 0x02 +#define IP6T_ROUTE_TEE 0x02
+ +
+#endif /*_IP6T_ROUTE_H_target*/ +#endif /*_IP6T_ROUTE_H_target*/
Index: linux-2.6.21.7/net/ipv4/netfilter/ipt_ROUTE.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/net/ipv4/netfilter/ipt_ROUTE.c +++ b/net/ipv4/netfilter/ipt_ROUTE.c
@@ -0,0 +1,483 @@ @@ -0,0 +1,483 @@
+/* +/*
+ * This implements the ROUTE target, which enables you to setup unusual + * This implements the ROUTE target, which enables you to setup unusual
@ -542,10 +536,8 @@ Index: linux-2.6.21.7/net/ipv4/netfilter/ipt_ROUTE.c
+ +
+module_init(init); +module_init(init);
+module_exit(fini); +module_exit(fini);
Index: linux-2.6.21.7/net/ipv4/netfilter/Kconfig --- a/net/ipv4/netfilter/Kconfig
=================================================================== +++ b/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 @@ -807,5 +807,22 @@ config IP_NF_TARGET_SET
To compile it as a module, choose M here. If unsure, say N. To compile it as a module, choose M here. If unsure, say N.
@ -569,10 +561,8 @@ Index: linux-2.6.21.7/net/ipv4/netfilter/Kconfig
+ +
endmenu endmenu
Index: linux-2.6.21.7/net/ipv4/netfilter/Makefile --- a/net/ipv4/netfilter/Makefile
=================================================================== +++ b/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 @@ -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_IMQ) += ipt_IMQ.o
obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
@ -581,10 +571,8 @@ Index: linux-2.6.21.7/net/ipv4/netfilter/Makefile
obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
obj-$(CONFIG_IP_NF_TARGET_SAME) += ipt_SAME.o obj-$(CONFIG_IP_NF_TARGET_SAME) += ipt_SAME.o
obj-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += ip_nat_snmp_basic.o obj-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += ip_nat_snmp_basic.o
Index: linux-2.6.21.7/net/ipv6/ipv6_syms.c --- a/net/ipv6/ipv6_syms.c
=================================================================== +++ b/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); @@ -10,6 +10,7 @@ EXPORT_SYMBOL(icmpv6_send);
EXPORT_SYMBOL(icmpv6_statistics); EXPORT_SYMBOL(icmpv6_statistics);
EXPORT_SYMBOL(icmpv6_err_convert); EXPORT_SYMBOL(icmpv6_err_convert);
@ -593,10 +581,8 @@ Index: linux-2.6.21.7/net/ipv6/ipv6_syms.c
EXPORT_SYMBOL(register_inet6addr_notifier); EXPORT_SYMBOL(register_inet6addr_notifier);
EXPORT_SYMBOL(unregister_inet6addr_notifier); EXPORT_SYMBOL(unregister_inet6addr_notifier);
EXPORT_SYMBOL(ip6_route_output); EXPORT_SYMBOL(ip6_route_output);
Index: linux-2.6.21.7/net/ipv6/netfilter/ip6t_ROUTE.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/net/ipv6/netfilter/ip6t_ROUTE.c +++ b/net/ipv6/netfilter/ip6t_ROUTE.c
@@ -0,0 +1,330 @@ @@ -0,0 +1,330 @@
+/* +/*
+ * This implements the ROUTE v6 target, which enables you to setup unusual + * This implements the ROUTE v6 target, which enables you to setup unusual
@ -928,10 +914,8 @@ Index: linux-2.6.21.7/net/ipv6/netfilter/ip6t_ROUTE.c
+module_init(init); +module_init(init);
+module_exit(fini); +module_exit(fini);
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
Index: linux-2.6.21.7/net/ipv6/netfilter/Kconfig --- a/net/ipv6/netfilter/Kconfig
=================================================================== +++ b/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 @@ -209,5 +209,18 @@ config IP6_NF_RAW
If you want to compile it as a module, say M here and read If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'. <file:Documentation/modules.txt>. If unsure, say `N'.
@ -951,10 +935,8 @@ Index: linux-2.6.21.7/net/ipv6/netfilter/Kconfig
+ +
endmenu endmenu
Index: linux-2.6.21.7/net/ipv6/netfilter/Makefile --- a/net/ipv6/netfilter/Makefile
=================================================================== +++ b/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_ @@ -20,6 +20,7 @@ obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_
obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o
obj-$(CONFIG_IP6_NF_MATCH_HL) += ip6t_hl.o obj-$(CONFIG_IP6_NF_MATCH_HL) += ip6t_hl.o

46
target/linux/generic-2.6/patches-2.6.21/170-netfilter_chaostables_0.8.patch
View File

@ -1,6 +1,6 @@
--- a/include/linux/netfilter/Kbuild --- a/include/linux/netfilter/Kbuild
+++ b/include/linux/netfilter/Kbuild +++ b/include/linux/netfilter/Kbuild
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@ header-y += nf_conntrack_tuple_common.h
header-y += nfnetlink_conntrack.h header-y += nfnetlink_conntrack.h
header-y += nfnetlink_log.h header-y += nfnetlink_log.h
header-y += nfnetlink_queue.h header-y += nfnetlink_queue.h
@ -8,20 +8,16 @@
header-y += xt_CLASSIFY.h header-y += xt_CLASSIFY.h
header-y += xt_comment.h header-y += xt_comment.h
header-y += xt_connbytes.h header-y += xt_connbytes.h
Index: linux-2.6.21.7/include/linux/netfilter/oot_conntrack.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/netfilter/oot_conntrack.h +++ b/include/linux/netfilter/oot_conntrack.h
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
+#if defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE) +#if defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE)
+# include <linux/netfilter_ipv4/ip_conntrack.h> +# include <linux/netfilter_ipv4/ip_conntrack.h>
+#else /* linux-2.6.20+ */ +#else /* linux-2.6.20+ */
+# include <net/netfilter/nf_nat_rule.h> +# include <net/netfilter/nf_nat_rule.h>
+#endif +#endif
Index: linux-2.6.21.7/include/linux/netfilter/oot_trans.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/netfilter/oot_trans.h +++ b/include/linux/netfilter/oot_trans.h
@@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
+/* Out of tree workarounds */ +/* Out of tree workarounds */
+#include <linux/version.h> +#include <linux/version.h>
@ -37,10 +33,8 @@ Index: linux-2.6.21.7/include/linux/netfilter/oot_trans.h
+# define tcp_v4_check(tcph, tcph_sz, s, d, csp) \ +# define tcp_v4_check(tcph, tcph_sz, s, d, csp) \
+ tcp_v4_check((tcph_sz), (s), (d), (csp)) + tcp_v4_check((tcph_sz), (s), (d), (csp))
+#endif +#endif
Index: linux-2.6.21.7/include/linux/netfilter/xt_CHAOS.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/netfilter/xt_CHAOS.h +++ b/include/linux/netfilter/xt_CHAOS.h
@@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
+#ifndef _LINUX_NETFILTER_XT_CHAOS_H +#ifndef _LINUX_NETFILTER_XT_CHAOS_H
+#define _LINUX_NETFILTER_XT_CHAOS_H 1 +#define _LINUX_NETFILTER_XT_CHAOS_H 1
@ -56,10 +50,8 @@ Index: linux-2.6.21.7/include/linux/netfilter/xt_CHAOS.h
+}; +};
+ +
+#endif /* _LINUX_NETFILTER_XT_CHAOS_H */ +#endif /* _LINUX_NETFILTER_XT_CHAOS_H */
Index: linux-2.6.21.7/include/linux/netfilter/xt_portscan.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/include/linux/netfilter/xt_portscan.h +++ b/include/linux/netfilter/xt_portscan.h
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
+#ifndef _LINUX_NETFILTER_XT_PORTSCAN_H +#ifndef _LINUX_NETFILTER_XT_PORTSCAN_H
+#define _LINUX_NETFILTER_XT_PORTSCAN_H 1 +#define _LINUX_NETFILTER_XT_PORTSCAN_H 1
@ -69,10 +61,8 @@ Index: linux-2.6.21.7/include/linux/netfilter/xt_portscan.h
+}; +};
+ +
+#endif /* _LINUX_NETFILTER_XT_PORTSCAN_H */ +#endif /* _LINUX_NETFILTER_XT_PORTSCAN_H */
Index: linux-2.6.21.7/net/netfilter/find_match.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/net/netfilter/find_match.c +++ b/net/netfilter/find_match.c
@@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
+/* +/*
+ xt_request_find_match + xt_request_find_match
@ -113,10 +103,8 @@ Index: linux-2.6.21.7/net/netfilter/find_match.c
+ +
+/* In case it goes into mainline, let this out-of-tree package compile */ +/* In case it goes into mainline, let this out-of-tree package compile */
+#define xt_request_find_match xt_request_find_match_lo +#define xt_request_find_match xt_request_find_match_lo
Index: linux-2.6.21.7/net/netfilter/Kconfig --- a/net/netfilter/Kconfig
=================================================================== +++ b/net/netfilter/Kconfig
--- linux-2.6.21.7.orig/net/netfilter/Kconfig
+++ linux-2.6.21.7/net/netfilter/Kconfig
@@ -287,6 +287,14 @@ config NETFILTER_XTABLES @@ -287,6 +287,14 @@ config NETFILTER_XTABLES
# alphabetically ordered list of targets # alphabetically ordered list of targets
@ -162,10 +150,8 @@ Index: linux-2.6.21.7/net/netfilter/Kconfig
config NETFILTER_XT_MATCH_MULTIPORT config NETFILTER_XT_MATCH_MULTIPORT
tristate "Multiple port match support" tristate "Multiple port match support"
depends on NETFILTER_XTABLES depends on NETFILTER_XTABLES
Index: linux-2.6.21.7/net/netfilter/Makefile --- a/net/netfilter/Makefile
=================================================================== +++ b/net/netfilter/Makefile
--- linux-2.6.21.7.orig/net/netfilter/Makefile
+++ linux-2.6.21.7/net/netfilter/Makefile
@@ -47,6 +47,8 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK @@ -47,6 +47,8 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK
obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o
obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o
@ -180,10 +166,8 @@ Index: linux-2.6.21.7/net/netfilter/Makefile
obj-$(CONFIG_NETFILTER_XT_MATCH_PHYSDEV) += xt_physdev.o obj-$(CONFIG_NETFILTER_XT_MATCH_PHYSDEV) += xt_physdev.o
obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
+obj-$(CONFIG_NETFILTER_XT_MATCH_PORTSCAN) += xt_portscan.o +obj-$(CONFIG_NETFILTER_XT_MATCH_PORTSCAN) += xt_portscan.o
Index: linux-2.6.21.7/net/netfilter/xt_CHAOS.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/net/netfilter/xt_CHAOS.c +++ b/net/netfilter/xt_CHAOS.c
@@ -0,0 +1,200 @@ @@ -0,0 +1,200 @@
+/* +/*
+ * CHAOS target for netfilter + * CHAOS target for netfilter
@ -385,10 +369,8 @@ Index: linux-2.6.21.7/net/netfilter/xt_CHAOS.c
+MODULE_DESCRIPTION("netfilter \"CHAOS\" target"); +MODULE_DESCRIPTION("netfilter \"CHAOS\" target");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_ALIAS("ipt_CHAOS"); +MODULE_ALIAS("ipt_CHAOS");
Index: linux-2.6.21.7/net/netfilter/xt_DELUDE.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/net/netfilter/xt_DELUDE.c +++ b/net/netfilter/xt_DELUDE.c
@@ -0,0 +1,197 @@ @@ -0,0 +1,197 @@
+/* +/*
+ * DELUDE target + * DELUDE target
@ -587,10 +569,8 @@ Index: linux-2.6.21.7/net/netfilter/xt_DELUDE.c
+MODULE_DESCRIPTION("netfilter \"DELUDE\" target"); +MODULE_DESCRIPTION("netfilter \"DELUDE\" target");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_ALIAS("ipt_DELUDE"); +MODULE_ALIAS("ipt_DELUDE");
Index: linux-2.6.21.7/net/netfilter/xt_portscan.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/net/netfilter/xt_portscan.c +++ b/net/netfilter/xt_portscan.c
@@ -0,0 +1,269 @@ @@ -0,0 +1,269 @@
+/* +/*
+ * portscan match for netfilter + * portscan match for netfilter

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

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/net/netfilter/Kconfig --- a/net/netfilter/Kconfig
=================================================================== +++ b/net/netfilter/Kconfig
--- linux-2.6.21.7.orig/net/netfilter/Kconfig
+++ linux-2.6.21.7/net/netfilter/Kconfig
@@ -414,6 +414,23 @@ config NETFILTER_XT_TARGET_CONNSECMARK @@ -414,6 +414,23 @@ config NETFILTER_XT_TARGET_CONNSECMARK
To compile it as a module, choose M here. If unsure, say N. To compile it as a module, choose M here. If unsure, say N.
@ -26,10 +24,8 @@ Index: linux-2.6.21.7/net/netfilter/Kconfig
config NETFILTER_XT_TARGET_TCPMSS config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support' tristate '"TCPMSS" target support'
depends on NETFILTER_XTABLES && (IPV6 || IPV6=n) depends on NETFILTER_XTABLES && (IPV6 || IPV6=n)
Index: linux-2.6.21.7/net/netfilter/Makefile --- a/net/netfilter/Makefile
=================================================================== +++ b/net/netfilter/Makefile
--- linux-2.6.21.7.orig/net/netfilter/Makefile
+++ linux-2.6.21.7/net/netfilter/Makefile
@@ -45,6 +45,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE @@ -45,6 +45,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE
obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o
obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_NOTRACK.o obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_NOTRACK.o
@ -38,10 +34,8 @@ Index: linux-2.6.21.7/net/netfilter/Makefile
obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o
obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
obj-$(CONFIG_NETFILTER_XT_TARGET_CHAOS) += xt_CHAOS.o obj-$(CONFIG_NETFILTER_XT_TARGET_CHAOS) += xt_CHAOS.o
Index: linux-2.6.21.7/net/netfilter/xt_TARPIT.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/net/netfilter/xt_TARPIT.c +++ b/net/netfilter/xt_TARPIT.c
@@ -0,0 +1,280 @@ @@ -0,0 +1,280 @@
+/* +/*
+ * Kernel module to capture and hold incoming TCP connections using + * Kernel module to capture and hold incoming TCP connections using

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

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/net/netfilter/Kconfig --- a/net/netfilter/Kconfig
=================================================================== +++ b/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 @@ -165,7 +165,7 @@ config NF_CONNTRACK_FTP
config NF_CONNTRACK_H323 config NF_CONNTRACK_H323

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

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/include/linux/pkt_sched.h --- a/include/linux/pkt_sched.h
=================================================================== +++ b/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 @@ -146,8 +146,40 @@ struct tc_sfq_qopt
* *
* The only reason for this is efficiency, it is possible * The only reason for this is efficiency, it is possible
@ -43,10 +41,8 @@ Index: linux-2.6.21.7/include/linux/pkt_sched.h
/* RED section */ /* RED section */
enum enum
Index: linux-2.6.21.7/net/sched/Kconfig --- a/net/sched/Kconfig
=================================================================== +++ b/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 @@ -189,6 +189,26 @@ config NET_SCH_SFQ
To compile this code as a module, choose M here: the To compile this code as a module, choose M here: the
module will be called sch_sfq. module will be called sch_sfq.
@ -74,10 +70,8 @@ Index: linux-2.6.21.7/net/sched/Kconfig
config NET_SCH_TEQL config NET_SCH_TEQL
tristate "True Link Equalizer (TEQL)" tristate "True Link Equalizer (TEQL)"
---help--- ---help---
Index: linux-2.6.21.7/net/sched/Makefile --- a/net/sched/Makefile
=================================================================== +++ b/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 @@ -23,6 +23,7 @@ obj-$(CONFIG_NET_SCH_GRED) += sch_gred.o
obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o
obj-$(CONFIG_NET_SCH_DSMARK) += sch_dsmark.o obj-$(CONFIG_NET_SCH_DSMARK) += sch_dsmark.o
@ -86,10 +80,8 @@ Index: linux-2.6.21.7/net/sched/Makefile
obj-$(CONFIG_NET_SCH_TBF) += sch_tbf.o obj-$(CONFIG_NET_SCH_TBF) += sch_tbf.o
obj-$(CONFIG_NET_SCH_TEQL) += sch_teql.o obj-$(CONFIG_NET_SCH_TEQL) += sch_teql.o
obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o
Index: linux-2.6.21.7/net/sched/sch_esfq.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/net/sched/sch_esfq.c +++ b/net/sched/sch_esfq.c
@@ -0,0 +1,704 @@ @@ -0,0 +1,704 @@
+/* +/*
+ * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline. + * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline.

24
target/linux/generic-2.6/patches-2.6.21/201-multiple_default_gateways.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_nat.h --- a/include/linux/netfilter_ipv4/ip_nat.h
=================================================================== +++ b/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 @@ -64,6 +64,13 @@ struct ip_nat_info
struct ip_conntrack; struct ip_conntrack;
@ -16,10 +14,8 @@ Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_nat.h
/* Set up the info structure to map into this range. */ /* Set up the info structure to map into this range. */
extern unsigned int ip_nat_setup_info(struct ip_conntrack *conntrack, extern unsigned int ip_nat_setup_info(struct ip_conntrack *conntrack,
const struct ip_nat_range *range, const struct ip_nat_range *range,
Index: linux-2.6.21.7/include/linux/rtnetlink.h --- a/include/linux/rtnetlink.h
=================================================================== +++ b/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 @@ -293,6 +293,8 @@ struct rtnexthop
#define RTNH_F_DEAD 1 /* Nexthop is dead (used by multipath) */ #define RTNH_F_DEAD 1 /* Nexthop is dead (used by multipath) */
#define RTNH_F_PERVASIVE 2 /* Do recursive gateway lookup */ #define RTNH_F_PERVASIVE 2 /* Do recursive gateway lookup */
@ -29,10 +25,8 @@ Index: linux-2.6.21.7/include/linux/rtnetlink.h
/* Macros to handle hexthops */ /* Macros to handle hexthops */
Index: linux-2.6.21.7/include/net/flow.h --- a/include/net/flow.h
=================================================================== +++ b/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 { @@ -19,6 +19,8 @@ struct flowi {
struct { struct {
__be32 daddr; __be32 daddr;
@ -51,10 +45,8 @@ Index: linux-2.6.21.7/include/net/flow.h
#define fl4_tos nl_u.ip4_u.tos #define fl4_tos nl_u.ip4_u.tos
#define fl4_scope nl_u.ip4_u.scope #define fl4_scope nl_u.ip4_u.scope
Index: linux-2.6.21.7/net/ipv4/route.c --- a/net/ipv4/route.c
=================================================================== +++ b/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 @@ -1208,6 +1208,7 @@ void ip_rt_redirect(__be32 old_gw, __be3
/* Gateway is different ... */ /* Gateway is different ... */

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

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/arch/mips/Makefile --- a/arch/mips/Makefile
=================================================================== +++ b/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/ @@ -605,6 +605,9 @@ core-$(CONFIG_TOSHIBA_RBTX4938) += arch/
core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/common/ core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/common/
load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000 load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000

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

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/fs/jffs2/build.c --- a/fs/jffs2/build.c
=================================================================== +++ b/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 @@ -107,6 +107,17 @@ static int jffs2_build_filesystem(struct
dbg_fsbuild("scanned flash completely\n"); dbg_fsbuild("scanned flash completely\n");
jffs2_dbg_dump_block_lists_nolock(c); jffs2_dbg_dump_block_lists_nolock(c);
@ -20,10 +18,8 @@ Index: linux-2.6.21.7/fs/jffs2/build.c
dbg_fsbuild("pass 1 starting\n"); dbg_fsbuild("pass 1 starting\n");
c->flags |= JFFS2_SB_FLAG_BUILDING; c->flags |= JFFS2_SB_FLAG_BUILDING;
/* Now scan the directory tree, increasing nlink according to every dirent found. */ /* Now scan the directory tree, increasing nlink according to every dirent found. */
Index: linux-2.6.21.7/fs/jffs2/scan.c --- a/fs/jffs2/scan.c
=================================================================== +++ b/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 @@ -143,9 +143,12 @@ int jffs2_scan_medium(struct jffs2_sb_in
/* reset summary info for next eraseblock scan */ /* reset summary info for next eraseblock scan */

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

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

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

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/drivers/net/r8169.c --- a/drivers/net/r8169.c
=================================================================== +++ b/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 @@ -494,7 +494,7 @@ static int rtl8169_poll(struct net_devic
#endif #endif

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

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/fs/Kconfig --- a/fs/Kconfig
=================================================================== +++ b/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 @@ -461,6 +461,9 @@ config OCFS2_DEBUG_MASKLOG
This option will enlarge your kernel, but it allows debugging of This option will enlarge your kernel, but it allows debugging of
ocfs2 filesystem issues. ocfs2 filesystem issues.
@ -12,10 +10,8 @@ Index: linux-2.6.21.7/fs/Kconfig
config MINIX_FS config MINIX_FS
tristate "Minix fs support" tristate "Minix fs support"
help help
Index: linux-2.6.21.7/fs/Makefile --- a/fs/Makefile
=================================================================== +++ b/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/ @@ -72,6 +72,7 @@ obj-$(CONFIG_SQUASHFS) += squashfs/
obj-$(CONFIG_RAMFS) += ramfs/ obj-$(CONFIG_RAMFS) += ramfs/
obj-$(CONFIG_HUGETLBFS) += hugetlbfs/ obj-$(CONFIG_HUGETLBFS) += hugetlbfs/
@ -24,10 +20,8 @@ Index: linux-2.6.21.7/fs/Makefile
obj-$(CONFIG_MINIX_FS) += minix/ obj-$(CONFIG_MINIX_FS) += minix/
obj-$(CONFIG_FAT_FS) += fat/ obj-$(CONFIG_FAT_FS) += fat/
obj-$(CONFIG_MSDOS_FS) += msdos/ obj-$(CONFIG_MSDOS_FS) += msdos/
Index: linux-2.6.21.7/fs/mini_fo/aux.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/fs/mini_fo/aux.c +++ b/fs/mini_fo/aux.c
@@ -0,0 +1,580 @@ @@ -0,0 +1,580 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -609,10 +603,8 @@ Index: linux-2.6.21.7/fs/mini_fo/aux.c
+ +
+#endif /* unused */ +#endif /* unused */
+ +
Index: linux-2.6.21.7/fs/mini_fo/ChangeLog
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/fs/mini_fo/ChangeLog +++ b/fs/mini_fo/ChangeLog
@@ -0,0 +1,281 @@ @@ -0,0 +1,281 @@
+2006-01-24 Markus Klotzbuecher <mk@mary.denx.de> +2006-01-24 Markus Klotzbuecher <mk@mary.denx.de>
+ +
@ -895,10 +887,8 @@ Index: linux-2.6.21.7/fs/mini_fo/ChangeLog
+ * Implementation of mini_fo_mknod and mini_fo_rename, support + * Implementation of mini_fo_mknod and mini_fo_rename, support
+ for device files. + for device files.
+ +
Index: linux-2.6.21.7/fs/mini_fo/dentry.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/fs/mini_fo/dentry.c +++ b/fs/mini_fo/dentry.c
@@ -0,0 +1,244 @@ @@ -0,0 +1,244 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -1144,10 +1134,8 @@ Index: linux-2.6.21.7/fs/mini_fo/dentry.c
+ d_delete: mini_fo_d_delete, + d_delete: mini_fo_d_delete,
+ d_iput: mini_fo_d_iput, + d_iput: mini_fo_d_iput,
+}; +};
Index: linux-2.6.21.7/fs/mini_fo/file.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/fs/mini_fo/file.c +++ b/fs/mini_fo/file.c
@@ -0,0 +1,713 @@ @@ -0,0 +1,713 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -1862,10 +1850,8 @@ Index: linux-2.6.21.7/fs/mini_fo/file.c
+ /* not implemented: sendpage */ + /* not implemented: sendpage */
+ /* not implemented: get_unmapped_area */ + /* not implemented: get_unmapped_area */
+ }; + };
Index: linux-2.6.21.7/fs/mini_fo/fist.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/fs/mini_fo/fist.h +++ b/fs/mini_fo/fist.h
@@ -0,0 +1,252 @@ @@ -0,0 +1,252 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -2119,10 +2105,8 @@ Index: linux-2.6.21.7/fs/mini_fo/fist.h
+# define FIST_IOCTL_SET_DEBUG_VALUE _IOW(0x15, 2, int) +# define FIST_IOCTL_SET_DEBUG_VALUE _IOW(0x15, 2, int)
+ +
+#endif /* not __FIST_H_ */ +#endif /* not __FIST_H_ */
Index: linux-2.6.21.7/fs/mini_fo/inode.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/fs/mini_fo/inode.c +++ b/fs/mini_fo/inode.c
@@ -0,0 +1,1564 @@ @@ -0,0 +1,1564 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -3688,10 +3672,8 @@ Index: linux-2.6.21.7/fs/mini_fo/inode.c
+ removexattr: mini_fo_removexattr + removexattr: mini_fo_removexattr
+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */ +# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
+ }; + };
Index: linux-2.6.21.7/fs/mini_fo/main.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/fs/mini_fo/main.c +++ b/fs/mini_fo/main.c
@@ -0,0 +1,423 @@ @@ -0,0 +1,423 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -4116,10 +4098,8 @@ Index: linux-2.6.21.7/fs/mini_fo/main.c
+ +
+module_init(init_mini_fo_fs) +module_init(init_mini_fo_fs)
+module_exit(exit_mini_fo_fs) +module_exit(exit_mini_fo_fs)
Index: linux-2.6.21.7/fs/mini_fo/Makefile
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/fs/mini_fo/Makefile +++ b/fs/mini_fo/Makefile
@@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
+# +#
+# Makefile for mini_fo 2.4 and 2.6 Linux kernels +# Makefile for mini_fo 2.4 and 2.6 Linux kernels
@ -4138,10 +4118,8 @@ Index: linux-2.6.21.7/fs/mini_fo/Makefile
+# dependencies +# dependencies
+${mini_fo-objs}: mini_fo.h fist.h +${mini_fo-objs}: mini_fo.h fist.h
+ +
Index: linux-2.6.21.7/fs/mini_fo/meta.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/fs/mini_fo/meta.c +++ b/fs/mini_fo/meta.c
@@ -0,0 +1,1000 @@ @@ -0,0 +1,1000 @@
+/* +/*
+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de> + * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
@ -5143,10 +5121,8 @@ Index: linux-2.6.21.7/fs/mini_fo/meta.c
+ return 0; + return 0;
+} +}
+ +
Index: linux-2.6.21.7/fs/mini_fo/mini_fo.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/fs/mini_fo/mini_fo.h +++ b/fs/mini_fo/mini_fo.h
@@ -0,0 +1,510 @@ @@ -0,0 +1,510 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -5658,10 +5634,8 @@ Index: linux-2.6.21.7/fs/mini_fo/mini_fo.h
+/* ioctls */ +/* ioctls */
+ +
+#endif /* not __MINI_FO_H_ */ +#endif /* not __MINI_FO_H_ */
Index: linux-2.6.21.7/fs/mini_fo/mini_fo-merge
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/fs/mini_fo/mini_fo-merge +++ b/fs/mini_fo/mini_fo-merge
@@ -0,0 +1,180 @@ @@ -0,0 +1,180 @@
+#!/bin/bash +#!/bin/bash
+# +#
@ -5843,10 +5817,8 @@ Index: linux-2.6.21.7/fs/mini_fo/mini_fo-merge
+#rm $TMP/$SKIP_DEL_LIST +#rm $TMP/$SKIP_DEL_LIST
+ +
+echo "Done!" +echo "Done!"
Index: linux-2.6.21.7/fs/mini_fo/mini_fo-overlay
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/fs/mini_fo/mini_fo-overlay +++ b/fs/mini_fo/mini_fo-overlay
@@ -0,0 +1,130 @@ @@ -0,0 +1,130 @@
+#!/bin/bash +#!/bin/bash
+# +#
@ -5978,10 +5950,8 @@ Index: linux-2.6.21.7/fs/mini_fo/mini_fo-overlay
+if [ $? -ne 0 ]; then +if [ $? -ne 0 ]; then
+ echo "Error, mounting failed, maybe no permisson to mount?" + echo "Error, mounting failed, maybe no permisson to mount?"
+fi +fi
Index: linux-2.6.21.7/fs/mini_fo/mmap.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/fs/mini_fo/mmap.c +++ b/fs/mini_fo/mmap.c
@@ -0,0 +1,637 @@ @@ -0,0 +1,637 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -6620,10 +6590,8 @@ Index: linux-2.6.21.7/fs/mini_fo/mmap.c
+ print_exit_status(err); + print_exit_status(err);
+ return err; + return err;
+} +}
Index: linux-2.6.21.7/fs/mini_fo/README
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/fs/mini_fo/README +++ b/fs/mini_fo/README
@@ -0,0 +1,163 @@ @@ -0,0 +1,163 @@
+README for the mini_fo overlay file system +README for the mini_fo overlay file system
+========================================= +=========================================
@ -6788,10 +6756,8 @@ Index: linux-2.6.21.7/fs/mini_fo/README
+2 of the License, or (at your option) any later version. +2 of the License, or (at your option) any later version.
+ +
+ +
Index: linux-2.6.21.7/fs/mini_fo/RELEASE_NOTES
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/fs/mini_fo/RELEASE_NOTES +++ b/fs/mini_fo/RELEASE_NOTES
@@ -0,0 +1,111 @@ @@ -0,0 +1,111 @@
+Release: mini_fo-0.6.1 (v0-6-1) +Release: mini_fo-0.6.1 (v0-6-1)
+Date: 21.09.2005 +Date: 21.09.2005
@ -6904,10 +6870,8 @@ Index: linux-2.6.21.7/fs/mini_fo/RELEASE_NOTES
+original state. I hope to fix this someday. Please note that this does +original state. I hope to fix this someday. Please note that this does
+not effect the special hard links '.' and '..', that are handled +not effect the special hard links '.' and '..', that are handled
+seperately by the lower fs. +seperately by the lower fs.
Index: linux-2.6.21.7/fs/mini_fo/state.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/fs/mini_fo/state.c +++ b/fs/mini_fo/state.c
@@ -0,0 +1,620 @@ @@ -0,0 +1,620 @@
+/* +/*
+ * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de> + * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
@ -7529,10 +7493,8 @@ Index: linux-2.6.21.7/fs/mini_fo/state.c
+ return err; + return err;
+} +}
+ +
Index: linux-2.6.21.7/fs/mini_fo/super.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.21.7/fs/mini_fo/super.c +++ b/fs/mini_fo/super.c
@@ -0,0 +1,281 @@ @@ -0,0 +1,281 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok

6
target/linux/generic-2.6/patches-2.6.21/210-d80211_compat.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/include/linux/netdevice.h --- a/include/linux/netdevice.h
=================================================================== +++ b/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 @@ -532,6 +532,8 @@ struct net_device
struct device dev; struct device dev;
/* space for optional statistics and wireless sysfs groups */ /* space for optional statistics and wireless sysfs groups */

6
target/linux/generic-2.6/patches-2.6.21/211-no_block2mtd_readahead.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/drivers/mtd/devices/block2mtd.c --- a/drivers/mtd/devices/block2mtd.c
=================================================================== +++ b/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 { @@ -41,7 +41,7 @@ struct block2mtd_dev {
static LIST_HEAD(blkmtd_device_list); static LIST_HEAD(blkmtd_device_list);

6
target/linux/generic-2.6/patches-2.6.21/212-block2mtd_erase_scan.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/drivers/mtd/devices/block2mtd.c --- a/drivers/mtd/devices/block2mtd.c
=================================================================== +++ b/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 @@ -112,7 +112,7 @@ static int _block2mtd_erase(struct block
if (IS_ERR(page)) if (IS_ERR(page))
return PTR_ERR(page); return PTR_ERR(page);

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

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/lib/kobject_uevent.c --- a/lib/kobject_uevent.c
=================================================================== +++ b/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; @@ -30,9 +30,22 @@ u64 uevent_seqnum;
char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug"; char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug";
static DEFINE_SPINLOCK(sequence_lock); static DEFINE_SPINLOCK(sequence_lock);

4
target/linux/generic-2.6/patches-2.6.21/420-gpiodev.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/char/Kconfig --- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig +++ b/drivers/char/Kconfig
@@ -984,6 +984,13 @@ @@ -984,6 +984,13 @@ config CS5535_GPIO
If compiled as a module, it will be called cs5535_gpio. If compiled as a module, it will be called cs5535_gpio.
@ -16,7 +16,7 @@
depends on CPU_VR41XX depends on CPU_VR41XX
--- a/drivers/char/Makefile --- a/drivers/char/Makefile
+++ b/drivers/char/Makefile +++ b/drivers/char/Makefile
@@ -90,6 +90,7 @@ @@ -90,6 +90,7 @@ obj-$(CONFIG_SCx200_GPIO) += scx200_gpio
obj-$(CONFIG_PC8736x_GPIO) += pc8736x_gpio.o obj-$(CONFIG_PC8736x_GPIO) += pc8736x_gpio.o
obj-$(CONFIG_NSC_GPIO) += nsc_gpio.o obj-$(CONFIG_NSC_GPIO) += nsc_gpio.o
obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio.o obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio.o

12
target/linux/generic-2.6/patches-2.6.21/510-yaffs_support.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/fs/Kconfig --- a/fs/Kconfig
=================================================================== +++ b/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 @@ -419,6 +419,7 @@ config FS_POSIX_ACL
source "fs/xfs/Kconfig" source "fs/xfs/Kconfig"
@ -10,10 +8,8 @@ Index: linux-2.6.21.7/fs/Kconfig
config OCFS2_FS config OCFS2_FS
tristate "OCFS2 file system support" tristate "OCFS2 file system support"
Index: linux-2.6.21.7/fs/Makefile --- a/fs/Makefile
=================================================================== +++ b/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/ @@ -116,3 +116,4 @@ obj-$(CONFIG_HPPFS) += hppfs/
obj-$(CONFIG_DEBUG_FS) += debugfs/ obj-$(CONFIG_DEBUG_FS) += debugfs/
obj-$(CONFIG_OCFS2_FS) += ocfs2/ obj-$(CONFIG_OCFS2_FS) += ocfs2/

16
target/linux/generic-2.6/patches-2.6.21/511-yaffs_reduce_compiler_warnings.patch
View File

@ -1,6 +1,6 @@
--- a/fs/yaffs2/yaffs_fs.c --- a/fs/yaffs2/yaffs_fs.c
+++ b/fs/yaffs2/yaffs_fs.c +++ b/fs/yaffs2/yaffs_fs.c
@@ -969,7 +970,7 @@ @@ -965,7 +965,7 @@ static int yaffs_readdir(struct file *f,
f->f_version = inode->i_version; f->f_version = inode->i_version;
} }
@ -9,7 +9,7 @@
curoffs++; curoffs++;
if (curoffs >= offset) { if (curoffs >= offset) {
l = list_entry(i, yaffs_Object, siblings); l = list_entry(i, yaffs_Object, siblings);
@@ -1273,7 +1275,7 @@ @@ -1269,7 +1269,7 @@ static int yaffs_rename(struct inode *ol
if (target && if (target &&
target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY && target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
@ -18,7 +18,7 @@
T(YAFFS_TRACE_OS, (KERN_DEBUG "target is non-empty dir\n")); T(YAFFS_TRACE_OS, (KERN_DEBUG "target is non-empty dir\n"));
@@ -1529,7 +1531,7 @@ @@ -1503,7 +1503,7 @@ static void yaffs_put_super(struct super
yaffs_GrossUnlock(dev); yaffs_GrossUnlock(dev);
/* we assume this is protected by lock_kernel() in mount/umount */ /* we assume this is protected by lock_kernel() in mount/umount */
@ -27,7 +27,7 @@
if(dev->spareBuffer){ if(dev->spareBuffer){
YFREE(dev->spareBuffer); YFREE(dev->spareBuffer);
@@ -1864,7 +1866,7 @@ @@ -1847,7 +1847,7 @@ static struct super_block *yaffs_interna
dev->skipCheckpointWrite = options.skip_checkpoint_write; dev->skipCheckpointWrite = options.skip_checkpoint_write;
/* we assume this is protected by lock_kernel() in mount/umount */ /* we assume this is protected by lock_kernel() in mount/umount */
@ -38,7 +38,7 @@
--- a/fs/yaffs2/yaffs_mtdif1.c --- a/fs/yaffs2/yaffs_mtdif1.c
+++ b/fs/yaffs2/yaffs_mtdif1.c +++ b/fs/yaffs2/yaffs_mtdif1.c
@@ -323,7 +323,7 @@ @@ -323,7 +323,7 @@ static int nandmtd1_TestPrerequists(stru
* Always returns YAFFS_OK. * Always returns YAFFS_OK.
*/ */
int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo, int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
@ -49,7 +49,7 @@
int chunkNo = blockNo * dev->nChunksPerBlock; int chunkNo = blockNo * dev->nChunksPerBlock;
--- a/fs/yaffs2/yaffs_mtdif1.h --- a/fs/yaffs2/yaffs_mtdif1.h
+++ b/fs/yaffs2/yaffs_mtdif1.h +++ b/fs/yaffs2/yaffs_mtdif1.h
@@ -23,6 +23,6 @@ @@ -23,6 +23,6 @@ int nandmtd1_ReadChunkWithTagsFromNAND(y
int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo); int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo, int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
@ -59,7 +59,7 @@
#endif #endif
--- a/fs/yaffs2/yaffs_mtdif2.c --- a/fs/yaffs2/yaffs_mtdif2.c
+++ b/fs/yaffs2/yaffs_mtdif2.c +++ b/fs/yaffs2/yaffs_mtdif2.c
@@ -204,7 +204,7 @@ @@ -188,7 +188,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaf
} }
int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo, int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
@ -70,7 +70,7 @@
int retval; int retval;
--- a/fs/yaffs2/yaffs_mtdif2.h --- a/fs/yaffs2/yaffs_mtdif2.h
+++ b/fs/yaffs2/yaffs_mtdif2.h +++ b/fs/yaffs2/yaffs_mtdif2.h
@@ -24,6 +24,6 @@ @@ -24,6 +24,6 @@ int nandmtd2_ReadChunkWithTagsFromNAND(y
__u8 * data, yaffs_ExtendedTags * tags); __u8 * data, yaffs_ExtendedTags * tags);
int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo); int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo, int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,

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

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/include/linux/time.h --- a/include/linux/time.h
=================================================================== +++ b/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 @@ @@ -1,6 +1,10 @@
#ifndef _LINUX_TIME_H #ifndef _LINUX_TIME_H
#define _LINUX_TIME_H #define _LINUX_TIME_H
@ -20,10 +18,8 @@ Index: linux-2.6.21.7/include/linux/time.h
+#endif /* __KERNEL__ DEBIAN */ +#endif /* __KERNEL__ DEBIAN */
+ +
#endif #endif
Index: linux-2.6.21.7/include/linux/types.h --- a/include/linux/types.h
=================================================================== +++ b/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 @@ @@ -1,6 +1,14 @@
#ifndef _LINUX_TYPES_H #ifndef _LINUX_TYPES_H
#define _LINUX_TYPES_H #define _LINUX_TYPES_H

48
target/linux/generic-2.6/patches-2.6.21/902-darwin_scripts_include.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/scripts/genksyms/parse.c_shipped --- a/scripts/genksyms/parse.c_shipped
=================================================================== +++ b/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 @@ @@ -144,7 +144,9 @@
@ -12,10 +10,8 @@ Index: linux-2.6.21.7/scripts/genksyms/parse.c_shipped
#include "genksyms.h" #include "genksyms.h"
static int is_typedef; static int is_typedef;
Index: linux-2.6.21.7/scripts/genksyms/parse.y --- a/scripts/genksyms/parse.y
=================================================================== +++ b/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,7 +24,9 @@
%{ %{
@ -26,10 +22,8 @@ Index: linux-2.6.21.7/scripts/genksyms/parse.y
#include "genksyms.h" #include "genksyms.h"
static int is_typedef; static int is_typedef;
Index: linux-2.6.21.7/scripts/kallsyms.c --- a/scripts/kallsyms.c
=================================================================== +++ b/scripts/kallsyms.c
--- linux-2.6.21.7.orig/scripts/kallsyms.c
+++ linux-2.6.21.7/scripts/kallsyms.c
@@ -30,6 +30,35 @@ @@ -30,6 +30,35 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -66,10 +60,8 @@ Index: linux-2.6.21.7/scripts/kallsyms.c
#define KSYM_NAME_LEN 127 #define KSYM_NAME_LEN 127
Index: linux-2.6.21.7/scripts/kconfig/Makefile --- a/scripts/kconfig/Makefile
=================================================================== +++ b/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 @@ -87,6 +87,9 @@ check-lxdialog := $(srctree)/$(src)/lxd
# we really need to do so. (Do not call gcc as part of make mrproper) # we really need to do so. (Do not call gcc as part of make mrproper)
HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
@ -80,10 +72,8 @@ Index: linux-2.6.21.7/scripts/kconfig/Makefile
HOST_EXTRACFLAGS += -DLOCALE HOST_EXTRACFLAGS += -DLOCALE
Index: linux-2.6.21.7/scripts/mod/file2alias.c --- a/scripts/mod/file2alias.c
=================================================================== +++ b/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; @@ -37,7 +37,21 @@ typedef unsigned char __u8;
* even potentially has different endianness and word sizes, since * even potentially has different endianness and word sizes, since
* we handle those differences explicitly below */ * we handle those differences explicitly below */
@ -106,10 +96,8 @@ Index: linux-2.6.21.7/scripts/mod/file2alias.c
#define ADD(str, sep, cond, field) \ #define ADD(str, sep, cond, field) \
do { \ do { \
Index: linux-2.6.21.7/scripts/mod/mk_elfconfig.c --- a/scripts/mod/mk_elfconfig.c
=================================================================== +++ b/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 @@ @@ -1,7 +1,11 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -122,10 +110,8 @@ Index: linux-2.6.21.7/scripts/mod/mk_elfconfig.c
int int
main(int argc, char **argv) main(int argc, char **argv)
Index: linux-2.6.21.7/scripts/mod/modpost.h --- a/scripts/mod/modpost.h
=================================================================== +++ b/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 @@ @@ -7,7 +7,11 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <fcntl.h> #include <fcntl.h>
@ -138,10 +124,8 @@ Index: linux-2.6.21.7/scripts/mod/modpost.h
#include "elfconfig.h" #include "elfconfig.h"
Index: linux-2.6.21.7/scripts/mod/sumversion.c --- a/scripts/mod/sumversion.c
=================================================================== +++ b/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 @@ @@ -8,6 +8,9 @@
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>

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

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap_ap.c --- a/drivers/net/wireless/hostap/hostap_ap.c
=================================================================== +++ b/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 @@ -2346,13 +2346,13 @@ int prism2_ap_get_sta_qual(local_info_t
addr[count].sa_family = ARPHRD_ETHER; addr[count].sa_family = ARPHRD_ETHER;
memcpy(addr[count].sa_data, sta->addr, ETH_ALEN); memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
@ -42,10 +40,8 @@ Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap_ap.c
iwe.u.qual.updated = sta->last_rx_updated; iwe.u.qual.updated = sta->last_rx_updated;
iwe.len = IW_EV_QUAL_LEN; iwe.len = IW_EV_QUAL_LEN;
current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap_config.h --- a/drivers/net/wireless/hostap/hostap_config.h
=================================================================== +++ b/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 @@ @@ -47,4 +47,9 @@
*/ */
/* #define PRISM2_NO_STATION_MODES */ /* #define PRISM2_NO_STATION_MODES */
@ -56,10 +52,8 @@ Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap_config.h
+#define RAW_TXPOWER_SETTING +#define RAW_TXPOWER_SETTING
+ +
#endif /* HOSTAP_CONFIG_H */ #endif /* HOSTAP_CONFIG_H */
Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap.h --- a/drivers/net/wireless/hostap/hostap.h
=================================================================== +++ b/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 @@ -90,6 +90,7 @@ extern const struct iw_handler_def hosta
extern const struct ethtool_ops prism2_ethtool_ops; extern const struct ethtool_ops prism2_ethtool_ops;
@ -68,10 +62,8 @@ Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap.h
#endif /* HOSTAP_H */ #endif /* HOSTAP_H */
Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap_hw.c --- a/drivers/net/wireless/hostap/hostap_hw.c
=================================================================== +++ b/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 @@ -933,6 +933,7 @@ static int hfa384x_set_rid(struct net_de
prism2_hw_reset(dev); prism2_hw_reset(dev);
} }
@ -80,10 +72,8 @@ Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap_hw.c
return res; return res;
} }
Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap_info.c --- a/drivers/net/wireless/hostap/hostap_info.c
=================================================================== +++ b/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 @@ -428,6 +428,11 @@ static void handle_info_queue_linkstatus
} }
@ -96,10 +86,8 @@ Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap_info.c
if (connected) { if (connected) {
netif_carrier_on(local->dev); netif_carrier_on(local->dev);
netif_carrier_on(local->ddev); netif_carrier_on(local->ddev);
Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap_ioctl.c --- a/drivers/net/wireless/hostap/hostap_ioctl.c
=================================================================== +++ b/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 @@ -1504,23 +1504,20 @@ static int prism2_txpower_hfa386x_to_dBm
val = 255; val = 255;

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

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/include/linux/stddef.h --- a/include/linux/stddef.h
=================================================================== +++ b/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 { @@ -16,6 +16,7 @@ enum {
false = 0, false = 0,
true = 1 true = 1

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

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/scripts/gen_initramfs_list.sh --- a/scripts/gen_initramfs_list.sh
=================================================================== +++ b/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() { @@ -125,7 +125,7 @@ parse() {
str="${ftype} ${name} ${location} ${str}" str="${ftype} ${name} ${location} ${str}"
;; ;;

18
target/linux/generic-2.6/patches-2.6.21/999-backport_ip_hdr_and_friends.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.21.7/include/linux/ip.h --- a/include/linux/ip.h
=================================================================== +++ b/include/linux/ip.h
--- linux-2.6.21.7.orig/include/linux/ip.h
+++ linux-2.6.21.7/include/linux/ip.h
@@ -104,6 +104,16 @@ struct iphdr { @@ -104,6 +104,16 @@ struct iphdr {
/*The options start here. */ /*The options start here. */
}; };
@ -19,10 +17,8 @@ Index: linux-2.6.21.7/include/linux/ip.h
struct ip_auth_hdr { struct ip_auth_hdr {
__u8 nexthdr; __u8 nexthdr;
__u8 hdrlen; /* This one is measured in 32 bit units! */ __u8 hdrlen; /* This one is measured in 32 bit units! */
Index: linux-2.6.21.7/include/linux/skbuff.h --- a/include/linux/skbuff.h
=================================================================== +++ b/include/linux/skbuff.h
--- linux-2.6.21.7.orig/include/linux/skbuff.h
+++ linux-2.6.21.7/include/linux/skbuff.h
@@ -966,6 +966,16 @@ static inline void skb_reserve(struct sk @@ -966,6 +966,16 @@ static inline void skb_reserve(struct sk
skb->tail += len; skb->tail += len;
} }
@ -40,10 +36,8 @@ Index: linux-2.6.21.7/include/linux/skbuff.h
/* /*
* CPUs often take a performance hit when accessing unaligned memory * CPUs often take a performance hit when accessing unaligned memory
* locations. The actual performance hit varies, it can be small if the * locations. The actual performance hit varies, it can be small if the
Index: linux-2.6.21.7/include/net/ip.h --- a/include/net/ip.h
=================================================================== +++ b/include/net/ip.h
--- linux-2.6.21.7.orig/include/net/ip.h
+++ linux-2.6.21.7/include/net/ip.h
@@ -43,6 +43,11 @@ struct inet_skb_parm @@ -43,6 +43,11 @@ struct inet_skb_parm
#define IPSKB_REROUTED 16 #define IPSKB_REROUTED 16
}; };