qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-28 03:20:19 +02:00
Code

refresh generic 2.6.22 patches

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11498 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
kaloz 2008-06-16 12:40:48 +00:00
parent 301e8e639c
commit 7e4cbd86ff
48 changed files with 652 additions and 1192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
target/linux/generic-2.6/patches-2.6.22/001-squashfs.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/fs/Kconfig --- a/fs/Kconfig
=================================================================== +++ b/fs/Kconfig
--- linux-2.6.22.19.orig/fs/Kconfig @@ -1367,6 +1367,71 @@
+++ linux-2.6.22.19/fs/Kconfig
@@ -1367,6 +1367,71 @@ config CRAMFS
If unsure, say N. If unsure, say N.
@ -74,11 +72,9 @@ Index: linux-2.6.22.19/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.22.19/fs/Makefile --- a/fs/Makefile
=================================================================== +++ b/fs/Makefile
--- linux-2.6.22.19.orig/fs/Makefile @@ -72,6 +72,7 @@
+++ linux-2.6.22.19/fs/Makefile
@@ -72,6 +72,7 @@ obj-$(CONFIG_JBD) += jbd/
obj-$(CONFIG_JBD2) += jbd2/ obj-$(CONFIG_JBD2) += jbd2/
obj-$(CONFIG_EXT2_FS) += ext2/ obj-$(CONFIG_EXT2_FS) += ext2/
obj-$(CONFIG_CRAMFS) += cramfs/ obj-$(CONFIG_CRAMFS) += cramfs/
@ -86,10 +82,8 @@ Index: linux-2.6.22.19/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.22.19/fs/squashfs/inode.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/fs/squashfs/inode.c +++ b/fs/squashfs/inode.c
@@ -0,0 +1,2122 @@ @@ -0,0 +1,2122 @@
+/* +/*
+ * Squashfs - a compressed read only filesystem for Linux + * Squashfs - a compressed read only filesystem for Linux
@ -2213,10 +2207,8 @@ Index: linux-2.6.22.19/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.22.19/fs/squashfs/Makefile
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.
@ -2225,10 +2217,8 @@ Index: linux-2.6.22.19/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.22.19/fs/squashfs/squashfs2_0.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -2988,10 +2978,8 @@ Index: linux-2.6.22.19/fs/squashfs/squashfs2_0.c
+ +
+ return 1; + return 1;
+} +}
Index: linux-2.6.22.19/fs/squashfs/squashfs.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -3079,10 +3067,8 @@ Index: linux-2.6.22.19/fs/squashfs/squashfs.h
+ return 0; + return 0;
+} +}
+#endif +#endif
Index: linux-2.6.22.19/include/linux/magic.h --- a/include/linux/magic.h
=================================================================== +++ b/include/linux/magic.h
--- linux-2.6.22.19.orig/include/linux/magic.h
+++ linux-2.6.22.19/include/linux/magic.h
@@ -36,6 +36,9 @@ @@ -36,6 +36,9 @@
#define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs" #define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs"
#define REISER2FS_JR_SUPER_MAGIC_STRING "ReIsEr3Fs" #define REISER2FS_JR_SUPER_MAGIC_STRING "ReIsEr3Fs"
@ -3093,10 +3079,8 @@ Index: linux-2.6.22.19/include/linux/magic.h
#define SMB_SUPER_MAGIC 0x517B #define SMB_SUPER_MAGIC 0x517B
#define USBDEVICE_SUPER_MAGIC 0x9fa2 #define USBDEVICE_SUPER_MAGIC 0x9fa2
Index: linux-2.6.22.19/include/linux/squashfs_fs.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -4009,10 +3993,8 @@ Index: linux-2.6.22.19/include/linux/squashfs_fs.h
+ +
+#endif +#endif
+#endif +#endif
Index: linux-2.6.22.19/include/linux/squashfs_fs_i.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -4059,10 +4041,8 @@ Index: linux-2.6.22.19/include/linux/squashfs_fs_i.h
+ struct inode vfs_inode; + struct inode vfs_inode;
+}; +};
+#endif +#endif
Index: linux-2.6.22.19/include/linux/squashfs_fs_sb.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -4138,10 +4118,8 @@ Index: linux-2.6.22.19/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.22.19/init/do_mounts_rd.c --- a/init/do_mounts_rd.c
=================================================================== +++ b/init/do_mounts_rd.c
--- linux-2.6.22.19.orig/init/do_mounts_rd.c
+++ linux-2.6.22.19/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>
@ -4150,7 +4128,7 @@ Index: linux-2.6.22.19/init/do_mounts_rd.c
#include <linux/initrd.h> #include <linux/initrd.h>
#include <linux/string.h> #include <linux/string.h>
@@ -39,6 +40,7 @@ static int __init crd_load(int in_fd, in @@ -39,6 +40,7 @@
* numbers could not be found. * numbers could not be found.
* *
* We currently check for the following magic numbers: * We currently check for the following magic numbers:
@ -4158,7 +4136,7 @@ Index: linux-2.6.22.19/init/do_mounts_rd.c
* minix * minix
* ext2 * ext2
* romfs * romfs
@@ -53,6 +55,7 @@ identify_ramdisk_image(int fd, int start @@ -53,6 +55,7 @@
struct ext2_super_block *ext2sb; struct ext2_super_block *ext2sb;
struct romfs_super_block *romfsb; struct romfs_super_block *romfsb;
struct cramfs_super *cramfsb; struct cramfs_super *cramfsb;
@ -4166,7 +4144,7 @@ Index: linux-2.6.22.19/init/do_mounts_rd.c
int nblocks = -1; int nblocks = -1;
unsigned char *buf; unsigned char *buf;
@@ -64,6 +67,7 @@ identify_ramdisk_image(int fd, int start @@ -64,6 +67,7 @@
ext2sb = (struct ext2_super_block *) buf; ext2sb = (struct ext2_super_block *) buf;
romfsb = (struct romfs_super_block *) buf; romfsb = (struct romfs_super_block *) buf;
cramfsb = (struct cramfs_super *) buf; cramfsb = (struct cramfs_super *) buf;
@ -4174,7 +4152,7 @@ Index: linux-2.6.22.19/init/do_mounts_rd.c
memset(buf, 0xe5, size); memset(buf, 0xe5, size);
/* /*
@@ -101,6 +105,15 @@ identify_ramdisk_image(int fd, int start @@ -101,6 +105,15 @@
goto done; goto done;
} }

18
target/linux/generic-2.6/patches-2.6.22/002-lzma_decompress.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.22.19/include/linux/LzmaDecode.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/include/linux/LzmaDecode.h
+ UInt32 *outSizeProcessed); + UInt32 *outSizeProcessed);
+ +
+#endif +#endif
Index: linux-2.6.22.19/lib/LzmaDecode.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/lib/LzmaDecode.c +++ b/lib/LzmaDecode.c
@@ -0,0 +1,663 @@ @@ -0,0 +1,663 @@
+/* +/*
+ LzmaDecode.c + LzmaDecode.c
@ -771,11 +767,9 @@ Index: linux-2.6.22.19/lib/LzmaDecode.c
+ *outSizeProcessed = nowPos; + *outSizeProcessed = nowPos;
+ return LZMA_RESULT_OK; + return LZMA_RESULT_OK;
+} +}
Index: linux-2.6.22.19/lib/Makefile --- a/lib/Makefile
=================================================================== +++ b/lib/Makefile
--- linux-2.6.22.19.orig/lib/Makefile @@ -13,7 +13,7 @@
+++ linux-2.6.22.19/lib/Makefile
@@ -13,7 +13,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
obj-y += div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \ obj-y += div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
@ -784,7 +778,7 @@ Index: linux-2.6.22.19/lib/Makefile
ifeq ($(CONFIG_DEBUG_KOBJECT),y) ifeq ($(CONFIG_DEBUG_KOBJECT),y)
CFLAGS_kobject.o += -DDEBUG CFLAGS_kobject.o += -DDEBUG
@@ -58,6 +58,7 @@ obj-$(CONFIG_SMP) += percpu_counter.o @@ -58,6 +58,7 @@
obj-$(CONFIG_AUDIT_GENERIC) += audit.o obj-$(CONFIG_AUDIT_GENERIC) += audit.o
obj-$(CONFIG_SWIOTLB) += swiotlb.o obj-$(CONFIG_SWIOTLB) += swiotlb.o

16
target/linux/generic-2.6/patches-2.6.22/003-squashfs_lzma.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.22.19/fs/squashfs/inode.c --- a/fs/squashfs/inode.c
=================================================================== +++ b/fs/squashfs/inode.c
--- linux-2.6.22.19.orig/fs/squashfs/inode.c
+++ linux-2.6.22.19/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>
@ -40,7 +38,7 @@ Index: linux-2.6.22.19/fs/squashfs/inode.c
static void squashfs_put_super(struct super_block *); static void squashfs_put_super(struct super_block *);
static int squashfs_statfs(struct dentry *, struct kstatfs *); static int squashfs_statfs(struct dentry *, struct kstatfs *);
static int squashfs_symlink_readpage(struct file *file, struct page *page); static int squashfs_symlink_readpage(struct file *file, struct page *page);
@@ -64,7 +81,11 @@ static int squashfs_get_sb(struct file_s @@ -64,7 +81,11 @@
const char *, void *, struct vfsmount *); const char *, void *, struct vfsmount *);
@ -52,7 +50,7 @@ Index: linux-2.6.22.19/fs/squashfs/inode.c
static struct file_system_type squashfs_fs_type = { static struct file_system_type squashfs_fs_type = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
@@ -249,6 +270,15 @@ SQSH_EXTERN unsigned int squashfs_read_d @@ -249,6 +270,15 @@
if (compressed) { if (compressed) {
int zlib_err; int zlib_err;
@ -68,7 +66,7 @@ Index: linux-2.6.22.19/fs/squashfs/inode.c
stream.next_in = c_buffer; stream.next_in = c_buffer;
stream.avail_in = c_byte; stream.avail_in = c_byte;
stream.next_out = buffer; stream.next_out = buffer;
@@ -263,7 +293,7 @@ SQSH_EXTERN unsigned int squashfs_read_d @@ -263,7 +293,7 @@
bytes = 0; bytes = 0;
} else } else
bytes = stream.total_out; bytes = stream.total_out;
@ -77,7 +75,7 @@ Index: linux-2.6.22.19/fs/squashfs/inode.c
up(&msblk->read_data_mutex); up(&msblk->read_data_mutex);
} }
@@ -2045,15 +2075,19 @@ static int __init init_squashfs_fs(void) @@ -2045,15 +2075,19 @@
printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) " printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) "
"Phillip Lougher\n"); "Phillip Lougher\n");
@ -97,7 +95,7 @@ Index: linux-2.6.22.19/fs/squashfs/inode.c
destroy_inodecache(); destroy_inodecache();
} }
@@ -2064,7 +2098,9 @@ out: @@ -2064,7 +2098,9 @@
static void __exit exit_squashfs_fs(void) static void __exit exit_squashfs_fs(void)
{ {

8
target/linux/generic-2.6/patches-2.6.22/004-extra_optimization.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/Makefile --- a/Makefile
=================================================================== +++ b/Makefile
--- linux-2.6.22.19.orig/Makefile @@ -507,6 +507,9 @@
+++ linux-2.6.22.19/Makefile
@@ -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)

8
target/linux/generic-2.6/patches-2.6.22/006-gcc4_inline_fix.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/include/asm-mips/system.h --- a/include/asm-mips/system.h
=================================================================== +++ b/include/asm-mips/system.h
--- linux-2.6.22.19.orig/include/asm-mips/system.h @@ -188,7 +188,7 @@
+++ linux-2.6.22.19/include/asm-mips/system.h
@@ -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);

8
target/linux/generic-2.6/patches-2.6.22/007-samsung_flash.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.22.19/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.22.19.orig/drivers/mtd/chips/cfi_cmdset_0002.c
+++ linux-2.6.22.19/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
@ -10,7 +8,7 @@ Index: linux-2.6.22.19/drivers/mtd/chips/cfi_cmdset_0002.c
static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *); static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *); static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
@@ -294,12 +295,19 @@ struct mtd_info *cfi_cmdset_0002(struct @@ -294,12 +295,19 @@
if (extp->MajorVersion != '1' || if (extp->MajorVersion != '1' ||
(extp->MinorVersion < '0' || extp->MinorVersion > '4')) { (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {

22
target/linux/generic-2.6/patches-2.6.22/009-revert_intel_flash_breakage.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/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.22.19.orig/drivers/mtd/chips/cfi_cmdset_0001.c @@ -933,7 +933,7 @@
+++ linux-2.6.22.19/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -933,7 +933,7 @@ static void __xipram xip_enable(struct m
static int __xipram xip_wait_for_operation( static int __xipram xip_wait_for_operation(
struct map_info *map, struct flchip *chip, struct map_info *map, struct flchip *chip,
@ -11,7 +9,7 @@ Index: linux-2.6.22.19/drivers/mtd/chips/cfi_cmdset_0001.c
{ {
struct cfi_private *cfi = map->fldrv_priv; struct cfi_private *cfi = map->fldrv_priv;
struct cfi_pri_intelext *cfip = cfi->cmdset_priv; struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
@@ -942,7 +942,7 @@ static int __xipram xip_wait_for_operati @@ -942,7 +942,7 @@
flstate_t oldstate, newstate; flstate_t oldstate, newstate;
start = xip_currtime(); start = xip_currtime();
@ -20,7 +18,7 @@ Index: linux-2.6.22.19/drivers/mtd/chips/cfi_cmdset_0001.c
if (usec == 0) if (usec == 0)
usec = 500000; usec = 500000;
done = 0; done = 0;
@@ -1052,8 +1052,8 @@ static int __xipram xip_wait_for_operati @@ -1052,8 +1052,8 @@
#define XIP_INVAL_CACHED_RANGE(map, from, size) \ #define XIP_INVAL_CACHED_RANGE(map, from, size) \
INVALIDATE_CACHED_RANGE(map, from, size) INVALIDATE_CACHED_RANGE(map, from, size)
@ -31,7 +29,7 @@ Index: linux-2.6.22.19/drivers/mtd/chips/cfi_cmdset_0001.c
#else #else
@@ -1065,65 +1065,65 @@ static int __xipram xip_wait_for_operati @@ -1065,65 +1065,65 @@
static int inval_cache_and_wait_for_operation( static int inval_cache_and_wait_for_operation(
struct map_info *map, struct flchip *chip, struct map_info *map, struct flchip *chip,
unsigned long cmd_adr, unsigned long inval_adr, int inval_len, unsigned long cmd_adr, unsigned long inval_adr, int inval_len,
@ -132,7 +130,7 @@ Index: linux-2.6.22.19/drivers/mtd/chips/cfi_cmdset_0001.c
/* Done and happy. */ /* Done and happy. */
chip->state = FL_STATUS; chip->state = FL_STATUS;
return 0; return 0;
@@ -1132,7 +1132,8 @@ static int inval_cache_and_wait_for_oper @@ -1132,7 +1132,8 @@
#endif #endif
#define WAIT_TIMEOUT(map, chip, adr, udelay) \ #define WAIT_TIMEOUT(map, chip, adr, udelay) \
@ -142,7 +140,7 @@ Index: linux-2.6.22.19/drivers/mtd/chips/cfi_cmdset_0001.c
static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len) static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len)
@@ -1356,7 +1357,7 @@ static int __xipram do_write_oneword(str @@ -1356,7 +1357,7 @@
ret = INVAL_CACHE_AND_WAIT(map, chip, adr, ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
adr, map_bankwidth(map), adr, map_bankwidth(map),
@ -151,7 +149,7 @@ Index: linux-2.6.22.19/drivers/mtd/chips/cfi_cmdset_0001.c
if (ret) { if (ret) {
xip_enable(map, chip, adr); xip_enable(map, chip, adr);
printk(KERN_ERR "%s: word write error (status timeout)\n", map->name); printk(KERN_ERR "%s: word write error (status timeout)\n", map->name);
@@ -1593,7 +1594,7 @@ static int __xipram do_write_buffer(stru @@ -1593,7 +1594,7 @@
ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr, ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,
adr, len, adr, len,
@ -160,7 +158,7 @@ Index: linux-2.6.22.19/drivers/mtd/chips/cfi_cmdset_0001.c
if (ret) { if (ret) {
map_write(map, CMD(0x70), cmd_adr); map_write(map, CMD(0x70), cmd_adr);
chip->state = FL_STATUS; chip->state = FL_STATUS;
@@ -1728,7 +1729,7 @@ static int __xipram do_erase_oneblock(st @@ -1728,7 +1729,7 @@
ret = INVAL_CACHE_AND_WAIT(map, chip, adr, ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
adr, len, adr, len,

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

@ -1,16 +1,12 @@
Index: linux-2.6.22.19/fs/squashfs/Makefile --- a/fs/squashfs/Makefile
=================================================================== +++ b/fs/squashfs/Makefile
--- linux-2.6.22.19.orig/fs/squashfs/Makefile
+++ linux-2.6.22.19/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.22.19/fs/squashfs/squashfs.h --- a/fs/squashfs/squashfs.h
=================================================================== +++ b/fs/squashfs/squashfs.h
--- linux-2.6.22.19.orig/fs/squashfs/squashfs.h
+++ linux-2.6.22.19/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.22/011-mips_boot.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.22.19/arch/mips/kernel/head.S --- a/arch/mips/kernel/head.S
=================================================================== +++ b/arch/mips/kernel/head.S
--- linux-2.6.22.19.orig/arch/mips/kernel/head.S
+++ linux-2.6.22.19/arch/mips/kernel/head.S
@@ -129,11 +129,15 @@ @@ -129,11 +129,15 @@
#endif #endif
.endm .endm

10
target/linux/generic-2.6/patches-2.6.22/012-mips_cpu_tlb.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/arch/mips/mm/tlbex.c --- a/arch/mips/mm/tlbex.c
=================================================================== +++ b/arch/mips/mm/tlbex.c
--- linux-2.6.22.19.orig/arch/mips/mm/tlbex.c @@ -887,7 +887,6 @@
+++ linux-2.6.22.19/arch/mips/mm/tlbex.c
@@ -887,7 +887,6 @@ static __init void build_tlb_write_entry
case CPU_R10000: case CPU_R10000:
case CPU_R12000: case CPU_R12000:
case CPU_R14000: case CPU_R14000:
@ -10,7 +8,7 @@ Index: linux-2.6.22.19/arch/mips/mm/tlbex.c
case CPU_SB1: case CPU_SB1:
case CPU_SB1A: case CPU_SB1A:
case CPU_4KSC: case CPU_4KSC:
@@ -915,6 +914,7 @@ static __init void build_tlb_write_entry @@ -915,6 +914,7 @@
tlbw(p); tlbw(p);
break; break;

20
target/linux/generic-2.6/patches-2.6.22/013-mips_generic_gpio_support.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/arch/mips/defconfig --- a/arch/mips/defconfig
=================================================================== +++ b/arch/mips/defconfig
--- linux-2.6.22.19.orig/arch/mips/defconfig @@ -69,6 +69,7 @@
+++ linux-2.6.22.19/arch/mips/defconfig
@@ -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
CONFIG_GENERIC_TIME=y CONFIG_GENERIC_TIME=y
@ -10,11 +8,9 @@ Index: linux-2.6.22.19/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.22.19/arch/mips/Kconfig --- a/arch/mips/Kconfig
=================================================================== +++ b/arch/mips/Kconfig
--- linux-2.6.22.19.orig/arch/mips/Kconfig @@ -704,6 +704,10 @@
+++ linux-2.6.22.19/arch/mips/Kconfig
@@ -704,6 +704,10 @@ config GENERIC_TIME
bool bool
default y default y
@ -25,10 +21,8 @@ Index: linux-2.6.22.19/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.22.19/include/asm-mips/gpio.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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

444
target/linux/generic-2.6/patches-2.6.22/014-x86_newsetup.patch
View File

File diff suppressed because it is too large Load Diff

8
target/linux/generic-2.6/patches-2.6.22/015-x86_newsetup_fixup.patch
View File

@ -6,11 +6,9 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
arch/i386/kernel/cpu/Makefile | 2 +- arch/i386/kernel/cpu/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6.22.19/arch/i386/kernel/cpu/Makefile --- a/arch/i386/kernel/cpu/Makefile
=================================================================== +++ b/arch/i386/kernel/cpu/Makefile
--- linux-2.6.22.19.orig/arch/i386/kernel/cpu/Makefile @@ -8,7 +8,7 @@
+++ linux-2.6.22.19/arch/i386/kernel/cpu/Makefile
@@ -8,7 +8,7 @@ obj-y += amd.o
obj-y += cyrix.o obj-y += cyrix.o
obj-y += centaur.o obj-y += centaur.o
obj-y += transmeta.o obj-y += transmeta.o

20
target/linux/generic-2.6/patches-2.6.22/060-block2mtd_init.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.22.19/drivers/mtd/devices/block2mtd.c --- a/drivers/mtd/devices/block2mtd.c
=================================================================== +++ b/drivers/mtd/devices/block2mtd.c
--- linux-2.6.22.19.orig/drivers/mtd/devices/block2mtd.c
+++ linux-2.6.22.19/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>
@ -10,7 +8,7 @@ Index: linux-2.6.22.19/drivers/mtd/devices/block2mtd.c
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/mount.h> #include <linux/mount.h>
@@ -237,10 +238,11 @@ static void block2mtd_free_device(struct @@ -237,10 +238,11 @@
/* FIXME: ensure that mtd->size % erase_size == 0 */ /* FIXME: ensure that mtd->size % erase_size == 0 */
@ -23,7 +21,7 @@ Index: linux-2.6.22.19/drivers/mtd/devices/block2mtd.c
if (!devname) if (!devname)
return NULL; return NULL;
@@ -279,14 +281,18 @@ static struct block2mtd_dev *add_device( @@ -279,14 +281,18 @@
/* Setup the MTD structure */ /* Setup the MTD structure */
/* make the name contain the block device in */ /* make the name contain the block device in */
@ -47,7 +45,7 @@ Index: linux-2.6.22.19/drivers/mtd/devices/block2mtd.c
dev->mtd.erasesize = erase_size; dev->mtd.erasesize = erase_size;
dev->mtd.writesize = 1; dev->mtd.writesize = 1;
dev->mtd.type = MTD_RAM; dev->mtd.type = MTD_RAM;
@@ -298,15 +304,18 @@ static struct block2mtd_dev *add_device( @@ -298,15 +304,18 @@
dev->mtd.read = block2mtd_read; dev->mtd.read = block2mtd_read;
dev->mtd.priv = dev; dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE; dev->mtd.owner = THIS_MODULE;
@ -70,7 +68,7 @@ Index: linux-2.6.22.19/drivers/mtd/devices/block2mtd.c
return dev; return dev;
devinit_err: devinit_err:
@@ -379,9 +388,9 @@ static char block2mtd_paramline[80 + 12] @@ -379,9 +388,9 @@
static int block2mtd_setup2(const char *val) static int block2mtd_setup2(const char *val)
{ {
@ -82,7 +80,7 @@ Index: linux-2.6.22.19/drivers/mtd/devices/block2mtd.c
char *name; char *name;
size_t erase_size = PAGE_SIZE; size_t erase_size = PAGE_SIZE;
int i, ret; int i, ret;
@@ -392,7 +401,7 @@ static int block2mtd_setup2(const char * @@ -392,7 +401,7 @@
strcpy(str, val); strcpy(str, val);
kill_final_newline(str); kill_final_newline(str);
@ -91,7 +89,7 @@ Index: linux-2.6.22.19/drivers/mtd/devices/block2mtd.c
token[i] = strsep(&str, ","); token[i] = strsep(&str, ",");
if (str) if (str)
@@ -412,8 +421,10 @@ static int block2mtd_setup2(const char * @@ -412,8 +421,10 @@
parse_err("illegal erase size"); parse_err("illegal erase size");
} }
} }
@ -103,7 +101,7 @@ Index: linux-2.6.22.19/drivers/mtd/devices/block2mtd.c
return 0; return 0;
} }
@@ -447,7 +458,7 @@ static int block2mtd_setup(const char *v @@ -447,7 +458,7 @@
module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200); module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);

86
target/linux/generic-2.6/patches-2.6.22/065-rootfs_split.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/drivers/mtd/Kconfig --- a/drivers/mtd/Kconfig
=================================================================== +++ b/drivers/mtd/Kconfig
--- linux-2.6.22.19.orig/drivers/mtd/Kconfig @@ -47,6 +47,16 @@
+++ linux-2.6.22.19/drivers/mtd/Kconfig
@@ -47,6 +47,16 @@ config MTD_PARTITIONS
devices. Partitioning on NFTL 'devices' is a different - that's the devices. Partitioning on NFTL 'devices' is a different - that's the
'normal' form of partitioning used on a block device. 'normal' form of partitioning used on a block device.
@ -19,10 +17,8 @@ Index: linux-2.6.22.19/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.22.19/drivers/mtd/mtdpart.c --- a/drivers/mtd/mtdpart.c
=================================================================== +++ b/drivers/mtd/mtdpart.c
--- linux-2.6.22.19.orig/drivers/mtd/mtdpart.c
+++ linux-2.6.22.19/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>
@ -32,7 +28,7 @@ Index: linux-2.6.22.19/drivers/mtd/mtdpart.c
/* Our partition linked list */ /* Our partition linked list */
static LIST_HEAD(mtd_partitions); static LIST_HEAD(mtd_partitions);
@@ -39,7 +41,7 @@ struct mtd_part { @@ -39,7 +41,7 @@
* the pointer to that structure with this macro. * the pointer to that structure with this macro.
*/ */
#define PART(x) ((struct mtd_part *)(x)) #define PART(x) ((struct mtd_part *)(x))
@ -41,7 +37,7 @@ Index: linux-2.6.22.19/drivers/mtd/mtdpart.c
/* /*
* MTD methods which simply translate the effective address and pass through * MTD methods which simply translate the effective address and pass through
@@ -308,6 +310,312 @@ int del_mtd_partitions(struct mtd_info * @@ -308,6 +310,312 @@
return 0; return 0;
} }
@ -354,7 +350,7 @@ Index: linux-2.6.22.19/drivers/mtd/mtdpart.c
/* /*
* This function, given a master MTD object and a partition table, creates * This function, given a master MTD object and a partition table, creates
* and registers slave MTD objects which are bound to the master according to * and registers slave MTD objects which are bound to the master according to
@@ -320,168 +628,31 @@ int add_mtd_partitions(struct mtd_info * @@ -320,168 +628,31 @@
int nbparts) int nbparts)
{ {
struct mtd_part *slave; struct mtd_part *slave;
@ -544,7 +540,7 @@ Index: linux-2.6.22.19/drivers/mtd/mtdpart.c
} }
} }
@@ -557,6 +728,32 @@ int parse_mtd_partitions(struct mtd_info @@ -557,6 +728,32 @@
return ret; return ret;
} }
@ -577,11 +573,9 @@ Index: linux-2.6.22.19/drivers/mtd/mtdpart.c
+EXPORT_SYMBOL_GPL(refresh_mtd_partitions); +EXPORT_SYMBOL_GPL(refresh_mtd_partitions);
EXPORT_SYMBOL_GPL(register_mtd_parser); EXPORT_SYMBOL_GPL(register_mtd_parser);
EXPORT_SYMBOL_GPL(deregister_mtd_parser); EXPORT_SYMBOL_GPL(deregister_mtd_parser);
Index: linux-2.6.22.19/drivers/mtd/devices/block2mtd.c --- a/drivers/mtd/devices/block2mtd.c
=================================================================== +++ b/drivers/mtd/devices/block2mtd.c
--- linux-2.6.22.19.orig/drivers/mtd/devices/block2mtd.c @@ -34,6 +34,8 @@
+++ linux-2.6.22.19/drivers/mtd/devices/block2mtd.c
@@ -34,6 +34,8 @@ struct block2mtd_dev {
struct block_device *blkdev; struct block_device *blkdev;
struct mtd_info mtd; struct mtd_info mtd;
struct mutex write_mutex; struct mutex write_mutex;
@ -590,7 +584,7 @@ Index: linux-2.6.22.19/drivers/mtd/devices/block2mtd.c
}; };
@@ -86,6 +88,12 @@ static int block2mtd_erase(struct mtd_in @@ -86,6 +88,12 @@
size_t len = instr->len; size_t len = instr->len;
int err; int err;
@ -603,7 +597,7 @@ Index: linux-2.6.22.19/drivers/mtd/devices/block2mtd.c
instr->state = MTD_ERASING; instr->state = MTD_ERASING;
mutex_lock(&dev->write_mutex); mutex_lock(&dev->write_mutex);
err = _block2mtd_erase(dev, from, len); err = _block2mtd_erase(dev, from, len);
@@ -98,6 +106,10 @@ static int block2mtd_erase(struct mtd_in @@ -98,6 +106,10 @@
instr->state = MTD_ERASE_DONE; instr->state = MTD_ERASE_DONE;
mtd_erase_callback(instr); mtd_erase_callback(instr);
@ -614,7 +608,7 @@ Index: linux-2.6.22.19/drivers/mtd/devices/block2mtd.c
return err; return err;
} }
@@ -109,10 +121,14 @@ static int block2mtd_read(struct mtd_inf @@ -109,10 +121,14 @@
struct page *page; struct page *page;
int index = from >> PAGE_SHIFT; int index = from >> PAGE_SHIFT;
int offset = from & (PAGE_SIZE-1); int offset = from & (PAGE_SIZE-1);
@ -632,7 +626,7 @@ Index: linux-2.6.22.19/drivers/mtd/devices/block2mtd.c
if (from + len > mtd->size) if (from + len > mtd->size)
len = mtd->size - from; len = mtd->size - from;
@@ -127,10 +143,14 @@ static int block2mtd_read(struct mtd_inf @@ -127,10 +143,14 @@
len = len - cpylen; len = len - cpylen;
page = page_read(dev->blkdev->bd_inode->i_mapping, index); page = page_read(dev->blkdev->bd_inode->i_mapping, index);
@ -651,7 +645,7 @@ Index: linux-2.6.22.19/drivers/mtd/devices/block2mtd.c
memcpy(buf, page_address(page) + offset, cpylen); memcpy(buf, page_address(page) + offset, cpylen);
page_cache_release(page); page_cache_release(page);
@@ -141,7 +161,10 @@ static int block2mtd_read(struct mtd_inf @@ -141,7 +161,10 @@
offset = 0; offset = 0;
index++; index++;
} }
@ -663,7 +657,7 @@ Index: linux-2.6.22.19/drivers/mtd/devices/block2mtd.c
} }
@@ -193,12 +216,22 @@ static int block2mtd_write(struct mtd_in @@ -193,12 +216,22 @@
size_t *retlen, const u_char *buf) size_t *retlen, const u_char *buf)
{ {
struct block2mtd_dev *dev = mtd->priv; struct block2mtd_dev *dev = mtd->priv;
@ -690,7 +684,7 @@ Index: linux-2.6.22.19/drivers/mtd/devices/block2mtd.c
if (to + len > mtd->size) if (to + len > mtd->size)
len = mtd->size - to; len = mtd->size - to;
@@ -207,6 +240,9 @@ static int block2mtd_write(struct mtd_in @@ -207,6 +240,9 @@
mutex_unlock(&dev->write_mutex); mutex_unlock(&dev->write_mutex);
if (err > 0) if (err > 0)
err = 0; err = 0;
@ -700,7 +694,7 @@ Index: linux-2.6.22.19/drivers/mtd/devices/block2mtd.c
return err; return err;
} }
@@ -215,51 +251,29 @@ static int block2mtd_write(struct mtd_in @@ -215,51 +251,29 @@
static void block2mtd_sync(struct mtd_info *mtd) static void block2mtd_sync(struct mtd_info *mtd)
{ {
struct block2mtd_dev *dev = mtd->priv; struct block2mtd_dev *dev = mtd->priv;
@ -760,7 +754,7 @@ Index: linux-2.6.22.19/drivers/mtd/devices/block2mtd.c
if (devt) { if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ); bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
} }
@@ -267,17 +281,96 @@ static struct block2mtd_dev *add_device( @@ -267,17 +281,96 @@
#endif #endif
if (IS_ERR(bdev)) { if (IS_ERR(bdev)) {
@ -860,7 +854,7 @@ Index: linux-2.6.22.19/drivers/mtd/devices/block2mtd.c
/* Setup the MTD structure */ /* Setup the MTD structure */
/* make the name contain the block device in */ /* make the name contain the block device in */
@@ -304,6 +397,7 @@ static struct block2mtd_dev *add_device( @@ -304,6 +397,7 @@
dev->mtd.read = block2mtd_read; dev->mtd.read = block2mtd_read;
dev->mtd.priv = dev; dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE; dev->mtd.owner = THIS_MODULE;
@ -868,10 +862,8 @@ Index: linux-2.6.22.19/drivers/mtd/devices/block2mtd.c
part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL); part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
part->name = dev->mtd.name; part->name = dev->mtd.name;
Index: linux-2.6.22.19/drivers/mtd/mtdchar.c --- a/drivers/mtd/mtdchar.c
=================================================================== +++ b/drivers/mtd/mtdchar.c
--- linux-2.6.22.19.orig/drivers/mtd/mtdchar.c
+++ linux-2.6.22.19/drivers/mtd/mtdchar.c
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
@ -880,7 +872,7 @@ Index: linux-2.6.22.19/drivers/mtd/mtdchar.c
#include <asm/uaccess.h> #include <asm/uaccess.h>
@@ -752,6 +753,13 @@ static int mtd_ioctl(struct inode *inode @@ -752,6 +753,13 @@
file->f_pos = 0; file->f_pos = 0;
break; break;
} }
@ -894,11 +886,9 @@ Index: linux-2.6.22.19/drivers/mtd/mtdchar.c
default: default:
ret = -ENOTTY; ret = -ENOTTY;
Index: linux-2.6.22.19/include/linux/mtd/mtd.h --- a/include/linux/mtd/mtd.h
=================================================================== +++ b/include/linux/mtd/mtd.h
--- linux-2.6.22.19.orig/include/linux/mtd/mtd.h @@ -98,6 +98,7 @@
+++ linux-2.6.22.19/include/linux/mtd/mtd.h
@@ -98,6 +98,7 @@ struct mtd_oob_ops {
uint8_t *oobbuf; uint8_t *oobbuf;
}; };
@ -906,7 +896,7 @@ Index: linux-2.6.22.19/include/linux/mtd/mtd.h
struct mtd_info { struct mtd_info {
u_char type; u_char type;
u_int32_t flags; u_int32_t flags;
@@ -195,6 +196,9 @@ struct mtd_info { @@ -195,6 +196,9 @@
struct module *owner; struct module *owner;
int usecount; int usecount;
@ -916,10 +906,8 @@ Index: linux-2.6.22.19/include/linux/mtd/mtd.h
/* If the driver is something smart, like UBI, it may need to maintain /* If the driver is something smart, like UBI, it may need to maintain
* its own reference counting. The below functions are only for driver. * its own reference counting. The below functions are only for driver.
* The driver may register its callbacks. These callbacks are not * The driver may register its callbacks. These callbacks are not
Index: linux-2.6.22.19/include/linux/mtd/partitions.h --- a/include/linux/mtd/partitions.h
=================================================================== +++ b/include/linux/mtd/partitions.h
--- linux-2.6.22.19.orig/include/linux/mtd/partitions.h
+++ linux-2.6.22.19/include/linux/mtd/partitions.h
@@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
* erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK). * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
*/ */
@ -928,7 +916,7 @@ Index: linux-2.6.22.19/include/linux/mtd/partitions.h
struct mtd_partition { struct mtd_partition {
char *name; /* identifier string */ char *name; /* identifier string */
u_int32_t size; /* partition size */ u_int32_t size; /* partition size */
@@ -43,6 +44,7 @@ struct mtd_partition { @@ -43,6 +44,7 @@
u_int32_t mask_flags; /* master MTD flags to mask out for this partition */ u_int32_t mask_flags; /* master MTD flags to mask out for this partition */
struct nand_ecclayout *ecclayout; /* out of band layout for this partition (NAND only)*/ struct nand_ecclayout *ecclayout; /* out of band layout for this partition (NAND only)*/
struct mtd_info **mtdp; /* pointer to store the MTD object */ struct mtd_info **mtdp; /* pointer to store the MTD object */
@ -936,7 +924,7 @@ Index: linux-2.6.22.19/include/linux/mtd/partitions.h
}; };
#define MTDPART_OFS_NXTBLK (-2) #define MTDPART_OFS_NXTBLK (-2)
@@ -52,6 +54,7 @@ struct mtd_partition { @@ -52,6 +54,7 @@
int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int); int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
int del_mtd_partitions(struct mtd_info *); int del_mtd_partitions(struct mtd_info *);
@ -944,11 +932,9 @@ Index: linux-2.6.22.19/include/linux/mtd/partitions.h
/* /*
* Functions dealing with the various ways of partitioning the space * Functions dealing with the various ways of partitioning the space
Index: linux-2.6.22.19/include/mtd/mtd-abi.h --- a/include/mtd/mtd-abi.h
=================================================================== +++ b/include/mtd/mtd-abi.h
--- linux-2.6.22.19.orig/include/mtd/mtd-abi.h @@ -95,6 +95,7 @@
+++ linux-2.6.22.19/include/mtd/mtd-abi.h
@@ -95,6 +95,7 @@ struct otp_info {
#define ECCGETLAYOUT _IOR('M', 17, struct nand_ecclayout) #define ECCGETLAYOUT _IOR('M', 17, struct nand_ecclayout)
#define ECCGETSTATS _IOR('M', 18, struct mtd_ecc_stats) #define ECCGETSTATS _IOR('M', 18, struct mtd_ecc_stats)
#define MTDFILEMODE _IO('M', 19) #define MTDFILEMODE _IO('M', 19)

64
target/linux/generic-2.6/patches-2.6.22/100-netfilter_layer7_2.17.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/net/netfilter/Kconfig --- a/net/netfilter/Kconfig
=================================================================== +++ b/net/netfilter/Kconfig
--- linux-2.6.22.19.orig/net/netfilter/Kconfig @@ -603,6 +603,27 @@
+++ linux-2.6.22.19/net/netfilter/Kconfig
@@ -603,6 +603,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,11 +28,9 @@ Index: linux-2.6.22.19/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.22.19/net/netfilter/Makefile --- a/net/netfilter/Makefile
=================================================================== +++ b/net/netfilter/Makefile
--- linux-2.6.22.19.orig/net/netfilter/Makefile @@ -68,6 +68,7 @@
+++ linux-2.6.22.19/net/netfilter/Makefile
@@ -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
obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
@ -42,10 +38,8 @@ Index: linux-2.6.22.19/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.22.19/net/netfilter/xt_layer7.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/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.22.19/net/netfilter/regexp/regexp.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/net/netfilter/regexp/regexp.c
+#endif +#endif
+ +
+ +
Index: linux-2.6.22.19/net/netfilter/regexp/regexp.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/net/netfilter/regexp/regexp.h
+void regerror(char *s); +void regerror(char *s);
+ +
+#endif +#endif
Index: linux-2.6.22.19/net/netfilter/regexp/regmagic.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/net/netfilter/regexp/regsub.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/net/netfilter/regexp/regsub.c +++ b/net/netfilter/regexp/regsub.c
@@ -0,0 +1,95 @@ @@ -0,0 +1,95 @@
+/* +/*
+ * regsub + * regsub
@ -2039,11 +2025,9 @@ Index: linux-2.6.22.19/net/netfilter/regexp/regsub.c
+ } + }
+ *dst++ = '\0'; + *dst++ = '\0';
+} +}
Index: linux-2.6.22.19/net/netfilter/nf_conntrack_core.c --- a/net/netfilter/nf_conntrack_core.c
=================================================================== +++ b/net/netfilter/nf_conntrack_core.c
--- linux-2.6.22.19.orig/net/netfilter/nf_conntrack_core.c @@ -330,6 +330,14 @@
+++ linux-2.6.22.19/net/netfilter/nf_conntrack_core.c
@@ -330,6 +330,14 @@ destroy_conntrack(struct nf_conntrack *n
* too. */ * too. */
nf_ct_remove_expectations(ct); nf_ct_remove_expectations(ct);
@ -2058,11 +2042,9 @@ Index: linux-2.6.22.19/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.22.19/net/netfilter/nf_conntrack_standalone.c --- a/net/netfilter/nf_conntrack_standalone.c
=================================================================== +++ b/net/netfilter/nf_conntrack_standalone.c
--- linux-2.6.22.19.orig/net/netfilter/nf_conntrack_standalone.c @@ -184,7 +184,12 @@
+++ linux-2.6.22.19/net/netfilter/nf_conntrack_standalone.c
@@ -184,7 +184,12 @@ static int ct_seq_show(struct seq_file *
return -ENOSPC; return -ENOSPC;
#endif #endif
@ -2076,11 +2058,9 @@ Index: linux-2.6.22.19/net/netfilter/nf_conntrack_standalone.c
return -ENOSPC; return -ENOSPC;
return 0; return 0;
Index: linux-2.6.22.19/include/net/netfilter/nf_conntrack.h --- a/include/net/netfilter/nf_conntrack.h
=================================================================== +++ b/include/net/netfilter/nf_conntrack.h
--- linux-2.6.22.19.orig/include/net/netfilter/nf_conntrack.h @@ -128,6 +128,22 @@
+++ linux-2.6.22.19/include/net/netfilter/nf_conntrack.h
@@ -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.22.19/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.22.19/include/linux/netfilter/xt_layer7.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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

22
target/linux/generic-2.6/patches-2.6.22/101-netfilter_layer7_pktmatch.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/include/linux/netfilter/xt_layer7.h --- a/include/linux/netfilter/xt_layer7.h
=================================================================== +++ b/include/linux/netfilter/xt_layer7.h
--- linux-2.6.22.19.orig/include/linux/netfilter/xt_layer7.h @@ -8,6 +8,7 @@
+++ linux-2.6.22.19/include/linux/netfilter/xt_layer7.h
@@ -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];
u_int8_t invert; u_int8_t invert;
@ -10,11 +8,9 @@ Index: linux-2.6.22.19/include/linux/netfilter/xt_layer7.h
}; };
#endif /* _XT_LAYER7_H */ #endif /* _XT_LAYER7_H */
Index: linux-2.6.22.19/net/netfilter/xt_layer7.c --- a/net/netfilter/xt_layer7.c
=================================================================== +++ b/net/netfilter/xt_layer7.c
--- linux-2.6.22.19.orig/net/netfilter/xt_layer7.c @@ -297,34 +297,36 @@
+++ linux-2.6.22.19/net/netfilter/xt_layer7.c
@@ -297,34 +297,36 @@ static int match_no_append(struct nf_con
} }
/* add the new app data to the conntrack. Return number of bytes added. */ /* add the new app data to the conntrack. Return number of bytes added. */
@ -65,7 +61,7 @@ Index: linux-2.6.22.19/net/netfilter/xt_layer7.c
return length; return length;
} }
@@ -411,7 +413,7 @@ match(const struct sk_buff *skbin, @@ -411,7 +413,7 @@
const struct xt_layer7_info * info = matchinfo; const struct xt_layer7_info * info = matchinfo;
enum ip_conntrack_info master_ctinfo, ctinfo; enum ip_conntrack_info master_ctinfo, ctinfo;
struct nf_conn *master_conntrack, *conntrack; struct nf_conn *master_conntrack, *conntrack;
@ -74,7 +70,7 @@ Index: linux-2.6.22.19/net/netfilter/xt_layer7.c
unsigned int pattern_result, appdatalen; unsigned int pattern_result, appdatalen;
regexp * comppattern; regexp * comppattern;
@@ -439,8 +441,8 @@ match(const struct sk_buff *skbin, @@ -439,8 +441,8 @@
master_conntrack = master_ct(master_conntrack); master_conntrack = master_ct(master_conntrack);
/* if we've classified it or seen too many packets */ /* if we've classified it or seen too many packets */
@ -85,7 +81,7 @@ Index: linux-2.6.22.19/net/netfilter/xt_layer7.c
pattern_result = match_no_append(conntrack, master_conntrack, pattern_result = match_no_append(conntrack, master_conntrack,
ctinfo, master_ctinfo, info); ctinfo, master_ctinfo, info);
@@ -473,6 +475,25 @@ match(const struct sk_buff *skbin, @@ -473,6 +475,25 @@
/* the return value gets checked later, when we're ready to use it */ /* the return value gets checked later, when we're ready to use it */
comppattern = compile_and_cache(info->pattern, info->protocol); comppattern = compile_and_cache(info->pattern, info->protocol);

24
target/linux/generic-2.6/patches-2.6.22/110-ipp2p_0.8.1rc1.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ipt_ipp2p.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/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.22.19/net/ipv4/netfilter/ipt_ipp2p.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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,11 +917,9 @@ Index: linux-2.6.22.19/net/ipv4/netfilter/ipt_ipp2p.c
+module_exit(fini); +module_exit(fini);
+ +
+ +
Index: linux-2.6.22.19/net/ipv4/netfilter/Kconfig --- a/net/ipv4/netfilter/Kconfig
=================================================================== +++ b/net/ipv4/netfilter/Kconfig
--- linux-2.6.22.19.orig/net/ipv4/netfilter/Kconfig @@ -63,6 +63,12 @@
+++ linux-2.6.22.19/net/ipv4/netfilter/Kconfig
@@ -63,6 +63,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,11 +932,9 @@ Index: linux-2.6.22.19/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.22.19/net/ipv4/netfilter/Makefile --- a/net/ipv4/netfilter/Makefile
=================================================================== +++ b/net/ipv4/netfilter/Makefile
--- linux-2.6.22.19.orig/net/ipv4/netfilter/Makefile @@ -49,6 +49,7 @@
+++ linux-2.6.22.19/net/ipv4/netfilter/Makefile
@@ -49,6 +49,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
obj-$(CONFIG_IP_NF_MATCH_ADDRTYPE) += ipt_addrtype.o obj-$(CONFIG_IP_NF_MATCH_ADDRTYPE) += ipt_addrtype.o

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

@ -1,7 +1,5 @@
Index: linux-2.6.22.19/include/net/xfrmudp.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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,11 +11,9 @@ Index: linux-2.6.22.19/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.22.19/net/ipv4/Kconfig --- a/net/ipv4/Kconfig
=================================================================== +++ b/net/ipv4/Kconfig
--- linux-2.6.22.19.orig/net/ipv4/Kconfig @@ -266,6 +266,12 @@
+++ linux-2.6.22.19/net/ipv4/Kconfig
@@ -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.22.19/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.22.19/net/ipv4/udp.c --- a/net/ipv4/udp.c
=================================================================== +++ b/net/ipv4/udp.c
--- linux-2.6.22.19.orig/net/ipv4/udp.c
+++ linux-2.6.22.19/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>
@ -50,7 +44,7 @@ Index: linux-2.6.22.19/net/ipv4/udp.c
DEFINE_SNMP_STAT(struct udp_mib, udp_statistics) __read_mostly; DEFINE_SNMP_STAT(struct udp_mib, udp_statistics) __read_mostly;
struct hlist_head udp_hash[UDP_HTABLE_SIZE]; struct hlist_head udp_hash[UDP_HTABLE_SIZE];
@@ -919,6 +922,42 @@ int udp_disconnect(struct sock *sk, int @@ -919,6 +922,42 @@
return 0; return 0;
} }
@ -93,7 +87,7 @@ Index: linux-2.6.22.19/net/ipv4/udp.c
/* return: /* return:
* 1 if the UDP system should process it * 1 if the UDP system should process it
* 0 if we should drop this packet * 0 if we should drop this packet
@@ -926,7 +965,7 @@ int udp_disconnect(struct sock *sk, int @@ -926,7 +965,7 @@
*/ */
static int udp_encap_rcv(struct sock * sk, struct sk_buff *skb) static int udp_encap_rcv(struct sock * sk, struct sk_buff *skb)
{ {
@ -102,7 +96,7 @@ Index: linux-2.6.22.19/net/ipv4/udp.c
return 1; return 1;
#else #else
struct udp_sock *up = udp_sk(sk); struct udp_sock *up = udp_sk(sk);
@@ -941,11 +980,11 @@ static int udp_encap_rcv(struct sock * s @@ -941,11 +980,11 @@
/* if we're overly short, let UDP handle it */ /* if we're overly short, let UDP handle it */
len = skb->len - sizeof(struct udphdr); len = skb->len - sizeof(struct udphdr);
if (len <= 0) if (len <= 0)
@ -116,7 +110,7 @@ Index: linux-2.6.22.19/net/ipv4/udp.c
/* If this is a paged skb, make sure we pull up /* If this is a paged skb, make sure we pull up
* whatever data we need to look at. */ * whatever data we need to look at. */
@@ -968,7 +1007,7 @@ static int udp_encap_rcv(struct sock * s @@ -968,7 +1007,7 @@
len = sizeof(struct udphdr); len = sizeof(struct udphdr);
} else } else
/* Must be an IKE packet.. pass it through */ /* Must be an IKE packet.. pass it through */
@ -125,7 +119,7 @@ Index: linux-2.6.22.19/net/ipv4/udp.c
break; break;
case UDP_ENCAP_ESPINUDP_NON_IKE: case UDP_ENCAP_ESPINUDP_NON_IKE:
/* Check if this is a keepalive packet. If so, eat it. */ /* Check if this is a keepalive packet. If so, eat it. */
@@ -981,7 +1020,7 @@ static int udp_encap_rcv(struct sock * s @@ -981,7 +1020,7 @@
len = sizeof(struct udphdr) + 2 * sizeof(u32); len = sizeof(struct udphdr) + 2 * sizeof(u32);
} else } else
/* Must be an IKE packet.. pass it through */ /* Must be an IKE packet.. pass it through */
@ -134,7 +128,7 @@ Index: linux-2.6.22.19/net/ipv4/udp.c
break; break;
} }
@@ -992,6 +1031,8 @@ static int udp_encap_rcv(struct sock * s @@ -992,6 +1031,8 @@
*/ */
if (skb_cloned(skb) && pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) if (skb_cloned(skb) && pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
return 0; return 0;
@ -143,7 +137,7 @@ Index: linux-2.6.22.19/net/ipv4/udp.c
/* Now we can update and verify the packet length... */ /* Now we can update and verify the packet length... */
iph = ip_hdr(skb); iph = ip_hdr(skb);
@@ -1056,9 +1097,13 @@ int udp_queue_rcv_skb(struct sock * sk, @@ -1056,9 +1097,13 @@
return 0; return 0;
} }
if (ret < 0) { if (ret < 0) {
@ -160,7 +154,7 @@ Index: linux-2.6.22.19/net/ipv4/udp.c
return -ret; return -ret;
} }
/* FALLTHROUGH -- it's a UDP Packet */ /* FALLTHROUGH -- it's a UDP Packet */
@@ -1742,3 +1787,9 @@ EXPORT_SYMBOL(udp_poll); @@ -1742,3 +1787,9 @@
EXPORT_SYMBOL(udp_proc_register); EXPORT_SYMBOL(udp_proc_register);
EXPORT_SYMBOL(udp_proc_unregister); EXPORT_SYMBOL(udp_proc_unregister);
#endif #endif

110
target/linux/generic-2.6/patches-2.6.22/130-netfilter_ipset.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -501,10 +499,8 @@ Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set.h
+#endif /* __KERNEL__ */ +#endif /* __KERNEL__ */
+ +
+#endif /*_IP_SET_H*/ +#endif /*_IP_SET_H*/
Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_iphash.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -536,10 +532,8 @@ Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_iphash.h
+}; +};
+ +
+#endif /* __IP_SET_IPHASH_H */ +#endif /* __IP_SET_IPHASH_H */
Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_ipmap.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -597,10 +591,8 @@ Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_ipmap.h
+} +}
+ +
+#endif /* __IP_SET_IPMAP_H */ +#endif /* __IP_SET_IPMAP_H */
Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_ipporthash.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -636,10 +628,8 @@ Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_ipporthash.h
+}; +};
+ +
+#endif /* __IP_SET_IPPORTHASH_H */ +#endif /* __IP_SET_IPPORTHASH_H */
Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_iptree.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -681,10 +671,8 @@ Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_iptree.h
+}; +};
+ +
+#endif /* __IP_SET_IPTREE_H */ +#endif /* __IP_SET_IPTREE_H */
Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_iptreemap.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -726,10 +714,8 @@ Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_iptreemap.h
+}; +};
+ +
+#endif /* __IP_SET_IPTREEMAP_H */ +#endif /* __IP_SET_IPTREEMAP_H */
Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_jhash.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -879,10 +865,8 @@ Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_jhash.h
+} +}
+ +
+#endif /* _LINUX_IPSET_JHASH_H */ +#endif /* _LINUX_IPSET_JHASH_H */
Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_macipmap.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -922,10 +906,8 @@ Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_macipmap.h
+}; +};
+ +
+#endif /* __IP_SET_MACIPMAP_H */ +#endif /* __IP_SET_MACIPMAP_H */
Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_malloc.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -1043,10 +1025,8 @@ Index: linux-2.6.22.19/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.22.19/include/linux/netfilter_ipv4/ip_set_nethash.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -1103,10 +1083,8 @@ Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_nethash.h
+} +}
+ +
+#endif /* __IP_SET_NETHASH_H */ +#endif /* __IP_SET_NETHASH_H */
Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_portmap.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -1133,10 +1111,8 @@ Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_portmap.h
+}; +};
+ +
+#endif /* __IP_SET_PORTMAP_H */ +#endif /* __IP_SET_PORTMAP_H */
Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ipt_set.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -1159,10 +1135,8 @@ Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ipt_set.h
+}; +};
+ +
+#endif /*_IPT_SET_H*/ +#endif /*_IPT_SET_H*/
Index: linux-2.6.22.19/net/ipv4/netfilter/ip_set.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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>
@ -3167,10 +3141,8 @@ Index: linux-2.6.22.19/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.22.19/net/ipv4/netfilter/ip_set_iphash.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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>
+ * + *
@ -3601,10 +3573,8 @@ Index: linux-2.6.22.19/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.22.19/net/ipv4/netfilter/ip_set_ipmap.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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>
@ -3942,10 +3912,8 @@ Index: linux-2.6.22.19/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.22.19/net/ipv4/netfilter/ip_set_ipporthash.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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>
+ * + *
@ -4528,10 +4496,8 @@ Index: linux-2.6.22.19/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.22.19/net/ipv4/netfilter/ip_set_iptree.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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>
+ * + *
@ -5145,10 +5111,8 @@ Index: linux-2.6.22.19/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.22.19/net/ipv4/netfilter/ip_set_iptreemap.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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>
+ * + *
@ -5979,10 +5943,8 @@ Index: linux-2.6.22.19/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.22.19/net/ipv4/netfilter/ip_set_macipmap.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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>
@ -6359,10 +6321,8 @@ Index: linux-2.6.22.19/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.22.19/net/ipv4/netfilter/ip_set_nethash.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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>
+ * + *
@ -6861,10 +6821,8 @@ Index: linux-2.6.22.19/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.22.19/net/ipv4/netfilter/ip_set_portmap.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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>
+ * + *
@ -7212,10 +7170,8 @@ Index: linux-2.6.22.19/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.22.19/net/ipv4/netfilter/ipt_set.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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>
@ -7377,10 +7333,8 @@ Index: linux-2.6.22.19/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.22.19/net/ipv4/netfilter/ipt_SET.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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>
@ -7554,11 +7508,9 @@ Index: linux-2.6.22.19/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.22.19/net/ipv4/netfilter/Kconfig --- a/net/ipv4/netfilter/Kconfig
=================================================================== +++ b/net/ipv4/netfilter/Kconfig
--- linux-2.6.22.19.orig/net/ipv4/netfilter/Kconfig @@ -408,5 +408,122 @@
+++ linux-2.6.22.19/net/ipv4/netfilter/Kconfig
@@ -408,5 +408,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.
@ -7681,11 +7633,9 @@ Index: linux-2.6.22.19/net/ipv4/netfilter/Kconfig
+ +
endmenu endmenu
Index: linux-2.6.22.19/net/ipv4/netfilter/Makefile --- a/net/ipv4/netfilter/Makefile
=================================================================== +++ b/net/ipv4/netfilter/Makefile
--- linux-2.6.22.19.orig/net/ipv4/netfilter/Makefile @@ -48,6 +48,7 @@
+++ linux-2.6.22.19/net/ipv4/netfilter/Makefile
@@ -48,6 +48,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
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
@ -7693,7 +7643,7 @@ Index: linux-2.6.22.19/net/ipv4/netfilter/Makefile
obj-$(CONFIG_IP_NF_MATCH_ADDRTYPE) += ipt_addrtype.o obj-$(CONFIG_IP_NF_MATCH_ADDRTYPE) += ipt_addrtype.o
obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
@@ -63,6 +64,18 @@ obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LO @@ -63,6 +64,18 @@
obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o

24
target/linux/generic-2.6/patches-2.6.22/140-netfilter_time.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ipt_time.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/include/linux/netfilter_ipv4/ipt_time.h
+ +
+ +
+#endif /* __ipt_time_h_included__ */ +#endif /* __ipt_time_h_included__ */
Index: linux-2.6.22.19/net/ipv4/netfilter/ipt_time.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/net/ipv4/netfilter/ipt_time.c +++ b/net/ipv4/netfilter/ipt_time.c
@@ -0,0 +1,180 @@ @@ -0,0 +1,180 @@
+/* +/*
+ This is a module which is used for time matching + This is a module which is used for time matching
@ -206,11 +202,9 @@ Index: linux-2.6.22.19/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.22.19/net/ipv4/netfilter/Kconfig --- a/net/ipv4/netfilter/Kconfig
=================================================================== +++ b/net/ipv4/netfilter/Kconfig
--- linux-2.6.22.19.orig/net/ipv4/netfilter/Kconfig @@ -78,6 +78,22 @@
+++ linux-2.6.22.19/net/ipv4/netfilter/Kconfig
@@ -78,6 +78,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.
@ -233,11 +227,9 @@ Index: linux-2.6.22.19/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.22.19/net/ipv4/netfilter/Makefile --- a/net/ipv4/netfilter/Makefile
=================================================================== +++ b/net/ipv4/netfilter/Makefile
--- linux-2.6.22.19.orig/net/ipv4/netfilter/Makefile @@ -44,6 +44,7 @@
+++ linux-2.6.22.19/net/ipv4/netfilter/Makefile
@@ -44,6 +44,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
obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o

110
target/linux/generic-2.6/patches-2.6.22/150-netfilter_imq.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.22.19/drivers/net/imq.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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,11 +403,9 @@ Index: linux-2.6.22.19/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.22.19/drivers/net/Kconfig --- a/drivers/net/Kconfig
=================================================================== +++ b/drivers/net/Kconfig
--- linux-2.6.22.19.orig/drivers/net/Kconfig @@ -96,6 +96,129 @@
+++ linux-2.6.22.19/drivers/net/Kconfig
@@ -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,11 +535,9 @@ Index: linux-2.6.22.19/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.22.19/drivers/net/Makefile --- a/drivers/net/Makefile
=================================================================== +++ b/drivers/net/Makefile
--- linux-2.6.22.19.orig/drivers/net/Makefile @@ -124,6 +124,7 @@
+++ linux-2.6.22.19/drivers/net/Makefile
@@ -124,6 +124,7 @@ obj-$(CONFIG_SLIP) += slip.o
obj-$(CONFIG_SLHC) += slhc.o obj-$(CONFIG_SLHC) += slhc.o
obj-$(CONFIG_DUMMY) += dummy.o obj-$(CONFIG_DUMMY) += dummy.o
@ -551,10 +545,8 @@ Index: linux-2.6.22.19/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.22.19/include/linux/imq.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/include/linux/imq.h
+#define IMQ_F_ENQUEUE 0x80 +#define IMQ_F_ENQUEUE 0x80
+ +
+#endif /* _IMQ_H */ +#endif /* _IMQ_H */
Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ipt_IMQ.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/include/linux/netfilter_ipv4/ipt_IMQ.h
+}; +};
+ +
+#endif /* _IPT_IMQ_H */ +#endif /* _IPT_IMQ_H */
Index: linux-2.6.22.19/include/linux/netfilter_ipv6/ip6t_IMQ.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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,11 +579,9 @@ Index: linux-2.6.22.19/include/linux/netfilter_ipv6/ip6t_IMQ.h
+}; +};
+ +
+#endif /* _IP6T_IMQ_H */ +#endif /* _IP6T_IMQ_H */
Index: linux-2.6.22.19/include/linux/skbuff.h --- a/include/linux/skbuff.h
=================================================================== +++ b/include/linux/skbuff.h
--- linux-2.6.22.19.orig/include/linux/skbuff.h @@ -285,6 +285,10 @@
+++ linux-2.6.22.19/include/linux/skbuff.h
@@ -285,6 +285,10 @@ struct sk_buff {
struct nf_conntrack *nfct; struct nf_conntrack *nfct;
struct sk_buff *nfct_reasm; struct sk_buff *nfct_reasm;
#endif #endif
@ -606,10 +592,8 @@ Index: linux-2.6.22.19/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.22.19/net/core/dev.c --- a/net/core/dev.c
=================================================================== +++ b/net/core/dev.c
--- linux-2.6.22.19.orig/net/core/dev.c
+++ linux-2.6.22.19/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>
@ -620,7 +604,7 @@ Index: linux-2.6.22.19/net/core/dev.c
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/stat.h> #include <linux/stat.h>
@@ -1404,6 +1407,9 @@ int dev_hard_start_xmit(struct sk_buff * @@ -1404,6 +1407,9 @@
{ {
if (likely(!skb->next)) { if (likely(!skb->next)) {
if (!list_empty(&ptype_all)) if (!list_empty(&ptype_all))
@ -630,11 +614,9 @@ Index: linux-2.6.22.19/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.22.19/net/core/skbuff.c --- a/net/core/skbuff.c
=================================================================== +++ b/net/core/skbuff.c
--- linux-2.6.22.19.orig/net/core/skbuff.c @@ -419,6 +419,10 @@
+++ linux-2.6.22.19/net/core/skbuff.c
@@ -419,6 +419,10 @@ struct sk_buff *skb_clone(struct sk_buff
C(pkt_type); C(pkt_type);
C(ip_summed); C(ip_summed);
C(priority); C(priority);
@ -645,7 +627,7 @@ Index: linux-2.6.22.19/net/core/skbuff.c
#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE) #if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)
C(ipvs_property); C(ipvs_property);
#endif #endif
@@ -485,6 +489,10 @@ static void copy_skb_header(struct sk_bu @@ -485,6 +489,10 @@
#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE) #if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)
new->ipvs_property = old->ipvs_property; new->ipvs_property = old->ipvs_property;
#endif #endif
@ -656,10 +638,8 @@ Index: linux-2.6.22.19/net/core/skbuff.c
#ifdef CONFIG_NET_SCHED #ifdef CONFIG_NET_SCHED
#ifdef CONFIG_NET_CLS_ACT #ifdef CONFIG_NET_CLS_ACT
new->tc_verd = old->tc_verd; new->tc_verd = old->tc_verd;
Index: linux-2.6.22.19/net/ipv4/netfilter/ipt_IMQ.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -730,11 +710,9 @@ Index: linux-2.6.22.19/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.22.19/net/ipv4/netfilter/Kconfig --- a/net/ipv4/netfilter/Kconfig
=================================================================== +++ b/net/ipv4/netfilter/Kconfig
--- linux-2.6.22.19.orig/net/ipv4/netfilter/Kconfig @@ -333,6 +333,17 @@
+++ linux-2.6.22.19/net/ipv4/netfilter/Kconfig
@@ -333,6 +333,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.
@ -752,11 +730,9 @@ Index: linux-2.6.22.19/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.22.19/net/ipv4/netfilter/Makefile --- a/net/ipv4/netfilter/Makefile
=================================================================== +++ b/net/ipv4/netfilter/Makefile
--- linux-2.6.22.19.orig/net/ipv4/netfilter/Makefile @@ -57,6 +57,7 @@
+++ linux-2.6.22.19/net/ipv4/netfilter/Makefile
@@ -57,6 +57,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
obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
@ -764,10 +740,8 @@ Index: linux-2.6.22.19/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.22.19/net/ipv6/netfilter/ip6t_IMQ.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -838,11 +812,9 @@ Index: linux-2.6.22.19/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.22.19/net/ipv6/netfilter/Kconfig --- a/net/ipv6/netfilter/Kconfig
=================================================================== +++ b/net/ipv6/netfilter/Kconfig
--- linux-2.6.22.19.orig/net/ipv6/netfilter/Kconfig @@ -173,6 +173,15 @@
+++ linux-2.6.22.19/net/ipv6/netfilter/Kconfig
@@ -173,6 +173,15 @@ config IP6_NF_MANGLE
To compile it as a module, choose M here. If unsure, say N. To compile it as a module, choose M here. If unsure, say N.
@ -858,11 +830,9 @@ Index: linux-2.6.22.19/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.22.19/net/ipv6/netfilter/Makefile --- a/net/ipv6/netfilter/Makefile
=================================================================== +++ b/net/ipv6/netfilter/Makefile
--- linux-2.6.22.19.orig/net/ipv6/netfilter/Makefile @@ -13,6 +13,7 @@
+++ linux-2.6.22.19/net/ipv6/netfilter/Makefile
@@ -13,6 +13,7 @@ obj-$(CONFIG_IP6_NF_MATCH_EUI64) += ip6t
obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t_owner.o obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t_owner.o
obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
obj-$(CONFIG_IP6_NF_MANGLE) += ip6table_mangle.o obj-$(CONFIG_IP6_NF_MANGLE) += ip6table_mangle.o
@ -870,11 +840,9 @@ Index: linux-2.6.22.19/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.22.19/net/sched/sch_generic.c --- a/net/sched/sch_generic.c
=================================================================== +++ b/net/sched/sch_generic.c
--- linux-2.6.22.19.orig/net/sched/sch_generic.c @@ -77,7 +77,6 @@
+++ linux-2.6.22.19/net/sched/sch_generic.c
@@ -77,7 +77,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.
*/ */
@ -882,7 +850,7 @@ Index: linux-2.6.22.19/net/sched/sch_generic.c
static inline int qdisc_restart(struct net_device *dev) static inline int qdisc_restart(struct net_device *dev)
{ {
struct Qdisc *q = dev->qdisc; struct Qdisc *q = dev->qdisc;
@@ -177,6 +176,11 @@ out: @@ -177,6 +176,11 @@
return q->q.qlen; return q->q.qlen;
} }
@ -894,7 +862,7 @@ Index: linux-2.6.22.19/net/sched/sch_generic.c
void __qdisc_run(struct net_device *dev) void __qdisc_run(struct net_device *dev)
{ {
do { do {
@@ -608,3 +612,4 @@ EXPORT_SYMBOL(qdisc_destroy); @@ -608,3 +612,4 @@
EXPORT_SYMBOL(qdisc_reset); EXPORT_SYMBOL(qdisc_reset);
EXPORT_SYMBOL(qdisc_lock_tree); EXPORT_SYMBOL(qdisc_lock_tree);
EXPORT_SYMBOL(qdisc_unlock_tree); EXPORT_SYMBOL(qdisc_unlock_tree);

56
target/linux/generic-2.6/patches-2.6.22/160-netfilter_route.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ipt_ROUTE.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/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.22.19/include/linux/netfilter_ipv6/ip6t_ROUTE.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/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.22.19/net/ipv4/netfilter/ipt_ROUTE.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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,11 +536,9 @@ Index: linux-2.6.22.19/net/ipv4/netfilter/ipt_ROUTE.c
+ +
+module_init(init); +module_init(init);
+module_exit(fini); +module_exit(fini);
Index: linux-2.6.22.19/net/ipv4/netfilter/Kconfig --- a/net/ipv4/netfilter/Kconfig
=================================================================== +++ b/net/ipv4/netfilter/Kconfig
--- linux-2.6.22.19.orig/net/ipv4/netfilter/Kconfig @@ -552,5 +552,22 @@
+++ linux-2.6.22.19/net/ipv4/netfilter/Kconfig
@@ -552,5 +552,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,11 +561,9 @@ Index: linux-2.6.22.19/net/ipv4/netfilter/Kconfig
+ +
endmenu endmenu
Index: linux-2.6.22.19/net/ipv4/netfilter/Makefile --- a/net/ipv4/netfilter/Makefile
=================================================================== +++ b/net/ipv4/netfilter/Makefile
--- linux-2.6.22.19.orig/net/ipv4/netfilter/Makefile @@ -60,6 +60,7 @@
+++ linux-2.6.22.19/net/ipv4/netfilter/Makefile
@@ -60,6 +60,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
obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
@ -581,11 +571,9 @@ Index: linux-2.6.22.19/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_TARGET_LOG) += ipt_LOG.o obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o
Index: linux-2.6.22.19/net/ipv6/ndisc.c --- a/net/ipv6/ndisc.c
=================================================================== +++ b/net/ipv6/ndisc.c
--- linux-2.6.22.19.orig/net/ipv6/ndisc.c @@ -154,6 +154,8 @@
+++ linux-2.6.22.19/net/ipv6/ndisc.c
@@ -154,6 +154,8 @@ struct neigh_table nd_tbl = {
.gc_thresh3 = 1024, .gc_thresh3 = 1024,
}; };
@ -594,10 +582,8 @@ Index: linux-2.6.22.19/net/ipv6/ndisc.c
/* ND options */ /* ND options */
struct ndisc_options { struct ndisc_options {
struct nd_opt_hdr *nd_opt_array[__ND_OPT_ARRAY_MAX]; struct nd_opt_hdr *nd_opt_array[__ND_OPT_ARRAY_MAX];
Index: linux-2.6.22.19/net/ipv6/netfilter/ip6t_ROUTE.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -929,11 +915,9 @@ Index: linux-2.6.22.19/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.22.19/net/ipv6/netfilter/Kconfig --- a/net/ipv6/netfilter/Kconfig
=================================================================== +++ b/net/ipv6/netfilter/Kconfig
--- linux-2.6.22.19.orig/net/ipv6/netfilter/Kconfig @@ -209,5 +209,18 @@
+++ linux-2.6.22.19/net/ipv6/netfilter/Kconfig
@@ -209,5 +209,18 @@ config IP6_NF_RAW
If you want to compile it as a module, say M here and read If you want to compile it as a module, say M here and read
<file:Documentation/kbuild/modules.txt>. If unsure, say `N'. <file:Documentation/kbuild/modules.txt>. If unsure, say `N'.
@ -952,11 +936,9 @@ Index: linux-2.6.22.19/net/ipv6/netfilter/Kconfig
+ +
endmenu endmenu
Index: linux-2.6.22.19/net/ipv6/netfilter/Makefile --- a/net/ipv6/netfilter/Makefile
=================================================================== +++ b/net/ipv6/netfilter/Makefile
--- linux-2.6.22.19.orig/net/ipv6/netfilter/Makefile @@ -20,6 +20,7 @@
+++ linux-2.6.22.19/net/ipv6/netfilter/Makefile
@@ -20,6 +20,7 @@ obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_
obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o
obj-$(CONFIG_IP6_NF_MATCH_HL) += ip6t_hl.o obj-$(CONFIG_IP6_NF_MATCH_HL) += ip6t_hl.o
obj-$(CONFIG_IP6_NF_TARGET_REJECT) += ip6t_REJECT.o obj-$(CONFIG_IP6_NF_TARGET_REJECT) += ip6t_REJECT.o

62
target/linux/generic-2.6/patches-2.6.22/170-netfilter_chaostables_0.8.patch
View File

@ -1,17 +1,13 @@
Index: linux-2.6.22.19/include/linux/netfilter/oot_conntrack.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/include/linux/netfilter/oot_trans.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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>
@ -27,10 +23,8 @@ Index: linux-2.6.22.19/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.22.19/include/linux/netfilter/xt_CHAOS.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -46,10 +40,8 @@ Index: linux-2.6.22.19/include/linux/netfilter/xt_CHAOS.h
+}; +};
+ +
+#endif /* _LINUX_NETFILTER_XT_CHAOS_H */ +#endif /* _LINUX_NETFILTER_XT_CHAOS_H */
Index: linux-2.6.22.19/include/linux/netfilter/xt_portscan.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -59,10 +51,8 @@ Index: linux-2.6.22.19/include/linux/netfilter/xt_portscan.h
+}; +};
+ +
+#endif /* _LINUX_NETFILTER_XT_PORTSCAN_H */ +#endif /* _LINUX_NETFILTER_XT_PORTSCAN_H */
Index: linux-2.6.22.19/net/netfilter/find_match.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -103,11 +93,9 @@ Index: linux-2.6.22.19/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.22.19/net/netfilter/Kconfig --- a/net/netfilter/Kconfig
=================================================================== +++ b/net/netfilter/Kconfig
--- linux-2.6.22.19.orig/net/netfilter/Kconfig @@ -255,6 +255,14 @@
+++ linux-2.6.22.19/net/netfilter/Kconfig
@@ -255,6 +255,14 @@ config NETFILTER_XTABLES
# alphabetically ordered list of targets # alphabetically ordered list of targets
@ -122,7 +110,7 @@ Index: linux-2.6.22.19/net/netfilter/Kconfig
config NETFILTER_XT_TARGET_CLASSIFY config NETFILTER_XT_TARGET_CLASSIFY
tristate '"CLASSIFY" target support' tristate '"CLASSIFY" target support'
depends on NETFILTER_XTABLES depends on NETFILTER_XTABLES
@@ -282,6 +290,14 @@ config NETFILTER_XT_TARGET_CONNMARK @@ -282,6 +290,14 @@
<file:Documentation/kbuild/modules.txt>. The module will be called <file:Documentation/kbuild/modules.txt>. The module will be called
ipt_CONNMARK.ko. If unsure, say `N'. ipt_CONNMARK.ko. If unsure, say `N'.
@ -137,7 +125,7 @@ Index: linux-2.6.22.19/net/netfilter/Kconfig
config NETFILTER_XT_TARGET_DSCP config NETFILTER_XT_TARGET_DSCP
tristate '"DSCP" target support' tristate '"DSCP" target support'
depends on NETFILTER_XTABLES depends on NETFILTER_XTABLES
@@ -526,6 +542,14 @@ config NETFILTER_XT_MATCH_POLICY @@ -526,6 +542,14 @@
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.
@ -152,11 +140,9 @@ Index: linux-2.6.22.19/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.22.19/net/netfilter/Makefile --- a/net/netfilter/Makefile
=================================================================== +++ b/net/netfilter/Makefile
--- linux-2.6.22.19.orig/net/netfilter/Makefile @@ -47,6 +47,8 @@
+++ linux-2.6.22.19/net/netfilter/Makefile
@@ -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
obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
@ -165,15 +151,13 @@ Index: linux-2.6.22.19/net/netfilter/Makefile
# matches # matches
obj-$(CONFIG_NETFILTER_XT_MATCH_COMMENT) += xt_comment.o obj-$(CONFIG_NETFILTER_XT_MATCH_COMMENT) += xt_comment.o
@@ -74,3 +76,4 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) @@ -74,3 +76,4 @@
obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
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.22.19/net/netfilter/xt_CHAOS.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -375,10 +359,8 @@ Index: linux-2.6.22.19/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.22.19/net/netfilter/xt_DELUDE.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/net/netfilter/xt_DELUDE.c +++ b/net/netfilter/xt_DELUDE.c
@@ -0,0 +1,197 @@ @@ -0,0 +1,197 @@
+/* +/*
+ * DELUDE target + * DELUDE target
@ -577,10 +559,8 @@ Index: linux-2.6.22.19/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.22.19/net/netfilter/xt_portscan.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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
@ -851,11 +831,9 @@ Index: linux-2.6.22.19/net/netfilter/xt_portscan.c
+MODULE_DESCRIPTION("netfilter \"portscan\" match"); +MODULE_DESCRIPTION("netfilter \"portscan\" match");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_ALIAS("ipt_portscan"); +MODULE_ALIAS("ipt_portscan");
Index: linux-2.6.22.19/drivers/char/random.c --- a/drivers/char/random.c
=================================================================== +++ b/drivers/char/random.c
--- linux-2.6.22.19.orig/drivers/char/random.c @@ -1564,6 +1564,8 @@
+++ linux-2.6.22.19/drivers/char/random.c
@@ -1564,6 +1564,8 @@ __u32 secure_tcp_sequence_number(__be32
return seq; return seq;
} }

20
target/linux/generic-2.6/patches-2.6.22/171-netfilter_tarpit.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/net/netfilter/Kconfig --- a/net/netfilter/Kconfig
=================================================================== +++ b/net/netfilter/Kconfig
--- linux-2.6.22.19.orig/net/netfilter/Kconfig @@ -379,6 +379,23 @@
+++ linux-2.6.22.19/net/netfilter/Kconfig
@@ -379,6 +379,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,11 +24,9 @@ Index: linux-2.6.22.19/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.22.19/net/netfilter/Makefile --- a/net/netfilter/Makefile
=================================================================== +++ b/net/netfilter/Makefile
--- linux-2.6.22.19.orig/net/netfilter/Makefile @@ -45,6 +45,7 @@
+++ linux-2.6.22.19/net/netfilter/Makefile
@@ -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
obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o
@ -38,10 +34,8 @@ Index: linux-2.6.22.19/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.22.19/net/netfilter/xt_TARPIT.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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

10
target/linux/generic-2.6/patches-2.6.22/180-netfilter_depends.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/net/netfilter/Kconfig --- a/net/netfilter/Kconfig
=================================================================== +++ b/net/netfilter/Kconfig
--- linux-2.6.22.19.orig/net/netfilter/Kconfig @@ -133,7 +133,7 @@
+++ linux-2.6.22.19/net/netfilter/Kconfig
@@ -133,7 +133,7 @@ config NF_CONNTRACK_FTP
config NF_CONNTRACK_H323 config NF_CONNTRACK_H323
tristate "H.323 protocol support (EXPERIMENTAL)" tristate "H.323 protocol support (EXPERIMENTAL)"
@ -11,7 +9,7 @@ Index: linux-2.6.22.19/net/netfilter/Kconfig
help help
H.323 is a VoIP signalling protocol from ITU-T. As one of the most H.323 is a VoIP signalling protocol from ITU-T. As one of the most
important VoIP protocols, it is widely used by voice hardware and important VoIP protocols, it is widely used by voice hardware and
@@ -398,7 +398,7 @@ config NETFILTER_XT_TARGET_TARPIT @@ -398,7 +398,7 @@
config NETFILTER_XT_TARGET_TCPMSS config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support' tristate '"TCPMSS" target support'

52
target/linux/generic-2.6/patches-2.6.22/190-netfilter_rtsp.patch
View File

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

28
target/linux/generic-2.6/patches-2.6.22/200-sched_esfq.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/include/linux/pkt_sched.h --- a/include/linux/pkt_sched.h
=================================================================== +++ b/include/linux/pkt_sched.h
--- linux-2.6.22.19.orig/include/linux/pkt_sched.h @@ -146,8 +146,40 @@
+++ linux-2.6.22.19/include/linux/pkt_sched.h
@@ -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
* to change these parameters in compile time. * to change these parameters in compile time.
@ -43,11 +41,9 @@ Index: linux-2.6.22.19/include/linux/pkt_sched.h
/* RED section */ /* RED section */
enum enum
Index: linux-2.6.22.19/net/sched/Kconfig --- a/net/sched/Kconfig
=================================================================== +++ b/net/sched/Kconfig
--- linux-2.6.22.19.orig/net/sched/Kconfig @@ -133,6 +133,26 @@
+++ linux-2.6.22.19/net/sched/Kconfig
@@ -133,6 +133,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,11 +70,9 @@ Index: linux-2.6.22.19/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.22.19/net/sched/Makefile --- a/net/sched/Makefile
=================================================================== +++ b/net/sched/Makefile
--- linux-2.6.22.19.orig/net/sched/Makefile @@ -23,6 +23,7 @@
+++ linux-2.6.22.19/net/sched/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_NET_SCH_GRED) += sch_gred.o
obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o
obj-$(CONFIG_NET_SCH_DSMARK) += sch_dsmark.o obj-$(CONFIG_NET_SCH_DSMARK) += sch_dsmark.o
obj-$(CONFIG_NET_SCH_SFQ) += sch_sfq.o obj-$(CONFIG_NET_SCH_SFQ) += sch_sfq.o
@ -86,10 +80,8 @@ Index: linux-2.6.22.19/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.22.19/net/sched/sch_esfq.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.

82
target/linux/generic-2.6/patches-2.6.22/201-multiple_default_gateways.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/include/linux/rtnetlink.h --- a/include/linux/rtnetlink.h
=================================================================== +++ b/include/linux/rtnetlink.h
--- linux-2.6.22.19.orig/include/linux/rtnetlink.h @@ -293,6 +293,8 @@
+++ linux-2.6.22.19/include/linux/rtnetlink.h
@@ -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 */
#define RTNH_F_ONLINK 4 /* Gateway is forced on link */ #define RTNH_F_ONLINK 4 /* Gateway is forced on link */
@ -11,11 +9,9 @@ Index: linux-2.6.22.19/include/linux/rtnetlink.h
/* Macros to handle hexthops */ /* Macros to handle hexthops */
Index: linux-2.6.22.19/include/net/flow.h --- a/include/net/flow.h
=================================================================== +++ b/include/net/flow.h
--- linux-2.6.22.19.orig/include/net/flow.h @@ -19,6 +19,8 @@
+++ linux-2.6.22.19/include/net/flow.h
@@ -19,6 +19,8 @@ struct flowi {
struct { struct {
__be32 daddr; __be32 daddr;
__be32 saddr; __be32 saddr;
@ -24,7 +20,7 @@ Index: linux-2.6.22.19/include/net/flow.h
__u8 tos; __u8 tos;
__u8 scope; __u8 scope;
} ip4_u; } ip4_u;
@@ -43,6 +45,8 @@ struct flowi { @@ -43,6 +45,8 @@
#define fl6_flowlabel nl_u.ip6_u.flowlabel #define fl6_flowlabel nl_u.ip6_u.flowlabel
#define fl4_dst nl_u.ip4_u.daddr #define fl4_dst nl_u.ip4_u.daddr
#define fl4_src nl_u.ip4_u.saddr #define fl4_src nl_u.ip4_u.saddr
@ -33,11 +29,9 @@ Index: linux-2.6.22.19/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.22.19/net/ipv4/route.c --- a/net/ipv4/route.c
=================================================================== +++ b/net/ipv4/route.c
--- linux-2.6.22.19.orig/net/ipv4/route.c @@ -1208,6 +1208,7 @@
+++ linux-2.6.22.19/net/ipv4/route.c
@@ -1208,6 +1208,7 @@ void ip_rt_redirect(__be32 old_gw, __be3
/* Gateway is different ... */ /* Gateway is different ... */
rt->rt_gateway = new_gw; rt->rt_gateway = new_gw;
@ -45,7 +39,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
/* Redirect received -> path was valid */ /* Redirect received -> path was valid */
dst_confirm(&rth->u.dst); dst_confirm(&rth->u.dst);
@@ -1643,6 +1644,7 @@ static int ip_route_input_mc(struct sk_b @@ -1643,6 +1644,7 @@
rth->fl.fl4_tos = tos; rth->fl.fl4_tos = tos;
rth->fl.mark = skb->mark; rth->fl.mark = skb->mark;
rth->fl.fl4_src = saddr; rth->fl.fl4_src = saddr;
@ -53,7 +47,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
rth->rt_src = saddr; rth->rt_src = saddr;
#ifdef CONFIG_NET_CLS_ROUTE #ifdef CONFIG_NET_CLS_ROUTE
rth->u.dst.tclassid = itag; rth->u.dst.tclassid = itag;
@@ -1653,6 +1655,7 @@ static int ip_route_input_mc(struct sk_b @@ -1653,6 +1655,7 @@
dev_hold(rth->u.dst.dev); dev_hold(rth->u.dst.dev);
rth->idev = in_dev_get(rth->u.dst.dev); rth->idev = in_dev_get(rth->u.dst.dev);
rth->fl.oif = 0; rth->fl.oif = 0;
@ -61,7 +55,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
rth->rt_gateway = daddr; rth->rt_gateway = daddr;
rth->rt_spec_dst= spec_dst; rth->rt_spec_dst= spec_dst;
rth->rt_type = RTN_MULTICAST; rth->rt_type = RTN_MULTICAST;
@@ -1716,7 +1719,7 @@ static void ip_handle_martian_source(str @@ -1716,7 +1719,7 @@
static inline int __mkroute_input(struct sk_buff *skb, static inline int __mkroute_input(struct sk_buff *skb,
struct fib_result* res, struct fib_result* res,
struct in_device *in_dev, struct in_device *in_dev,
@ -70,7 +64,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
struct rtable **result) struct rtable **result)
{ {
@@ -1751,6 +1754,7 @@ static inline int __mkroute_input(struct @@ -1751,6 +1754,7 @@
flags |= RTCF_DIRECTSRC; flags |= RTCF_DIRECTSRC;
if (out_dev == in_dev && err && !(flags & (RTCF_NAT | RTCF_MASQ)) && if (out_dev == in_dev && err && !(flags & (RTCF_NAT | RTCF_MASQ)) &&
@ -78,7 +72,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
(IN_DEV_SHARED_MEDIA(out_dev) || (IN_DEV_SHARED_MEDIA(out_dev) ||
inet_addr_onlink(out_dev, saddr, FIB_RES_GW(*res)))) inet_addr_onlink(out_dev, saddr, FIB_RES_GW(*res))))
flags |= RTCF_DOREDIRECT; flags |= RTCF_DOREDIRECT;
@@ -1788,6 +1792,7 @@ static inline int __mkroute_input(struct @@ -1788,6 +1792,7 @@
rth->fl.mark = skb->mark; rth->fl.mark = skb->mark;
rth->fl.fl4_src = saddr; rth->fl.fl4_src = saddr;
rth->rt_src = saddr; rth->rt_src = saddr;
@ -86,7 +80,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
rth->rt_gateway = daddr; rth->rt_gateway = daddr;
rth->rt_iif = rth->rt_iif =
rth->fl.iif = in_dev->dev->ifindex; rth->fl.iif = in_dev->dev->ifindex;
@@ -1795,6 +1800,7 @@ static inline int __mkroute_input(struct @@ -1795,6 +1800,7 @@
dev_hold(rth->u.dst.dev); dev_hold(rth->u.dst.dev);
rth->idev = in_dev_get(rth->u.dst.dev); rth->idev = in_dev_get(rth->u.dst.dev);
rth->fl.oif = 0; rth->fl.oif = 0;
@ -94,7 +88,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
rth->rt_spec_dst= spec_dst; rth->rt_spec_dst= spec_dst;
rth->u.dst.input = ip_forward; rth->u.dst.input = ip_forward;
@@ -1816,19 +1822,21 @@ static inline int ip_mkroute_input_def(s @@ -1816,19 +1822,21 @@
struct fib_result* res, struct fib_result* res,
const struct flowi *fl, const struct flowi *fl,
struct in_device *in_dev, struct in_device *in_dev,
@ -119,7 +113,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
if (err) if (err)
return err; return err;
@@ -1841,7 +1849,8 @@ static inline int ip_mkroute_input(struc @@ -1841,7 +1849,8 @@
struct fib_result* res, struct fib_result* res,
const struct flowi *fl, const struct flowi *fl,
struct in_device *in_dev, struct in_device *in_dev,
@ -129,7 +123,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
{ {
#ifdef CONFIG_IP_ROUTE_MULTIPATH_CACHED #ifdef CONFIG_IP_ROUTE_MULTIPATH_CACHED
struct rtable* rth = NULL, *rtres; struct rtable* rth = NULL, *rtres;
@@ -1857,7 +1866,7 @@ static inline int ip_mkroute_input(struc @@ -1857,7 +1866,7 @@
/* distinguish between multipath and singlepath */ /* distinguish between multipath and singlepath */
if (hopcount < 2) if (hopcount < 2)
return ip_mkroute_input_def(skb, res, fl, in_dev, daddr, return ip_mkroute_input_def(skb, res, fl, in_dev, daddr,
@ -138,7 +132,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
/* add all alternatives to the routing cache */ /* add all alternatives to the routing cache */
for (hop = 0; hop < hopcount; hop++) { for (hop = 0; hop < hopcount; hop++) {
@@ -1869,7 +1878,7 @@ static inline int ip_mkroute_input(struc @@ -1869,7 +1878,7 @@
/* create a routing cache entry */ /* create a routing cache entry */
err = __mkroute_input(skb, res, in_dev, daddr, saddr, tos, err = __mkroute_input(skb, res, in_dev, daddr, saddr, tos,
@ -147,7 +141,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
if (err) if (err)
return err; return err;
@@ -1889,7 +1898,7 @@ static inline int ip_mkroute_input(struc @@ -1889,7 +1898,7 @@
skb->dst = &rtres->u.dst; skb->dst = &rtres->u.dst;
return err; return err;
#else /* CONFIG_IP_ROUTE_MULTIPATH_CACHED */ #else /* CONFIG_IP_ROUTE_MULTIPATH_CACHED */
@ -156,7 +150,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
#endif /* CONFIG_IP_ROUTE_MULTIPATH_CACHED */ #endif /* CONFIG_IP_ROUTE_MULTIPATH_CACHED */
} }
@@ -1905,18 +1914,18 @@ static inline int ip_mkroute_input(struc @@ -1905,18 +1914,18 @@
*/ */
static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr, static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
@ -178,7 +172,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
unsigned flags = 0; unsigned flags = 0;
u32 itag = 0; u32 itag = 0;
struct rtable * rth; struct rtable * rth;
@@ -1949,6 +1958,12 @@ static int ip_route_input_slow(struct sk @@ -1949,6 +1958,12 @@
if (BADCLASS(daddr) || ZERONET(daddr) || LOOPBACK(daddr)) if (BADCLASS(daddr) || ZERONET(daddr) || LOOPBACK(daddr))
goto martian_destination; goto martian_destination;
@ -191,7 +185,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
/* /*
* Now we are ready to route packet. * Now we are ready to route packet.
*/ */
@@ -1958,6 +1973,10 @@ static int ip_route_input_slow(struct sk @@ -1958,6 +1973,10 @@
goto no_route; goto no_route;
} }
free_res = 1; free_res = 1;
@ -202,7 +196,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
RT_CACHE_STAT_INC(in_slow_tot); RT_CACHE_STAT_INC(in_slow_tot);
@@ -1982,7 +2001,7 @@ static int ip_route_input_slow(struct sk @@ -1982,7 +2001,7 @@
if (res.type != RTN_UNICAST) if (res.type != RTN_UNICAST)
goto martian_destination; goto martian_destination;
@ -211,7 +205,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
if (err == -ENOBUFS) if (err == -ENOBUFS)
goto e_nobufs; goto e_nobufs;
if (err == -EINVAL) if (err == -EINVAL)
@@ -1997,6 +2016,8 @@ out: return err; @@ -1997,6 +2016,8 @@
brd_input: brd_input:
if (skb->protocol != htons(ETH_P_IP)) if (skb->protocol != htons(ETH_P_IP))
goto e_inval; goto e_inval;
@ -220,7 +214,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
if (ZERONET(saddr)) if (ZERONET(saddr))
spec_dst = inet_select_addr(dev, 0, RT_SCOPE_LINK); spec_dst = inet_select_addr(dev, 0, RT_SCOPE_LINK);
@@ -2037,6 +2058,7 @@ local_input: @@ -2037,6 +2058,7 @@
rth->u.dst.dev = &loopback_dev; rth->u.dst.dev = &loopback_dev;
dev_hold(rth->u.dst.dev); dev_hold(rth->u.dst.dev);
rth->idev = in_dev_get(rth->u.dst.dev); rth->idev = in_dev_get(rth->u.dst.dev);
@ -228,7 +222,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
rth->rt_gateway = daddr; rth->rt_gateway = daddr;
rth->rt_spec_dst= spec_dst; rth->rt_spec_dst= spec_dst;
rth->u.dst.input= ip_local_deliver; rth->u.dst.input= ip_local_deliver;
@@ -2086,8 +2108,9 @@ martian_source: @@ -2086,8 +2108,9 @@
goto e_inval; goto e_inval;
} }
@ -240,7 +234,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
{ {
struct rtable * rth; struct rtable * rth;
unsigned hash; unsigned hash;
@@ -2102,6 +2125,7 @@ int ip_route_input(struct sk_buff *skb, @@ -2102,6 +2125,7 @@
if (rth->fl.fl4_dst == daddr && if (rth->fl.fl4_dst == daddr &&
rth->fl.fl4_src == saddr && rth->fl.fl4_src == saddr &&
rth->fl.iif == iif && rth->fl.iif == iif &&
@ -248,7 +242,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
rth->fl.oif == 0 && rth->fl.oif == 0 &&
rth->fl.mark == skb->mark && rth->fl.mark == skb->mark &&
rth->fl.fl4_tos == tos) { rth->fl.fl4_tos == tos) {
@@ -2148,7 +2172,19 @@ int ip_route_input(struct sk_buff *skb, @@ -2148,7 +2172,19 @@
rcu_read_unlock(); rcu_read_unlock();
return -EINVAL; return -EINVAL;
} }
@ -269,7 +263,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
} }
static inline int __mkroute_output(struct rtable **result, static inline int __mkroute_output(struct rtable **result,
@@ -2227,6 +2263,7 @@ static inline int __mkroute_output(struc @@ -2227,6 +2263,7 @@
rth->fl.fl4_tos = tos; rth->fl.fl4_tos = tos;
rth->fl.fl4_src = oldflp->fl4_src; rth->fl.fl4_src = oldflp->fl4_src;
rth->fl.oif = oldflp->oif; rth->fl.oif = oldflp->oif;
@ -277,7 +271,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
rth->fl.mark = oldflp->mark; rth->fl.mark = oldflp->mark;
rth->rt_dst = fl->fl4_dst; rth->rt_dst = fl->fl4_dst;
rth->rt_src = fl->fl4_src; rth->rt_src = fl->fl4_src;
@@ -2367,6 +2404,7 @@ static int ip_route_output_slow(struct r @@ -2367,6 +2404,7 @@
struct flowi fl = { .nl_u = { .ip4_u = struct flowi fl = { .nl_u = { .ip4_u =
{ .daddr = oldflp->fl4_dst, { .daddr = oldflp->fl4_dst,
.saddr = oldflp->fl4_src, .saddr = oldflp->fl4_src,
@ -285,7 +279,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
.tos = tos & IPTOS_RT_MASK, .tos = tos & IPTOS_RT_MASK,
.scope = ((tos & RTO_ONLINK) ? .scope = ((tos & RTO_ONLINK) ?
RT_SCOPE_LINK : RT_SCOPE_LINK :
@@ -2470,6 +2508,7 @@ static int ip_route_output_slow(struct r @@ -2470,6 +2508,7 @@
dev_out = &loopback_dev; dev_out = &loopback_dev;
dev_hold(dev_out); dev_hold(dev_out);
fl.oif = loopback_dev.ifindex; fl.oif = loopback_dev.ifindex;
@ -293,7 +287,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
res.type = RTN_LOCAL; res.type = RTN_LOCAL;
flags |= RTCF_LOCAL; flags |= RTCF_LOCAL;
goto make_route; goto make_route;
@@ -2477,7 +2516,7 @@ static int ip_route_output_slow(struct r @@ -2477,7 +2516,7 @@
if (fib_lookup(&fl, &res)) { if (fib_lookup(&fl, &res)) {
res.fi = NULL; res.fi = NULL;
@ -302,7 +296,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
/* Apparently, routing tables are wrong. Assume, /* Apparently, routing tables are wrong. Assume,
that the destination is on link. that the destination is on link.
@@ -2517,6 +2556,7 @@ static int ip_route_output_slow(struct r @@ -2517,6 +2556,7 @@
dev_out = &loopback_dev; dev_out = &loopback_dev;
dev_hold(dev_out); dev_hold(dev_out);
fl.oif = dev_out->ifindex; fl.oif = dev_out->ifindex;
@ -310,7 +304,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
if (res.fi) if (res.fi)
fib_info_put(res.fi); fib_info_put(res.fi);
res.fi = NULL; res.fi = NULL;
@@ -2524,13 +2564,12 @@ static int ip_route_output_slow(struct r @@ -2524,13 +2564,12 @@
goto make_route; goto make_route;
} }
@ -327,7 +321,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
if (!fl.fl4_src) if (!fl.fl4_src)
fl.fl4_src = FIB_RES_PREFSRC(res); fl.fl4_src = FIB_RES_PREFSRC(res);
@@ -2567,6 +2606,7 @@ int __ip_route_output_key(struct rtable @@ -2567,6 +2606,7 @@
rth->fl.fl4_src == flp->fl4_src && rth->fl.fl4_src == flp->fl4_src &&
rth->fl.iif == 0 && rth->fl.iif == 0 &&
rth->fl.oif == flp->oif && rth->fl.oif == flp->oif &&
@ -335,7 +329,7 @@ Index: linux-2.6.22.19/net/ipv4/route.c
rth->fl.mark == flp->mark && rth->fl.mark == flp->mark &&
!((rth->fl.fl4_tos ^ flp->fl4_tos) & !((rth->fl.fl4_tos ^ flp->fl4_tos) &
(IPTOS_RT_MASK | RTO_ONLINK))) { (IPTOS_RT_MASK | RTO_ONLINK))) {
@@ -3267,3 +3307,4 @@ int __init ip_rt_init(void) @@ -3267,3 +3307,4 @@
EXPORT_SYMBOL(__ip_select_ident); EXPORT_SYMBOL(__ip_select_ident);
EXPORT_SYMBOL(ip_route_input); EXPORT_SYMBOL(ip_route_input);
EXPORT_SYMBOL(ip_route_output_key); EXPORT_SYMBOL(ip_route_output_key);

8
target/linux/generic-2.6/patches-2.6.22/202-mips-freestanding.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/arch/mips/Makefile --- a/arch/mips/Makefile
=================================================================== +++ b/arch/mips/Makefile
--- linux-2.6.22.19.orig/arch/mips/Makefile @@ -589,6 +589,9 @@
+++ linux-2.6.22.19/arch/mips/Makefile
@@ -589,6 +589,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

18
target/linux/generic-2.6/patches-2.6.22/204-jffs2_eofdetect.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/fs/jffs2/build.c --- a/fs/jffs2/build.c
=================================================================== +++ b/fs/jffs2/build.c
--- linux-2.6.22.19.orig/fs/jffs2/build.c @@ -105,6 +105,17 @@
+++ linux-2.6.22.19/fs/jffs2/build.c
@@ -105,6 +105,17 @@ static int jffs2_build_filesystem(struct
dbg_fsbuild("scanned flash completely\n"); dbg_fsbuild("scanned flash completely\n");
jffs2_dbg_dump_block_lists_nolock(c); jffs2_dbg_dump_block_lists_nolock(c);
@ -20,11 +18,9 @@ Index: linux-2.6.22.19/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.22.19/fs/jffs2/scan.c --- a/fs/jffs2/scan.c
=================================================================== +++ b/fs/jffs2/scan.c
--- linux-2.6.22.19.orig/fs/jffs2/scan.c @@ -142,9 +142,12 @@
+++ linux-2.6.22.19/fs/jffs2/scan.c
@@ -142,9 +142,12 @@ int jffs2_scan_medium(struct jffs2_sb_in
/* reset summary info for next eraseblock scan */ /* reset summary info for next eraseblock scan */
jffs2_sum_reset_collected(s); jffs2_sum_reset_collected(s);
@ -40,7 +36,7 @@ Index: linux-2.6.22.19/fs/jffs2/scan.c
if (ret < 0) if (ret < 0)
goto out; goto out;
@@ -545,6 +548,17 @@ static int jffs2_scan_eraseblock (struct @@ -545,6 +548,17 @@
return err; return err;
} }

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

@ -1,7 +1,5 @@
Index: linux-2.6.22.19/include/asm-powerpc/segment.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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

10
target/linux/generic-2.6/patches-2.6.22/208-rtl8110sb_fix.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/drivers/net/r8169.c --- a/drivers/net/r8169.c
=================================================================== +++ b/drivers/net/r8169.c
--- linux-2.6.22.19.orig/drivers/net/r8169.c @@ -494,7 +494,7 @@
+++ linux-2.6.22.19/drivers/net/r8169.c
@@ -494,7 +494,7 @@ static int rtl8169_poll(struct net_devic
#endif #endif
static const u16 rtl8169_intr_mask = static const u16 rtl8169_intr_mask =
@ -11,7 +9,7 @@ Index: linux-2.6.22.19/drivers/net/r8169.c
static const u16 rtl8169_napi_event = static const u16 rtl8169_napi_event =
RxOK | RxOverflow | RxFIFOOver | TxOK | TxErr; RxOK | RxOverflow | RxFIFOOver | TxOK | TxErr;
static const unsigned int rtl8169_rx_config = static const unsigned int rtl8169_rx_config =
@@ -2640,10 +2640,12 @@ rtl8169_interrupt(int irq, void *dev_ins @@ -2640,10 +2640,12 @@
if (!(status & rtl8169_intr_mask)) if (!(status & rtl8169_intr_mask))
break; break;

84
target/linux/generic-2.6/patches-2.6.22/209-mini_fo.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/fs/Kconfig --- a/fs/Kconfig
=================================================================== +++ b/fs/Kconfig
--- linux-2.6.22.19.orig/fs/Kconfig @@ -461,6 +461,9 @@
+++ linux-2.6.22.19/fs/Kconfig
@@ -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,11 +10,9 @@ Index: linux-2.6.22.19/fs/Kconfig
config MINIX_FS config MINIX_FS
tristate "Minix fs support" tristate "Minix fs support"
help help
Index: linux-2.6.22.19/fs/Makefile --- a/fs/Makefile
=================================================================== +++ b/fs/Makefile
--- linux-2.6.22.19.orig/fs/Makefile @@ -76,6 +76,7 @@
+++ linux-2.6.22.19/fs/Makefile
@@ -76,6 +76,7 @@ obj-$(CONFIG_SQUASHFS) += squashfs/
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/
@ -24,10 +20,8 @@ Index: linux-2.6.22.19/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.22.19/fs/mini_fo/aux.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/fs/mini_fo/aux.c
+ +
+#endif /* unused */ +#endif /* unused */
+ +
Index: linux-2.6.22.19/fs/mini_fo/ChangeLog
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/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.22.19/fs/mini_fo/dentry.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/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.22.19/fs/mini_fo/file.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/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.22.19/fs/mini_fo/fist.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/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.22.19/fs/mini_fo/inode.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/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.22.19/fs/mini_fo/main.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/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.22.19/fs/mini_fo/Makefile
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/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.22.19/fs/mini_fo/meta.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/fs/mini_fo/meta.c
+ return 0; + return 0;
+} +}
+ +
Index: linux-2.6.22.19/fs/mini_fo/mini_fo.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/fs/mini_fo/mini_fo.h
+/* ioctls */ +/* ioctls */
+ +
+#endif /* not __MINI_FO_H_ */ +#endif /* not __MINI_FO_H_ */
Index: linux-2.6.22.19/fs/mini_fo/mini_fo-merge
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/fs/mini_fo/mini_fo-merge
+#rm $TMP/$SKIP_DEL_LIST +#rm $TMP/$SKIP_DEL_LIST
+ +
+echo "Done!" +echo "Done!"
Index: linux-2.6.22.19/fs/mini_fo/mini_fo-overlay
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/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.22.19/fs/mini_fo/mmap.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/fs/mini_fo/mmap.c
+ print_exit_status(err); + print_exit_status(err);
+ return err; + return err;
+} +}
Index: linux-2.6.22.19/fs/mini_fo/README
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/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.22.19/fs/mini_fo/RELEASE_NOTES
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/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.22.19/fs/mini_fo/state.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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.22.19/fs/mini_fo/state.c
+ return err; + return err;
+} +}
+ +
Index: linux-2.6.22.19/fs/mini_fo/super.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/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

64
target/linux/generic-2.6/patches-2.6.22/210-mac80211_include_wireless_dev.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/include/linux/ieee80211.h --- a/include/linux/ieee80211.h
=================================================================== +++ b/include/linux/ieee80211.h
--- linux-2.6.22.19.orig/include/linux/ieee80211.h @@ -106,6 +106,75 @@
+++ linux-2.6.22.19/include/linux/ieee80211.h
@@ -106,6 +106,75 @@ struct ieee80211_hdr {
} __attribute__ ((packed)); } __attribute__ ((packed));
@ -78,7 +76,7 @@ Index: linux-2.6.22.19/include/linux/ieee80211.h
struct ieee80211_mgmt { struct ieee80211_mgmt {
__le16 frame_control; __le16 frame_control;
__le16 duration; __le16 duration;
@@ -173,9 +242,51 @@ struct ieee80211_mgmt { @@ -173,9 +242,51 @@
struct { struct {
u8 action_code; u8 action_code;
u8 dialog_token; u8 dialog_token;
@ -130,7 +128,7 @@ Index: linux-2.6.22.19/include/linux/ieee80211.h
struct{ struct{
u8 action_code; u8 action_code;
u8 element_id; u8 element_id;
@@ -184,6 +295,25 @@ struct ieee80211_mgmt { @@ -184,6 +295,25 @@
u8 new_chan; u8 new_chan;
u8 switch_count; u8 switch_count;
} __attribute__((packed)) chan_switch; } __attribute__((packed)) chan_switch;
@ -156,7 +154,7 @@ Index: linux-2.6.22.19/include/linux/ieee80211.h
} u; } u;
} __attribute__ ((packed)) action; } __attribute__ ((packed)) action;
} u; } u;
@@ -259,6 +389,18 @@ enum ieee80211_statuscode { @@ -259,6 +389,18 @@
WLAN_STATUS_UNSUPP_RSN_VERSION = 44, WLAN_STATUS_UNSUPP_RSN_VERSION = 44,
WLAN_STATUS_INVALID_RSN_IE_CAP = 45, WLAN_STATUS_INVALID_RSN_IE_CAP = 45,
WLAN_STATUS_CIPHER_SUITE_REJECTED = 46, WLAN_STATUS_CIPHER_SUITE_REJECTED = 46,
@ -175,7 +173,7 @@ Index: linux-2.6.22.19/include/linux/ieee80211.h
}; };
@@ -289,9 +431,50 @@ enum ieee80211_reasoncode { @@ -289,9 +431,50 @@
WLAN_REASON_INVALID_RSN_IE_CAP = 22, WLAN_REASON_INVALID_RSN_IE_CAP = 22,
WLAN_REASON_IEEE8021X_FAILED = 23, WLAN_REASON_IEEE8021X_FAILED = 23,
WLAN_REASON_CIPHER_SUITE_REJECTED = 24, WLAN_REASON_CIPHER_SUITE_REJECTED = 24,
@ -226,7 +224,7 @@ Index: linux-2.6.22.19/include/linux/ieee80211.h
/* Information Element IDs */ /* Information Element IDs */
enum ieee80211_eid { enum ieee80211_eid {
WLAN_EID_SSID = 0, WLAN_EID_SSID = 0,
@@ -307,6 +490,15 @@ enum ieee80211_eid { @@ -307,6 +490,15 @@
WLAN_EID_HP_PARAMS = 8, WLAN_EID_HP_PARAMS = 8,
WLAN_EID_HP_TABLE = 9, WLAN_EID_HP_TABLE = 9,
WLAN_EID_REQUEST = 10, WLAN_EID_REQUEST = 10,
@ -242,7 +240,7 @@ Index: linux-2.6.22.19/include/linux/ieee80211.h
/* 802.11h */ /* 802.11h */
WLAN_EID_PWR_CONSTRAINT = 32, WLAN_EID_PWR_CONSTRAINT = 32,
WLAN_EID_PWR_CAPABILITY = 33, WLAN_EID_PWR_CAPABILITY = 33,
@@ -321,6 +513,9 @@ enum ieee80211_eid { @@ -321,6 +513,9 @@
/* 802.11g */ /* 802.11g */
WLAN_EID_ERP_INFO = 42, WLAN_EID_ERP_INFO = 42,
WLAN_EID_EXT_SUPP_RATES = 50, WLAN_EID_EXT_SUPP_RATES = 50,
@ -252,7 +250,7 @@ Index: linux-2.6.22.19/include/linux/ieee80211.h
/* 802.11i */ /* 802.11i */
WLAN_EID_RSN = 48, WLAN_EID_RSN = 48,
WLAN_EID_WPA = 221, WLAN_EID_WPA = 221,
@@ -329,6 +524,9 @@ enum ieee80211_eid { @@ -329,6 +524,9 @@
WLAN_EID_QOS_PARAMETER = 222 WLAN_EID_QOS_PARAMETER = 222
}; };
@ -262,7 +260,7 @@ Index: linux-2.6.22.19/include/linux/ieee80211.h
/* cipher suite selectors */ /* cipher suite selectors */
#define WLAN_CIPHER_SUITE_USE_GROUP 0x000FAC00 #define WLAN_CIPHER_SUITE_USE_GROUP 0x000FAC00
#define WLAN_CIPHER_SUITE_WEP40 0x000FAC01 #define WLAN_CIPHER_SUITE_WEP40 0x000FAC01
@@ -339,4 +537,37 @@ enum ieee80211_eid { @@ -339,4 +537,37 @@
#define WLAN_MAX_KEY_LEN 32 #define WLAN_MAX_KEY_LEN 32
@ -300,10 +298,8 @@ Index: linux-2.6.22.19/include/linux/ieee80211.h
+}; +};
+ +
#endif /* IEEE80211_H */ #endif /* IEEE80211_H */
Index: linux-2.6.22.19/include/linux/nl80211.h --- a/include/linux/nl80211.h
=================================================================== +++ b/include/linux/nl80211.h
--- linux-2.6.22.19.orig/include/linux/nl80211.h
+++ linux-2.6.22.19/include/linux/nl80211.h
@@ -7,6 +7,217 @@ @@ -7,6 +7,217 @@
*/ */
@ -522,7 +518,7 @@ Index: linux-2.6.22.19/include/linux/nl80211.h
* enum nl80211_iftype - (virtual) interface types * enum nl80211_iftype - (virtual) interface types
* @NL80211_IFTYPE_UNSPECIFIED: unspecified type, driver decides * @NL80211_IFTYPE_UNSPECIFIED: unspecified type, driver decides
* @NL80211_IFTYPE_ADHOC: independent BSS member * @NL80211_IFTYPE_ADHOC: independent BSS member
@@ -35,4 +246,56 @@ enum nl80211_iftype { @@ -35,4 +246,56 @@
}; };
#define NL80211_IFTYPE_MAX (__NL80211_IFTYPE_AFTER_LAST - 1) #define NL80211_IFTYPE_MAX (__NL80211_IFTYPE_AFTER_LAST - 1)
@ -579,10 +575,8 @@ Index: linux-2.6.22.19/include/linux/nl80211.h
+#define NL80211_KEYTYPE_MAX (__NL80211_KEYTYPE_AFTER_LAST - 1) +#define NL80211_KEYTYPE_MAX (__NL80211_KEYTYPE_AFTER_LAST - 1)
+ +
#endif /* __LINUX_NL80211_H */ #endif /* __LINUX_NL80211_H */
Index: linux-2.6.22.19/include/net/cfg80211.h --- a/include/net/cfg80211.h
=================================================================== +++ b/include/net/cfg80211.h
--- linux-2.6.22.19.orig/include/net/cfg80211.h
+++ linux-2.6.22.19/include/net/cfg80211.h
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
#include <linux/netlink.h> #include <linux/netlink.h>
@ -661,7 +655,7 @@ Index: linux-2.6.22.19/include/net/cfg80211.h
/* from net/wireless.h */ /* from net/wireless.h */
struct wiphy; struct wiphy;
@@ -30,11 +94,62 @@ struct wiphy; @@ -30,11 +94,62 @@
* @add_virtual_intf: create a new virtual interface with the given name * @add_virtual_intf: create a new virtual interface with the given name
* *
* @del_virtual_intf: remove the virtual interface determined by ifindex. * @del_virtual_intf: remove the virtual interface determined by ifindex.
@ -725,11 +719,9 @@ Index: linux-2.6.22.19/include/net/cfg80211.h
+ u32 seq, int flags, u8 cmd); + u32 seq, int flags, u8 cmd);
+ +
#endif /* __NET_CFG80211_H */ #endif /* __NET_CFG80211_H */
Index: linux-2.6.22.19/include/net/iw_handler.h --- a/include/net/iw_handler.h
=================================================================== +++ b/include/net/iw_handler.h
--- linux-2.6.22.19.orig/include/net/iw_handler.h @@ -431,7 +431,13 @@
+++ linux-2.6.22.19/include/net/iw_handler.h
@@ -431,7 +431,13 @@ struct iw_public_data {
* Those may be called only within the kernel. * Those may be called only within the kernel.
*/ */
@ -744,11 +736,9 @@ Index: linux-2.6.22.19/include/net/iw_handler.h
/* Send a single event to user space */ /* Send a single event to user space */
extern void wireless_send_event(struct net_device * dev, extern void wireless_send_event(struct net_device * dev,
Index: linux-2.6.22.19/include/net/mac80211.h --- a/include/net/mac80211.h
=================================================================== +++ b/include/net/mac80211.h
--- linux-2.6.22.19.orig/include/net/mac80211.h @@ -300,7 +300,6 @@
+++ linux-2.6.22.19/include/net/mac80211.h
@@ -300,7 +300,6 @@ struct ieee80211_conf {
/* Following five fields are used for IEEE 802.11H */ /* Following five fields are used for IEEE 802.11H */
unsigned int radar_detect; unsigned int radar_detect;
unsigned int spect_mgmt; unsigned int spect_mgmt;
@ -756,7 +746,7 @@ Index: linux-2.6.22.19/include/net/mac80211.h
unsigned int quiet_duration; /* duration of quiet period */ unsigned int quiet_duration; /* duration of quiet period */
unsigned int quiet_offset; /* how far into the beacon is the quiet unsigned int quiet_offset; /* how far into the beacon is the quiet
* period */ * period */
@@ -514,6 +513,9 @@ struct ieee80211_hw { @@ -514,6 +513,9 @@
* per-packet RC4 key with each TX frame when doing hwcrypto */ * per-packet RC4 key with each TX frame when doing hwcrypto */
#define IEEE80211_HW_TKIP_REQ_PHASE2_KEY (1<<14) #define IEEE80211_HW_TKIP_REQ_PHASE2_KEY (1<<14)
@ -766,7 +756,7 @@ Index: linux-2.6.22.19/include/net/mac80211.h
u32 flags; /* hardware flags defined above */ u32 flags; /* hardware flags defined above */
/* Set to the size of a needed device specific skb headroom for TX skbs. */ /* Set to the size of a needed device specific skb headroom for TX skbs. */
@@ -641,8 +643,7 @@ struct ieee80211_ops { @@ -641,8 +643,7 @@
* used if the wlan hardware or low-level driver implements PAE. * used if the wlan hardware or low-level driver implements PAE.
* 80211.o module will anyway filter frames based on authorization * 80211.o module will anyway filter frames based on authorization
* state, so this function pointer can be NULL if low-level driver does * state, so this function pointer can be NULL if low-level driver does
@ -776,7 +766,7 @@ Index: linux-2.6.22.19/include/net/mac80211.h
int (*set_port_auth)(struct ieee80211_hw *hw, u8 *addr, int (*set_port_auth)(struct ieee80211_hw *hw, u8 *addr,
int authorized); int authorized);
@@ -694,8 +695,9 @@ struct ieee80211_ops { @@ -694,8 +695,9 @@
/* Get statistics of the current TX queue status. This is used to get /* Get statistics of the current TX queue status. This is used to get
* number of currently queued packets (queue length), maximum queue * number of currently queued packets (queue length), maximum queue
* size (limit), and total number of packets sent using each TX queue * size (limit), and total number of packets sent using each TX queue
@ -788,7 +778,7 @@ Index: linux-2.6.22.19/include/net/mac80211.h
int (*get_tx_stats)(struct ieee80211_hw *hw, int (*get_tx_stats)(struct ieee80211_hw *hw,
struct ieee80211_tx_queue_stats *stats); struct ieee80211_tx_queue_stats *stats);
@@ -705,12 +707,25 @@ struct ieee80211_ops { @@ -705,12 +707,25 @@
* Must be atomic. */ * Must be atomic. */
u64 (*get_tsf)(struct ieee80211_hw *hw); u64 (*get_tsf)(struct ieee80211_hw *hw);

10
target/linux/generic-2.6/patches-2.6.22/213-kobject_uevent.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/lib/kobject_uevent.c --- a/lib/kobject_uevent.c
=================================================================== +++ b/lib/kobject_uevent.c
--- linux-2.6.22.19.orig/lib/kobject_uevent.c @@ -30,9 +30,22 @@
+++ linux-2.6.22.19/lib/kobject_uevent.c
@@ -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);
#if defined(CONFIG_NET) #if defined(CONFIG_NET)
@ -26,7 +24,7 @@ Index: linux-2.6.22.19/lib/kobject_uevent.c
static char *action_to_string(enum kobject_action action) static char *action_to_string(enum kobject_action action)
{ {
switch (action) { switch (action) {
@@ -169,9 +182,7 @@ int kobject_uevent_env(struct kobject *k @@ -169,9 +182,7 @@
} }
/* we will send an event, request a new sequence number */ /* we will send an event, request a new sequence number */

16
target/linux/generic-2.6/patches-2.6.22/400-ledtrig_morse.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/drivers/leds/Kconfig --- a/drivers/leds/Kconfig
=================================================================== +++ b/drivers/leds/Kconfig
--- linux-2.6.22.19.orig/drivers/leds/Kconfig @@ -128,5 +128,9 @@
+++ linux-2.6.22.19/drivers/leds/Kconfig
@@ -128,5 +128,9 @@ config LEDS_TRIGGER_HEARTBEAT
load average. load average.
If unsure, say Y. If unsure, say Y.
@ -12,11 +10,9 @@ Index: linux-2.6.22.19/drivers/leds/Kconfig
+ +
endmenu endmenu
Index: linux-2.6.22.19/drivers/leds/Makefile --- a/drivers/leds/Makefile
=================================================================== +++ b/drivers/leds/Makefile
--- linux-2.6.22.19.orig/drivers/leds/Makefile @@ -21,3 +21,4 @@
+++ linux-2.6.22.19/drivers/leds/Makefile
@@ -21,3 +21,4 @@ obj-$(CONFIG_LEDS_COBALT) += leds-cobal
obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o
obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += ledtrig-ide-disk.o obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += ledtrig-ide-disk.o
obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o

16
target/linux/generic-2.6/patches-2.6.22/410-gpio_buttons.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/drivers/input/misc/Kconfig --- a/drivers/input/misc/Kconfig
=================================================================== +++ b/drivers/input/misc/Kconfig
--- linux-2.6.22.19.orig/drivers/input/misc/Kconfig @@ -178,4 +178,20 @@
+++ linux-2.6.22.19/drivers/input/misc/Kconfig
@@ -178,4 +178,20 @@ config HP_SDC_RTC
Say Y here if you want to support the built-in real time clock Say Y here if you want to support the built-in real time clock
of the HP SDC controller. of the HP SDC controller.
@ -23,11 +21,9 @@ Index: linux-2.6.22.19/drivers/input/misc/Kconfig
+ module will be called gpio-buttons. + module will be called gpio-buttons.
+ +
endif endif
Index: linux-2.6.22.19/drivers/input/misc/Makefile --- a/drivers/input/misc/Makefile
=================================================================== +++ b/drivers/input/misc/Makefile
--- linux-2.6.22.19.orig/drivers/input/misc/Makefile @@ -18,3 +18,4 @@
+++ linux-2.6.22.19/drivers/input/misc/Makefile
@@ -18,3 +18,4 @@ obj-$(CONFIG_INPUT_POWERMATE) += powerm
obj-$(CONFIG_INPUT_YEALINK) += yealink.o obj-$(CONFIG_INPUT_YEALINK) += yealink.o
obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o
obj-$(CONFIG_INPUT_UINPUT) += uinput.o obj-$(CONFIG_INPUT_UINPUT) += uinput.o

16
target/linux/generic-2.6/patches-2.6.22/510-yaffs_support.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/fs/Kconfig --- a/fs/Kconfig
=================================================================== +++ b/fs/Kconfig
--- linux-2.6.22.19.orig/fs/Kconfig @@ -419,6 +419,7 @@
+++ linux-2.6.22.19/fs/Kconfig
@@ -419,6 +419,7 @@ config FS_POSIX_ACL
source "fs/xfs/Kconfig" source "fs/xfs/Kconfig"
source "fs/gfs2/Kconfig" source "fs/gfs2/Kconfig"
@ -10,11 +8,9 @@ Index: linux-2.6.22.19/fs/Kconfig
config OCFS2_FS config OCFS2_FS
tristate "OCFS2 file system support" tristate "OCFS2 file system support"
Index: linux-2.6.22.19/fs/Makefile --- a/fs/Makefile
=================================================================== +++ b/fs/Makefile
--- linux-2.6.22.19.orig/fs/Makefile @@ -120,3 +120,4 @@
+++ linux-2.6.22.19/fs/Makefile
@@ -120,3 +120,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/
obj-$(CONFIG_GFS2_FS) += gfs2/ obj-$(CONFIG_GFS2_FS) += gfs2/

10
target/linux/generic-2.6/patches-2.6.22/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 @@
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 @@
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 @@
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 @@
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 */
@ -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_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo, int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,

26
target/linux/generic-2.6/patches-2.6.22/600-eeprom_93cx6.patch
View File

@ -12,11 +12,9 @@ Signed-off-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
--- ---
Index: linux-2.6.22.19/drivers/misc/Kconfig --- a/drivers/misc/Kconfig
=================================================================== +++ b/drivers/misc/Kconfig
--- linux-2.6.22.19.orig/drivers/misc/Kconfig @@ -34,6 +34,11 @@
+++ linux-2.6.22.19/drivers/misc/Kconfig
@@ -34,6 +34,11 @@ config PHANTOM
If you choose to build module, its name will be phantom. If unsure, If you choose to build module, its name will be phantom. If unsure,
say N here. say N here.
@ -28,25 +26,21 @@ Index: linux-2.6.22.19/drivers/misc/Kconfig
If unsure, say N. If unsure, say N.
@@ -187,5 +192,4 @@ config THINKPAD_ACPI_BAY @@ -187,5 +192,4 @@
If you are not sure, say Y here. If you are not sure, say Y here.
- -
endmenu endmenu
Index: linux-2.6.22.19/drivers/misc/Makefile --- a/drivers/misc/Makefile
=================================================================== +++ b/drivers/misc/Makefile
--- linux-2.6.22.19.orig/drivers/misc/Makefile @@ -14,3 +14,4 @@
+++ linux-2.6.22.19/drivers/misc/Makefile
@@ -14,3 +14,4 @@ obj-$(CONFIG_PHANTOM) += phantom.o
obj-$(CONFIG_SGI_IOC4) += ioc4.o obj-$(CONFIG_SGI_IOC4) += ioc4.o
obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o
obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o
+obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o +obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o
Index: linux-2.6.22.19/drivers/misc/eeprom_93cx6.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/drivers/misc/eeprom_93cx6.c +++ b/drivers/misc/eeprom_93cx6.c
@@ -0,0 +1,229 @@ @@ -0,0 +1,229 @@
+/* +/*
+ Copyright (C) 2004 - 2006 rt2x00 SourceForge Project + Copyright (C) 2004 - 2006 rt2x00 SourceForge Project
@ -277,10 +271,8 @@ Index: linux-2.6.22.19/drivers/misc/eeprom_93cx6.c
+} +}
+EXPORT_SYMBOL_GPL(eeprom_93cx6_multiread); +EXPORT_SYMBOL_GPL(eeprom_93cx6_multiread);
+ +
Index: linux-2.6.22.19/include/linux/eeprom_93cx6.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/include/linux/eeprom_93cx6.h +++ b/include/linux/eeprom_93cx6.h
@@ -0,0 +1,72 @@ @@ -0,0 +1,72 @@
+/* +/*
+ Copyright (C) 2004 - 2006 rt2x00 SourceForge Project + Copyright (C) 2004 - 2006 rt2x00 SourceForge Project

8
target/linux/generic-2.6/patches-2.6.22/601-eeprom_93cx6_fixes.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/drivers/misc/eeprom_93cx6.c --- a/drivers/misc/eeprom_93cx6.c
=================================================================== +++ b/drivers/misc/eeprom_93cx6.c
--- linux-2.6.22.19.orig/drivers/misc/eeprom_93cx6.c @@ -39,14 +39,26 @@
+++ linux-2.6.22.19/drivers/misc/eeprom_93cx6.c
@@ -39,14 +39,26 @@ static inline void eeprom_93cx6_pulse_hi
{ {
eeprom->reg_data_clock = 1; eeprom->reg_data_clock = 1;
eeprom->register_write(eeprom); eeprom->register_write(eeprom);

12
target/linux/generic-2.6/patches-2.6.22/801-usb_serial_endpoint_size.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/drivers/usb/serial/usb-serial.c --- a/drivers/usb/serial/usb-serial.c
=================================================================== +++ b/drivers/usb/serial/usb-serial.c
--- linux-2.6.22.19.orig/drivers/usb/serial/usb-serial.c @@ -56,6 +56,7 @@
+++ linux-2.6.22.19/drivers/usb/serial/usb-serial.c
@@ -56,6 +56,7 @@ static struct usb_driver usb_serial_driv
drivers depend on it. drivers depend on it.
*/ */
@ -10,7 +8,7 @@ Index: linux-2.6.22.19/drivers/usb/serial/usb-serial.c
static int debug; static int debug;
static struct usb_serial *serial_table[SERIAL_TTY_MINORS]; /* initially all NULL */ static struct usb_serial *serial_table[SERIAL_TTY_MINORS]; /* initially all NULL */
static spinlock_t table_lock; static spinlock_t table_lock;
@@ -864,7 +865,7 @@ int usb_serial_probe(struct usb_interfac @@ -864,7 +865,7 @@
dev_err(&interface->dev, "No free urbs available\n"); dev_err(&interface->dev, "No free urbs available\n");
goto probe_error; goto probe_error;
} }
@ -19,7 +17,7 @@ Index: linux-2.6.22.19/drivers/usb/serial/usb-serial.c
port->bulk_in_size = buffer_size; port->bulk_in_size = buffer_size;
port->bulk_in_endpointAddress = endpoint->bEndpointAddress; port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL); port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL);
@@ -1245,3 +1246,5 @@ MODULE_LICENSE("GPL"); @@ -1245,3 +1246,5 @@
module_param(debug, bool, S_IRUGO | S_IWUSR); module_param(debug, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(debug, "Debug enabled or not"); MODULE_PARM_DESC(debug, "Debug enabled or not");

16
target/linux/generic-2.6/patches-2.6.22/900-headers_type_and_time.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.22.19/include/linux/time.h --- a/include/linux/time.h
=================================================================== +++ b/include/linux/time.h
--- linux-2.6.22.19.orig/include/linux/time.h
+++ linux-2.6.22.19/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
@ -13,17 +11,15 @@ Index: linux-2.6.22.19/include/linux/time.h
#include <linux/types.h> #include <linux/types.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
@@ -225,4 +229,6 @@ struct itimerval { @@ -225,4 +229,6 @@
*/ */
#define TIMER_ABSTIME 0x01 #define TIMER_ABSTIME 0x01
+#endif /* __KERNEL__ DEBIAN */ +#endif /* __KERNEL__ DEBIAN */
+ +
#endif #endif
Index: linux-2.6.22.19/include/linux/types.h --- a/include/linux/types.h
=================================================================== +++ b/include/linux/types.h
--- linux-2.6.22.19.orig/include/linux/types.h
+++ linux-2.6.22.19/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
@ -39,7 +35,7 @@ Index: linux-2.6.22.19/include/linux/types.h
#ifdef __KERNEL__ #ifdef __KERNEL__
#define BITS_TO_LONGS(bits) \ #define BITS_TO_LONGS(bits) \
@@ -162,6 +170,8 @@ typedef unsigned long blkcnt_t; @@ -162,6 +170,8 @@
#endif /* __KERNEL_STRICT_NAMES */ #endif /* __KERNEL_STRICT_NAMES */

38
target/linux/generic-2.6/patches-2.6.22/902-darwin_scripts_include.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.22.19/scripts/genksyms/parse.c_shipped --- a/scripts/genksyms/parse.c_shipped
=================================================================== +++ b/scripts/genksyms/parse.c_shipped
--- linux-2.6.22.19.orig/scripts/genksyms/parse.c_shipped
+++ linux-2.6.22.19/scripts/genksyms/parse.c_shipped
@@ -144,7 +144,9 @@ @@ -144,7 +144,9 @@
@ -12,10 +10,8 @@ Index: linux-2.6.22.19/scripts/genksyms/parse.c_shipped
#include "genksyms.h" #include "genksyms.h"
static int is_typedef; static int is_typedef;
Index: linux-2.6.22.19/scripts/genksyms/parse.y --- a/scripts/genksyms/parse.y
=================================================================== +++ b/scripts/genksyms/parse.y
--- linux-2.6.22.19.orig/scripts/genksyms/parse.y
+++ linux-2.6.22.19/scripts/genksyms/parse.y
@@ -24,7 +24,9 @@ @@ -24,7 +24,9 @@
%{ %{
@ -26,10 +22,8 @@ Index: linux-2.6.22.19/scripts/genksyms/parse.y
#include "genksyms.h" #include "genksyms.h"
static int is_typedef; static int is_typedef;
Index: linux-2.6.22.19/scripts/kallsyms.c --- a/scripts/kallsyms.c
=================================================================== +++ b/scripts/kallsyms.c
--- linux-2.6.22.19.orig/scripts/kallsyms.c
+++ linux-2.6.22.19/scripts/kallsyms.c
@@ -30,6 +30,35 @@ @@ -30,6 +30,35 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -66,11 +60,9 @@ Index: linux-2.6.22.19/scripts/kallsyms.c
#define KSYM_NAME_LEN 127 #define KSYM_NAME_LEN 127
Index: linux-2.6.22.19/scripts/kconfig/Makefile --- a/scripts/kconfig/Makefile
=================================================================== +++ b/scripts/kconfig/Makefile
--- linux-2.6.22.19.orig/scripts/kconfig/Makefile @@ -87,6 +87,9 @@
+++ linux-2.6.22.19/scripts/kconfig/Makefile
@@ -87,6 +87,9 @@ check-lxdialog := $(srctree)/$(src)/lxd
# we really need to do so. (Do not call gcc as part of make mrproper) # 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)
HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
@ -80,10 +72,8 @@ Index: linux-2.6.22.19/scripts/kconfig/Makefile
HOST_EXTRACFLAGS += -DLOCALE HOST_EXTRACFLAGS += -DLOCALE
Index: linux-2.6.22.19/scripts/mod/mk_elfconfig.c --- a/scripts/mod/mk_elfconfig.c
=================================================================== +++ b/scripts/mod/mk_elfconfig.c
--- linux-2.6.22.19.orig/scripts/mod/mk_elfconfig.c
+++ linux-2.6.22.19/scripts/mod/mk_elfconfig.c
@@ -1,7 +1,11 @@ @@ -1,7 +1,11 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -96,10 +86,8 @@ Index: linux-2.6.22.19/scripts/mod/mk_elfconfig.c
int int
main(int argc, char **argv) main(int argc, char **argv)
Index: linux-2.6.22.19/scripts/mod/modpost.h --- a/scripts/mod/modpost.h
=================================================================== +++ b/scripts/mod/modpost.h
--- linux-2.6.22.19.orig/scripts/mod/modpost.h
+++ linux-2.6.22.19/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>

10
target/linux/generic-2.6/patches-2.6.22/903-stddef_include.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/include/linux/stddef.h --- a/include/linux/stddef.h
=================================================================== +++ b/include/linux/stddef.h
--- linux-2.6.22.19.orig/include/linux/stddef.h @@ -16,6 +16,7 @@
+++ linux-2.6.22.19/include/linux/stddef.h
@@ -16,6 +16,7 @@ enum {
false = 0, false = 0,
true = 1 true = 1
}; };
@ -10,7 +8,7 @@ Index: linux-2.6.22.19/include/linux/stddef.h
#undef offsetof #undef offsetof
#ifdef __compiler_offsetof #ifdef __compiler_offsetof
@@ -23,6 +24,5 @@ enum { @@ -23,6 +24,5 @@
#else #else
#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
#endif #endif

10
target/linux/generic-2.6/patches-2.6.22/904-ls_time_locale.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.22.19/scripts/gen_initramfs_list.sh --- a/scripts/gen_initramfs_list.sh
=================================================================== +++ b/scripts/gen_initramfs_list.sh
--- linux-2.6.22.19.orig/scripts/gen_initramfs_list.sh @@ -125,7 +125,7 @@
+++ linux-2.6.22.19/scripts/gen_initramfs_list.sh
@@ -125,7 +125,7 @@ parse() {
str="${ftype} ${name} ${location} ${str}" str="${ftype} ${name} ${location} ${str}"
;; ;;
"nod") "nod")
@ -11,7 +9,7 @@ Index: linux-2.6.22.19/scripts/gen_initramfs_list.sh
local maj=`field 5 ${dev}` local maj=`field 5 ${dev}`
local min=`field 6 ${dev}` local min=`field 6 ${dev}`
maj=${maj%,} maj=${maj%,}
@@ -135,7 +135,7 @@ parse() { @@ -135,7 +135,7 @@
str="${ftype} ${name} ${str} ${dev} ${maj} ${min}" str="${ftype} ${name} ${str} ${dev} ${maj} ${min}"
;; ;;
"slink") "slink")

20
target/linux/generic-2.6/patches-2.6.22/999-icplus.patch
View File

@ -14,11 +14,9 @@ Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
--- ---
Index: linux-2.6.22.19/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
=================================================================== +++ b/drivers/net/phy/Kconfig
--- linux-2.6.22.19.orig/drivers/net/phy/Kconfig @@ -55,6 +55,11 @@
+++ linux-2.6.22.19/drivers/net/phy/Kconfig
@@ -55,6 +55,11 @@ config BROADCOM_PHY
---help--- ---help---
Currently supports the BCM5411, BCM5421 and BCM5461 PHYs. Currently supports the BCM5411, BCM5421 and BCM5461 PHYs.
@ -30,20 +28,16 @@ Index: linux-2.6.22.19/drivers/net/phy/Kconfig
config FIXED_PHY config FIXED_PHY
tristate "Drivers for PHY emulation on fixed speed/link" tristate "Drivers for PHY emulation on fixed speed/link"
---help--- ---help---
Index: linux-2.6.22.19/drivers/net/phy/Makefile --- a/drivers/net/phy/Makefile
=================================================================== +++ b/drivers/net/phy/Makefile
--- linux-2.6.22.19.orig/drivers/net/phy/Makefile @@ -11,4 +11,5 @@
+++ linux-2.6.22.19/drivers/net/phy/Makefile
@@ -11,4 +11,5 @@ obj-$(CONFIG_QSEMI_PHY) += qsemi.o
obj-$(CONFIG_SMSC_PHY) += smsc.o obj-$(CONFIG_SMSC_PHY) += smsc.o
obj-$(CONFIG_VITESSE_PHY) += vitesse.o obj-$(CONFIG_VITESSE_PHY) += vitesse.o
obj-$(CONFIG_BROADCOM_PHY) += broadcom.o obj-$(CONFIG_BROADCOM_PHY) += broadcom.o
+obj-$(CONFIG_ICPLUS_PHY) += icplus.o +obj-$(CONFIG_ICPLUS_PHY) += icplus.o
obj-$(CONFIG_FIXED_PHY) += fixed.o obj-$(CONFIG_FIXED_PHY) += fixed.o
Index: linux-2.6.22.19/drivers/net/phy/icplus.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.19/drivers/net/phy/icplus.c +++ b/drivers/net/phy/icplus.c
@@ -0,0 +1,134 @@ @@ -0,0 +1,134 @@
+/* +/*
+ * Driver for ICPlus PHYs + * Driver for ICPlus PHYs