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

[kernel] refresh generic 2.6.22 patches

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11186 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2008-05-18 20:24:13 +00:00
parent 8b2e13cf02
commit ff4e17bc25
47 changed files with 1146 additions and 941 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,8 @@
diff -urN linux-2.6.22.4/fs/Kconfig linux-2.6.22.4-squashfs/fs/Kconfig Index: linux-2.6.22.19/fs/Kconfig
--- linux-2.6.22.4/fs/Kconfig 2007-08-21 06:33:06.000000000 +0200 ===================================================================
+++ linux-2.6.22.4-squashfs/fs/Kconfig 2007-09-20 19:13:44.000000000 +0200 --- 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.
@ -73,10 +74,11 @@ diff -urN linux-2.6.22.4/fs/Kconfig linux-2.6.22.4-squashfs/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
diff -urN linux-2.6.22.4/fs/Makefile linux-2.6.22.4-squashfs/fs/Makefile Index: linux-2.6.22.19/fs/Makefile
--- linux-2.6.22.4/fs/Makefile 2007-08-21 06:33:06.000000000 +0200 ===================================================================
+++ linux-2.6.22.4-squashfs/fs/Makefile 2007-09-20 19:13:44.000000000 +0200 --- 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/
@ -84,9 +86,10 @@ diff -urN linux-2.6.22.4/fs/Makefile linux-2.6.22.4-squashfs/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/
diff -urN linux-2.6.22.4/fs/squashfs/inode.c linux-2.6.22.4-squashfs/fs/squashfs/inode.c Index: linux-2.6.22.19/fs/squashfs/inode.c
--- linux-2.6.22.4/fs/squashfs/inode.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4-squashfs/fs/squashfs/inode.c 2007-09-20 19:13:44.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -2210,9 +2213,10 @@ diff -urN linux-2.6.22.4/fs/squashfs/inode.c linux-2.6.22.4-squashfs/fs/squashfs
+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");
diff -urN linux-2.6.22.4/fs/squashfs/Makefile linux-2.6.22.4-squashfs/fs/squashfs/Makefile Index: linux-2.6.22.19/fs/squashfs/Makefile
--- linux-2.6.22.4/fs/squashfs/Makefile 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4-squashfs/fs/squashfs/Makefile 2007-09-20 19:13:44.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/fs/squashfs/Makefile
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
+# +#
+# Makefile for the linux squashfs routines. +# Makefile for the linux squashfs routines.
@ -2221,9 +2225,10 @@ diff -urN linux-2.6.22.4/fs/squashfs/Makefile linux-2.6.22.4-squashfs/fs/squashf
+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
diff -urN linux-2.6.22.4/fs/squashfs/squashfs2_0.c linux-2.6.22.4-squashfs/fs/squashfs/squashfs2_0.c Index: linux-2.6.22.19/fs/squashfs/squashfs2_0.c
--- linux-2.6.22.4/fs/squashfs/squashfs2_0.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4-squashfs/fs/squashfs/squashfs2_0.c 2007-09-20 19:13:44.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -2983,9 +2988,10 @@ diff -urN linux-2.6.22.4/fs/squashfs/squashfs2_0.c linux-2.6.22.4-squashfs/fs/sq
+ +
+ return 1; + return 1;
+} +}
diff -urN linux-2.6.22.4/fs/squashfs/squashfs.h linux-2.6.22.4-squashfs/fs/squashfs/squashfs.h Index: linux-2.6.22.19/fs/squashfs/squashfs.h
--- linux-2.6.22.4/fs/squashfs/squashfs.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4-squashfs/fs/squashfs/squashfs.h 2007-09-20 19:13:44.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -3073,9 +3079,10 @@ diff -urN linux-2.6.22.4/fs/squashfs/squashfs.h linux-2.6.22.4-squashfs/fs/squas
+ return 0; + return 0;
+} +}
+#endif +#endif
diff -urN linux-2.6.22.4/include/linux/magic.h linux-2.6.22.4-squashfs/include/linux/magic.h Index: linux-2.6.22.19/include/linux/magic.h
--- linux-2.6.22.4/include/linux/magic.h 2007-08-21 06:33:06.000000000 +0200 ===================================================================
+++ linux-2.6.22.4-squashfs/include/linux/magic.h 2007-09-20 19:15:43.000000000 +0200 --- 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"
@ -3086,9 +3093,10 @@ diff -urN linux-2.6.22.4/include/linux/magic.h linux-2.6.22.4-squashfs/include/l
#define SMB_SUPER_MAGIC 0x517B #define SMB_SUPER_MAGIC 0x517B
#define USBDEVICE_SUPER_MAGIC 0x9fa2 #define USBDEVICE_SUPER_MAGIC 0x9fa2
diff -urN linux-2.6.22.4/include/linux/squashfs_fs.h linux-2.6.22.4-squashfs/include/linux/squashfs_fs.h Index: linux-2.6.22.19/include/linux/squashfs_fs.h
--- linux-2.6.22.4/include/linux/squashfs_fs.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4-squashfs/include/linux/squashfs_fs.h 2007-09-20 19:15:01.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -4001,9 +4009,10 @@ diff -urN linux-2.6.22.4/include/linux/squashfs_fs.h linux-2.6.22.4-squashfs/inc
+ +
+#endif +#endif
+#endif +#endif
diff -urN linux-2.6.22.4/include/linux/squashfs_fs_i.h linux-2.6.22.4-squashfs/include/linux/squashfs_fs_i.h Index: linux-2.6.22.19/include/linux/squashfs_fs_i.h
--- linux-2.6.22.4/include/linux/squashfs_fs_i.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4-squashfs/include/linux/squashfs_fs_i.h 2007-09-20 19:13:44.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -4050,9 +4059,10 @@ diff -urN linux-2.6.22.4/include/linux/squashfs_fs_i.h linux-2.6.22.4-squashfs/i
+ struct inode vfs_inode; + struct inode vfs_inode;
+}; +};
+#endif +#endif
diff -urN linux-2.6.22.4/include/linux/squashfs_fs_sb.h linux-2.6.22.4-squashfs/include/linux/squashfs_fs_sb.h Index: linux-2.6.22.19/include/linux/squashfs_fs_sb.h
--- linux-2.6.22.4/include/linux/squashfs_fs_sb.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4-squashfs/include/linux/squashfs_fs_sb.h 2007-09-20 19:13:44.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -4128,9 +4138,10 @@ diff -urN linux-2.6.22.4/include/linux/squashfs_fs_sb.h linux-2.6.22.4-squashfs/
+ int (*read_fragment_index_table)(struct super_block *s); + int (*read_fragment_index_table)(struct super_block *s);
+}; +};
+#endif +#endif
diff -urN linux-2.6.22.4/init/do_mounts_rd.c linux-2.6.22.4-squashfs/init/do_mounts_rd.c Index: linux-2.6.22.19/init/do_mounts_rd.c
--- linux-2.6.22.4/init/do_mounts_rd.c 2007-08-21 06:33:06.000000000 +0200 ===================================================================
+++ linux-2.6.22.4-squashfs/init/do_mounts_rd.c 2007-09-20 19:13:44.000000000 +0200 --- 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>
@ -4139,7 +4150,7 @@ diff -urN linux-2.6.22.4/init/do_mounts_rd.c linux-2.6.22.4-squashfs/init/do_mou
#include <linux/initrd.h> #include <linux/initrd.h>
#include <linux/string.h> #include <linux/string.h>
@@ -39,6 +40,7 @@ @@ -39,6 +40,7 @@ static int __init crd_load(int in_fd, in
* 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:
@ -4147,7 +4158,7 @@ diff -urN linux-2.6.22.4/init/do_mounts_rd.c linux-2.6.22.4-squashfs/init/do_mou
* minix * minix
* ext2 * ext2
* romfs * romfs
@@ -53,6 +55,7 @@ @@ -53,6 +55,7 @@ identify_ramdisk_image(int fd, int start
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;
@ -4155,7 +4166,7 @@ diff -urN linux-2.6.22.4/init/do_mounts_rd.c linux-2.6.22.4-squashfs/init/do_mou
int nblocks = -1; int nblocks = -1;
unsigned char *buf; unsigned char *buf;
@@ -64,6 +67,7 @@ @@ -64,6 +67,7 @@ identify_ramdisk_image(int fd, int start
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;
@ -4163,7 +4174,7 @@ diff -urN linux-2.6.22.4/init/do_mounts_rd.c linux-2.6.22.4-squashfs/init/do_mou
memset(buf, 0xe5, size); memset(buf, 0xe5, size);
/* /*
@@ -101,6 +105,15 @@ @@ -101,6 +105,15 @@ identify_ramdisk_image(int fd, int start
goto done; goto done;
} }

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

@ -1,6 +1,7 @@
diff -urN linux-2.6.21.1.old/include/linux/LzmaDecode.h linux-2.6.21.1.dev/include/linux/LzmaDecode.h Index: linux-2.6.22.19/include/linux/LzmaDecode.h
--- linux-2.6.21.1.old/include/linux/LzmaDecode.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/include/linux/LzmaDecode.h 2007-05-26 19:03:45.705682584 +0200 --- /dev/null
+++ linux-2.6.22.19/include/linux/LzmaDecode.h
@@ -0,0 +1,100 @@ @@ -0,0 +1,100 @@
+/* +/*
+ LzmaDecode.h + LzmaDecode.h
@ -102,9 +103,10 @@ diff -urN linux-2.6.21.1.old/include/linux/LzmaDecode.h linux-2.6.21.1.dev/inclu
+ UInt32 *outSizeProcessed); + UInt32 *outSizeProcessed);
+ +
+#endif +#endif
diff -urN linux-2.6.21.1.old/lib/LzmaDecode.c linux-2.6.21.1.dev/lib/LzmaDecode.c Index: linux-2.6.22.19/lib/LzmaDecode.c
--- linux-2.6.21.1.old/lib/LzmaDecode.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/lib/LzmaDecode.c 2007-05-26 19:03:45.706682432 +0200 --- /dev/null
+++ linux-2.6.22.19/lib/LzmaDecode.c
@@ -0,0 +1,663 @@ @@ -0,0 +1,663 @@
+/* +/*
+ LzmaDecode.c + LzmaDecode.c
@ -769,10 +771,11 @@ diff -urN linux-2.6.21.1.old/lib/LzmaDecode.c linux-2.6.21.1.dev/lib/LzmaDecode.
+ *outSizeProcessed = nowPos; + *outSizeProcessed = nowPos;
+ return LZMA_RESULT_OK; + return LZMA_RESULT_OK;
+} +}
diff -urN linux-2.6.21.1.old/lib/Makefile linux-2.6.21.1.dev/lib/Makefile Index: linux-2.6.22.19/lib/Makefile
--- linux-2.6.21.1.old/lib/Makefile 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/lib/Makefile 2007-05-26 19:03:45.721680152 +0200 --- 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 \
@ -781,7 +784,7 @@ diff -urN linux-2.6.21.1.old/lib/Makefile linux-2.6.21.1.dev/lib/Makefile
ifeq ($(CONFIG_DEBUG_KOBJECT),y) ifeq ($(CONFIG_DEBUG_KOBJECT),y)
CFLAGS_kobject.o += -DDEBUG CFLAGS_kobject.o += -DDEBUG
@@ -58,6 +58,7 @@ @@ -58,6 +58,7 @@ obj-$(CONFIG_SMP) += percpu_counter.o
obj-$(CONFIG_AUDIT_GENERIC) += audit.o obj-$(CONFIG_AUDIT_GENERIC) += audit.o
obj-$(CONFIG_SWIOTLB) += swiotlb.o obj-$(CONFIG_SWIOTLB) += swiotlb.o

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

@ -1,6 +1,7 @@
diff -urN linux-2.6.21.1.old/fs/squashfs/inode.c linux-2.6.21.1.dev/fs/squashfs/inode.c Index: linux-2.6.22.19/fs/squashfs/inode.c
--- linux-2.6.21.1.old/fs/squashfs/inode.c 2007-05-26 19:03:45.499713896 +0200 ===================================================================
+++ linux-2.6.21.1.dev/fs/squashfs/inode.c 2007-05-26 19:07:27.951896024 +0200 --- 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>
@ -39,7 +40,7 @@ diff -urN linux-2.6.21.1.old/fs/squashfs/inode.c linux-2.6.21.1.dev/fs/squashfs/
static void squashfs_put_super(struct super_block *); static 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 @@ @@ -64,7 +81,11 @@ static int squashfs_get_sb(struct file_s
const char *, void *, struct vfsmount *); const char *, void *, struct vfsmount *);
@ -51,7 +52,7 @@ diff -urN linux-2.6.21.1.old/fs/squashfs/inode.c linux-2.6.21.1.dev/fs/squashfs/
static struct file_system_type squashfs_fs_type = { static struct file_system_type squashfs_fs_type = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
@@ -249,6 +270,15 @@ @@ -249,6 +270,15 @@ SQSH_EXTERN unsigned int squashfs_read_d
if (compressed) { if (compressed) {
int zlib_err; int zlib_err;
@ -67,7 +68,7 @@ diff -urN linux-2.6.21.1.old/fs/squashfs/inode.c linux-2.6.21.1.dev/fs/squashfs/
stream.next_in = c_buffer; stream.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 @@ @@ -263,7 +293,7 @@ SQSH_EXTERN unsigned int squashfs_read_d
bytes = 0; bytes = 0;
} else } else
bytes = stream.total_out; bytes = stream.total_out;
@ -76,7 +77,7 @@ diff -urN linux-2.6.21.1.old/fs/squashfs/inode.c linux-2.6.21.1.dev/fs/squashfs/
up(&msblk->read_data_mutex); up(&msblk->read_data_mutex);
} }
@@ -2045,15 +2075,19 @@ @@ -2045,15 +2075,19 @@ static int __init init_squashfs_fs(void)
printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) " printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) "
"Phillip Lougher\n"); "Phillip Lougher\n");
@ -96,7 +97,7 @@ diff -urN linux-2.6.21.1.old/fs/squashfs/inode.c linux-2.6.21.1.dev/fs/squashfs/
destroy_inodecache(); destroy_inodecache();
} }
@@ -2064,7 +2098,9 @@ @@ -2064,7 +2098,9 @@ out:
static void __exit exit_squashfs_fs(void) static void __exit exit_squashfs_fs(void)
{ {

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

@ -1,7 +1,8 @@
diff -urN linux-2.6.21.1.old/Makefile linux-2.6.21.1.dev/Makefile Index: linux-2.6.22.19/Makefile
--- linux-2.6.21.1.old/Makefile 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/Makefile 2007-05-26 19:14:22.967804016 +0200 --- 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)

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

@ -1,7 +1,8 @@
diff -urN linux-2.6.21.1.old/include/asm-mips/system.h linux-2.6.21.1.dev/include/asm-mips/system.h Index: linux-2.6.22.19/include/asm-mips/system.h
--- linux-2.6.21.1.old/include/asm-mips/system.h 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/include/asm-mips/system.h 2007-05-26 19:26:30.870146040 +0200 --- 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);

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

@ -1,6 +1,7 @@
diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0002.c linux-2.6.21.1.dev/drivers/mtd/chips/cfi_cmdset_0002.c Index: linux-2.6.22.19/drivers/mtd/chips/cfi_cmdset_0002.c
--- linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0002.c 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/drivers/mtd/chips/cfi_cmdset_0002.c 2007-05-26 19:30:01.049193968 +0200 --- 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
@ -9,7 +10,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0002.c linux-2.6.21.1.
static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *); static int cfi_amdstd_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 @@ @@ -294,12 +295,19 @@ struct mtd_info *cfi_cmdset_0002(struct
if (extp->MajorVersion != '1' || if (extp->MajorVersion != '1' ||
(extp->MinorVersion < '0' || extp->MinorVersion > '4')) { (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {

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

@ -1,7 +1,8 @@
diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.21.1.dev/drivers/mtd/chips/cfi_cmdset_0001.c Index: linux-2.6.22.19/drivers/mtd/chips/cfi_cmdset_0001.c
--- linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0001.c 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/drivers/mtd/chips/cfi_cmdset_0001.c 2007-05-26 19:40:46.809023552 +0200 --- 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,
@ -10,7 +11,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.21.1.
{ {
struct cfi_private *cfi = map->fldrv_priv; struct cfi_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 @@ @@ -942,7 +942,7 @@ static int __xipram xip_wait_for_operati
flstate_t oldstate, newstate; flstate_t oldstate, newstate;
start = xip_currtime(); start = xip_currtime();
@ -19,7 +20,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.21.1.
if (usec == 0) if (usec == 0)
usec = 500000; usec = 500000;
done = 0; done = 0;
@@ -1052,8 +1052,8 @@ @@ -1052,8 +1052,8 @@ static int __xipram xip_wait_for_operati
#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)
@ -30,7 +31,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.21.1.
#else #else
@@ -1065,65 +1065,65 @@ @@ -1065,65 +1065,65 @@ static int __xipram xip_wait_for_operati
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,
@ -131,7 +132,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.21.1.
/* Done and happy. */ /* Done and happy. */
chip->state = FL_STATUS; chip->state = FL_STATUS;
return 0; return 0;
@@ -1132,7 +1132,8 @@ @@ -1132,7 +1132,8 @@ static int inval_cache_and_wait_for_oper
#endif #endif
#define WAIT_TIMEOUT(map, chip, adr, udelay) \ #define WAIT_TIMEOUT(map, chip, adr, udelay) \
@ -141,7 +142,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.21.1.
static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len) static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len)
@@ -1356,7 +1357,7 @@ @@ -1356,7 +1357,7 @@ static int __xipram do_write_oneword(str
ret = INVAL_CACHE_AND_WAIT(map, chip, adr, ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
adr, map_bankwidth(map), adr, map_bankwidth(map),
@ -150,7 +151,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.21.1.
if (ret) { 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 @@ @@ -1593,7 +1594,7 @@ static int __xipram do_write_buffer(stru
ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr, ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,
adr, len, adr, len,
@ -159,7 +160,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.21.1.
if (ret) { 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 @@ @@ -1728,7 +1729,7 @@ static int __xipram do_erase_oneblock(st
ret = INVAL_CACHE_AND_WAIT(map, chip, adr, ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
adr, len, adr, len,

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

@ -1,14 +1,16 @@
diff -urN linux-2.6.21.1.old/fs/squashfs/Makefile linux-2.6.21.1.dev/fs/squashfs/Makefile Index: linux-2.6.22.19/fs/squashfs/Makefile
--- linux-2.6.21.1.old/fs/squashfs/Makefile 2007-05-26 19:03:45.499713896 +0200 ===================================================================
+++ linux-2.6.21.1.dev/fs/squashfs/Makefile 2007-05-26 19:43:37.064140840 +0200 --- 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
diff -urN linux-2.6.21.1.old/fs/squashfs/squashfs.h linux-2.6.21.1.dev/fs/squashfs/squashfs.h Index: linux-2.6.22.19/fs/squashfs/squashfs.h
--- linux-2.6.21.1.old/fs/squashfs/squashfs.h 2007-05-26 19:03:45.500713744 +0200 ===================================================================
+++ linux-2.6.21.1.dev/fs/squashfs/squashfs.h 2007-05-26 19:43:37.075139168 +0200 --- 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

7
target/linux/generic-2.6/patches-2.6.22/011-mips_boot.patch
View File

@ -1,6 +1,7 @@
diff -urN linux-2.6.21.1.old/arch/mips/kernel/head.S linux-2.6.21.1.dev/arch/mips/kernel/head.S Index: linux-2.6.22.19/arch/mips/kernel/head.S
--- linux-2.6.21.1.old/arch/mips/kernel/head.S 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/arch/mips/kernel/head.S 2007-05-26 19:46:49.061952736 +0200 --- 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

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

@ -1,7 +1,8 @@
diff -urN linux-2.6.21.1.old/arch/mips/mm/tlbex.c linux-2.6.21.1.dev/arch/mips/mm/tlbex.c Index: linux-2.6.22.19/arch/mips/mm/tlbex.c
--- linux-2.6.21.1.old/arch/mips/mm/tlbex.c 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/arch/mips/mm/tlbex.c 2007-05-26 19:50:19.046030304 +0200 --- 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:
@ -9,7 +10,7 @@ diff -urN linux-2.6.21.1.old/arch/mips/mm/tlbex.c linux-2.6.21.1.dev/arch/mips/m
case CPU_SB1: case CPU_SB1:
case CPU_SB1A: case CPU_SB1A:
case CPU_4KSC: case CPU_4KSC:
@@ -915,6 +914,7 @@ @@ -915,6 +914,7 @@ static __init void build_tlb_write_entry
tlbw(p); tlbw(p);
break; break;

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

@ -1,7 +1,8 @@
diff -urN linux-2.6.21.1.old/arch/mips/defconfig linux-2.6.21.1.dev/arch/mips/defconfig Index: linux-2.6.22.19/arch/mips/defconfig
--- linux-2.6.21.1.old/arch/mips/defconfig 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/arch/mips/defconfig 2007-05-26 19:55:17.542651920 +0200 --- 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
@ -9,10 +10,11 @@ diff -urN linux-2.6.21.1.old/arch/mips/defconfig linux-2.6.21.1.dev/arch/mips/de
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_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
diff -urN linux-2.6.21.1.old/arch/mips/Kconfig linux-2.6.21.1.dev/arch/mips/Kconfig Index: linux-2.6.22.19/arch/mips/Kconfig
--- linux-2.6.21.1.old/arch/mips/Kconfig 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/arch/mips/Kconfig 2007-05-26 19:55:17.500658304 +0200 --- 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
@ -23,9 +25,10 @@ diff -urN linux-2.6.21.1.old/arch/mips/Kconfig linux-2.6.21.1.dev/arch/mips/Kcon
config SCHED_NO_NO_OMIT_FRAME_POINTER config SCHED_NO_NO_OMIT_FRAME_POINTER
bool bool
default y default y
diff -urN linux-2.6.21.1.old/include/asm-mips/gpio.h linux-2.6.21.1.dev/include/asm-mips/gpio.h Index: linux-2.6.22.19/include/asm-mips/gpio.h
--- linux-2.6.21.1.old/include/asm-mips/gpio.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/include/asm-mips/gpio.h 2007-05-26 19:55:17.500658304 +0200 --- /dev/null
+++ linux-2.6.22.19/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

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

@ -1362,10 +1362,11 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
include/linux/screen_info.h | 9 include/linux/screen_info.h | 9
75 files changed, 4594 insertions(+), 5204 deletions(-) 75 files changed, 4594 insertions(+), 5204 deletions(-)
diff -puN MAINTAINERS~git-newsetup MAINTAINERS Index: linux-2.6.22.19/MAINTAINERS
--- a/MAINTAINERS~git-newsetup ===================================================================
+++ a/MAINTAINERS --- linux-2.6.22.19.orig/MAINTAINERS
@@ -1774,8 +1774,8 @@ T: http://www.harbaum.org/till/i2c_tiny_ +++ linux-2.6.22.19/MAINTAINERS
@@ -1750,8 +1750,8 @@ T: http://www.harbaum.org/till/i2c_tiny_
S: Maintained S: Maintained
i386 BOOT CODE i386 BOOT CODE
@ -1376,9 +1377,10 @@ diff -puN MAINTAINERS~git-newsetup MAINTAINERS
L: Linux-Kernel@vger.kernel.org L: Linux-Kernel@vger.kernel.org
S: Maintained S: Maintained
diff -puN arch/i386/Kconfig.cpu~git-newsetup arch/i386/Kconfig.cpu Index: linux-2.6.22.19/arch/i386/Kconfig.cpu
--- a/arch/i386/Kconfig.cpu~git-newsetup ===================================================================
+++ a/arch/i386/Kconfig.cpu --- linux-2.6.22.19.orig/arch/i386/Kconfig.cpu
+++ linux-2.6.22.19/arch/i386/Kconfig.cpu
@@ -346,6 +346,6 @@ config X86_CMOV @@ -346,6 +346,6 @@ config X86_CMOV
config X86_MINIMUM_CPU_MODEL config X86_MINIMUM_CPU_MODEL
@ -1388,9 +1390,10 @@ diff -puN arch/i386/Kconfig.cpu~git-newsetup arch/i386/Kconfig.cpu
+ default "4" if X86_XADD || X86_CMPXCHG || X86_BSWAP || X86_WP_WORKS_OK + default "4" if X86_XADD || X86_CMPXCHG || X86_BSWAP || X86_WP_WORKS_OK
+ default "3" + default "3"
diff -puN arch/i386/boot/Makefile~git-newsetup arch/i386/boot/Makefile Index: linux-2.6.22.19/arch/i386/boot/Makefile
--- a/arch/i386/boot/Makefile~git-newsetup ===================================================================
+++ a/arch/i386/boot/Makefile --- linux-2.6.22.19.orig/arch/i386/boot/Makefile
+++ linux-2.6.22.19/arch/i386/boot/Makefile
@@ -25,27 +25,53 @@ SVGA_MODE := -DSVGA_MODE=NORMAL_VGA @@ -25,27 +25,53 @@ SVGA_MODE := -DSVGA_MODE=NORMAL_VGA
#RAMDISK := -DRAMDISK=512 #RAMDISK := -DRAMDISK=512
@ -1470,9 +1473,10 @@ diff -puN arch/i386/boot/Makefile~git-newsetup arch/i386/boot/Makefile
$(obj)/compressed/vmlinux: FORCE $(obj)/compressed/vmlinux: FORCE
$(Q)$(MAKE) $(build)=$(obj)/compressed IMAGE_OFFSET=$(IMAGE_OFFSET) $@ $(Q)$(MAKE) $(build)=$(obj)/compressed IMAGE_OFFSET=$(IMAGE_OFFSET) $@
diff -puN /dev/null arch/i386/boot/a20.c Index: linux-2.6.22.19/arch/i386/boot/a20.c
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/a20.c +++ linux-2.6.22.19/arch/i386/boot/a20.c
@@ -0,0 +1,161 @@ @@ -0,0 +1,161 @@
+/* -*- linux-c -*- ------------------------------------------------------- * +/* -*- linux-c -*- ------------------------------------------------------- *
+ * + *
@ -1635,9 +1639,10 @@ diff -puN /dev/null arch/i386/boot/a20.c
+ return -1; + return -1;
+#endif +#endif
+} +}
diff -puN /dev/null arch/i386/boot/apm.c Index: linux-2.6.22.19/arch/i386/boot/apm.c
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/apm.c +++ linux-2.6.22.19/arch/i386/boot/apm.c
@@ -0,0 +1,97 @@ @@ -0,0 +1,97 @@
+/* -*- linux-c -*- ------------------------------------------------------- * +/* -*- linux-c -*- ------------------------------------------------------- *
+ * + *
@ -1736,9 +1741,10 @@ diff -puN /dev/null arch/i386/boot/apm.c
+} +}
+ +
+#endif +#endif
diff -puN /dev/null arch/i386/boot/bitops.h Index: linux-2.6.22.19/arch/i386/boot/bitops.h
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/bitops.h +++ linux-2.6.22.19/arch/i386/boot/bitops.h
@@ -0,0 +1,45 @@ @@ -0,0 +1,45 @@
+/* -*- linux-c -*- ------------------------------------------------------- * +/* -*- linux-c -*- ------------------------------------------------------- *
+ * + *
@ -1785,9 +1791,10 @@ diff -puN /dev/null arch/i386/boot/bitops.h
+} +}
+ +
+#endif /* BOOT_BITOPS_H */ +#endif /* BOOT_BITOPS_H */
diff -puN /dev/null arch/i386/boot/boot.h Index: linux-2.6.22.19/arch/i386/boot/boot.h
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/boot.h +++ linux-2.6.22.19/arch/i386/boot/boot.h
@@ -0,0 +1,290 @@ @@ -0,0 +1,290 @@
+/* -*- linux-c -*- ------------------------------------------------------- * +/* -*- linux-c -*- ------------------------------------------------------- *
+ * + *
@ -2079,8 +2086,9 @@ diff -puN /dev/null arch/i386/boot/boot.h
+#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLY__ */
+ +
+#endif /* BOOT_BOOT_H */ +#endif /* BOOT_BOOT_H */
diff -puN arch/i386/boot/bootsect.S~git-newsetup /dev/null Index: linux-2.6.22.19/arch/i386/boot/bootsect.S
--- a/arch/i386/boot/bootsect.S ===================================================================
--- linux-2.6.22.19.orig/arch/i386/boot/bootsect.S
+++ /dev/null +++ /dev/null
@@ -1,98 +0,0 @@ @@ -1,98 +0,0 @@
-/* -/*
@ -2181,9 +2189,10 @@ diff -puN arch/i386/boot/bootsect.S~git-newsetup /dev/null
-vid_mode: .word SVGA_MODE -vid_mode: .word SVGA_MODE
-root_dev: .word ROOT_DEV -root_dev: .word ROOT_DEV
-boot_flag: .word 0xAA55 -boot_flag: .word 0xAA55
diff -puN /dev/null arch/i386/boot/cmdline.c Index: linux-2.6.22.19/arch/i386/boot/cmdline.c
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/cmdline.c +++ linux-2.6.22.19/arch/i386/boot/cmdline.c
@@ -0,0 +1,97 @@ @@ -0,0 +1,97 @@
+/* -*- linux-c -*- ------------------------------------------------------- * +/* -*- linux-c -*- ------------------------------------------------------- *
+ * + *
@ -2282,9 +2291,10 @@ diff -puN /dev/null arch/i386/boot/cmdline.c
+ +
+ return len; + return len;
+} +}
diff -puN /dev/null arch/i386/boot/code16gcc.h Index: linux-2.6.22.19/arch/i386/boot/code16gcc.h
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/code16gcc.h +++ linux-2.6.22.19/arch/i386/boot/code16gcc.h
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
+/* +/*
+ * code16gcc.h + * code16gcc.h
@ -2295,9 +2305,10 @@ diff -puN /dev/null arch/i386/boot/code16gcc.h
+#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLY__
+asm(".code16gcc"); +asm(".code16gcc");
+#endif +#endif
diff -puN arch/i386/boot/compressed/Makefile~git-newsetup arch/i386/boot/compressed/Makefile Index: linux-2.6.22.19/arch/i386/boot/compressed/Makefile
--- a/arch/i386/boot/compressed/Makefile~git-newsetup ===================================================================
+++ a/arch/i386/boot/compressed/Makefile --- linux-2.6.22.19.orig/arch/i386/boot/compressed/Makefile
+++ linux-2.6.22.19/arch/i386/boot/compressed/Makefile
@@ -9,9 +9,14 @@ targets := vmlinux vmlinux.bin vmlinux. @@ -9,9 +9,14 @@ targets := vmlinux vmlinux.bin vmlinux.
EXTRA_AFLAGS := -traditional EXTRA_AFLAGS := -traditional
@ -2314,9 +2325,10 @@ diff -puN arch/i386/boot/compressed/Makefile~git-newsetup arch/i386/boot/compres
$(obj)/vmlinux: $(src)/vmlinux.lds $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE $(obj)/vmlinux: $(src)/vmlinux.lds $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE
$(call if_changed,ld) $(call if_changed,ld)
@: @:
diff -puN arch/i386/boot/compressed/head.S~git-newsetup arch/i386/boot/compressed/head.S Index: linux-2.6.22.19/arch/i386/boot/compressed/head.S
--- a/arch/i386/boot/compressed/head.S~git-newsetup ===================================================================
+++ a/arch/i386/boot/compressed/head.S --- linux-2.6.22.19.orig/arch/i386/boot/compressed/head.S
+++ linux-2.6.22.19/arch/i386/boot/compressed/head.S
@@ -45,10 +45,10 @@ startup_32: @@ -45,10 +45,10 @@ startup_32:
* at and where we were actually loaded at. This can only be done * at and where we were actually loaded at. This can only be done
* with a short local call on x86. Nothing else will tell us what * with a short local call on x86. Nothing else will tell us what
@ -2331,9 +2343,10 @@ diff -puN arch/i386/boot/compressed/head.S~git-newsetup arch/i386/boot/compresse
call 1f call 1f
1: popl %ebp 1: popl %ebp
subl $1b, %ebp subl $1b, %ebp
diff -puN arch/i386/boot/compressed/misc.c~git-newsetup arch/i386/boot/compressed/misc.c Index: linux-2.6.22.19/arch/i386/boot/compressed/misc.c
--- a/arch/i386/boot/compressed/misc.c~git-newsetup ===================================================================
+++ a/arch/i386/boot/compressed/misc.c --- linux-2.6.22.19.orig/arch/i386/boot/compressed/misc.c
+++ linux-2.6.22.19/arch/i386/boot/compressed/misc.c
@@ -11,7 +11,6 @@ @@ -11,7 +11,6 @@
#undef CONFIG_PARAVIRT #undef CONFIG_PARAVIRT
@ -2353,9 +2366,10 @@ diff -puN arch/i386/boot/compressed/misc.c~git-newsetup arch/i386/boot/compresse
#ifndef CONFIG_RELOCATABLE #ifndef CONFIG_RELOCATABLE
if ((u32)output != LOAD_PHYSICAL_ADDR) if ((u32)output != LOAD_PHYSICAL_ADDR)
error("Wrong destination address"); error("Wrong destination address");
diff -puN /dev/null arch/i386/boot/copy.S Index: linux-2.6.22.19/arch/i386/boot/copy.S
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/copy.S +++ linux-2.6.22.19/arch/i386/boot/copy.S
@@ -0,0 +1,101 @@ @@ -0,0 +1,101 @@
+/* ----------------------------------------------------------------------- * +/* ----------------------------------------------------------------------- *
+ * + *
@ -2458,9 +2472,10 @@ diff -puN /dev/null arch/i386/boot/copy.S
+ .size copy_to_gs, .-copy_to_gs + .size copy_to_gs, .-copy_to_gs
+ +
+#endif +#endif
diff -puN /dev/null arch/i386/boot/cpu.c Index: linux-2.6.22.19/arch/i386/boot/cpu.c
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/cpu.c +++ linux-2.6.22.19/arch/i386/boot/cpu.c
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
+/* -*- linux-c -*- ------------------------------------------------------- * +/* -*- linux-c -*- ------------------------------------------------------- *
+ * + *
@ -2531,9 +2546,10 @@ diff -puN /dev/null arch/i386/boot/cpu.c
+ return 0; + return 0;
+ } + }
+} +}
diff -puN /dev/null arch/i386/boot/cpucheck.c Index: linux-2.6.22.19/arch/i386/boot/cpucheck.c
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/cpucheck.c +++ linux-2.6.22.19/arch/i386/boot/cpucheck.c
@@ -0,0 +1,266 @@ @@ -0,0 +1,266 @@
+/* -*- linux-c -*- ------------------------------------------------------- * +/* -*- linux-c -*- ------------------------------------------------------- *
+ * + *
@ -2801,8 +2817,9 @@ diff -puN /dev/null arch/i386/boot/cpucheck.c
+ +
+ return (cpu.level < req_level || err) ? -1 : 0; + return (cpu.level < req_level || err) ? -1 : 0;
+} +}
diff -puN arch/i386/boot/edd.S~git-newsetup /dev/null Index: linux-2.6.22.19/arch/i386/boot/edd.S
--- a/arch/i386/boot/edd.S ===================================================================
--- linux-2.6.22.19.orig/arch/i386/boot/edd.S
+++ /dev/null +++ /dev/null
@@ -1,231 +0,0 @@ @@ -1,231 +0,0 @@
-/* -/*
@ -3036,9 +3053,10 @@ diff -puN arch/i386/boot/edd.S~git-newsetup /dev/null
- -
-edd_done: -edd_done:
-#endif -#endif
diff -puN /dev/null arch/i386/boot/edd.c Index: linux-2.6.22.19/arch/i386/boot/edd.c
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/edd.c +++ linux-2.6.22.19/arch/i386/boot/edd.c
@@ -0,0 +1,196 @@ @@ -0,0 +1,196 @@
+/* -*- linux-c -*- ------------------------------------------------------- * +/* -*- linux-c -*- ------------------------------------------------------- *
+ * + *
@ -3236,9 +3254,10 @@ diff -puN /dev/null arch/i386/boot/edd.c
+} +}
+ +
+#endif +#endif
diff -puN /dev/null arch/i386/boot/header.S Index: linux-2.6.22.19/arch/i386/boot/header.S
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/header.S +++ linux-2.6.22.19/arch/i386/boot/header.S
@@ -0,0 +1,283 @@ @@ -0,0 +1,283 @@
+/* +/*
+ * header.S + * header.S
@ -3523,9 +3542,10 @@ diff -puN /dev/null arch/i386/boot/header.S
+setup_corrupt: +setup_corrupt:
+ .byte 7 + .byte 7
+ .string "No setup signature found..." + .string "No setup signature found..."
diff -puN /dev/null arch/i386/boot/main.c Index: linux-2.6.22.19/arch/i386/boot/main.c
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/main.c +++ linux-2.6.22.19/arch/i386/boot/main.c
@@ -0,0 +1,161 @@ @@ -0,0 +1,161 @@
+/* -*- linux-c -*- ------------------------------------------------------- * +/* -*- linux-c -*- ------------------------------------------------------- *
+ * + *
@ -3688,9 +3708,10 @@ diff -puN /dev/null arch/i386/boot/main.c
+ /* Do the last things and invoke protected mode */ + /* Do the last things and invoke protected mode */
+ go_to_protected_mode(); + go_to_protected_mode();
+} +}
diff -puN /dev/null arch/i386/boot/mca.c Index: linux-2.6.22.19/arch/i386/boot/mca.c
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/mca.c +++ linux-2.6.22.19/arch/i386/boot/mca.c
@@ -0,0 +1,43 @@ @@ -0,0 +1,43 @@
+/* -*- linux-c -*- ------------------------------------------------------- * +/* -*- linux-c -*- ------------------------------------------------------- *
+ * + *
@ -3735,9 +3756,10 @@ diff -puN /dev/null arch/i386/boot/mca.c
+ copy_from_fs(&boot_params.sys_desc_table, bx, len); + copy_from_fs(&boot_params.sys_desc_table, bx, len);
+ return 0; + return 0;
+} +}
diff -puN /dev/null arch/i386/boot/memory.c Index: linux-2.6.22.19/arch/i386/boot/memory.c
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/memory.c +++ linux-2.6.22.19/arch/i386/boot/memory.c
@@ -0,0 +1,99 @@ @@ -0,0 +1,99 @@
+/* -*- linux-c -*- ------------------------------------------------------- * +/* -*- linux-c -*- ------------------------------------------------------- *
+ * + *
@ -3838,9 +3860,10 @@ diff -puN /dev/null arch/i386/boot/memory.c
+ +
+ return detect_memory_88(); + return detect_memory_88();
+} +}
diff -puN /dev/null arch/i386/boot/pm.c Index: linux-2.6.22.19/arch/i386/boot/pm.c
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/pm.c +++ linux-2.6.22.19/arch/i386/boot/pm.c
@@ -0,0 +1,170 @@ @@ -0,0 +1,170 @@
+/* -*- linux-c -*- ------------------------------------------------------- * +/* -*- linux-c -*- ------------------------------------------------------- *
+ * + *
@ -4012,9 +4035,10 @@ diff -puN /dev/null arch/i386/boot/pm.c
+ protected_mode_jump(boot_params.hdr.code32_start, + protected_mode_jump(boot_params.hdr.code32_start,
+ (u32)&boot_params + (ds() << 4)); + (u32)&boot_params + (ds() << 4));
+} +}
diff -puN /dev/null arch/i386/boot/pmjump.S Index: linux-2.6.22.19/arch/i386/boot/pmjump.S
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/pmjump.S +++ linux-2.6.22.19/arch/i386/boot/pmjump.S
@@ -0,0 +1,54 @@ @@ -0,0 +1,54 @@
+/* ----------------------------------------------------------------------- * +/* ----------------------------------------------------------------------- *
+ * + *
@ -4070,9 +4094,10 @@ diff -puN /dev/null arch/i386/boot/pmjump.S
+ .word __BOOT_CS # segment + .word __BOOT_CS # segment
+ +
+ .size protected_mode_jump, .-protected_mode_jump + .size protected_mode_jump, .-protected_mode_jump
diff -puN /dev/null arch/i386/boot/printf.c Index: linux-2.6.22.19/arch/i386/boot/printf.c
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/printf.c +++ linux-2.6.22.19/arch/i386/boot/printf.c
@@ -0,0 +1,331 @@ @@ -0,0 +1,331 @@
+/* -*- linux-c -*- ------------------------------------------------------- * +/* -*- linux-c -*- ------------------------------------------------------- *
+ * + *
@ -4405,8 +4430,9 @@ diff -puN /dev/null arch/i386/boot/printf.c
+ +
+ return printed; + return printed;
+} +}
diff -puN arch/i386/boot/setup.S~git-newsetup /dev/null Index: linux-2.6.22.19/arch/i386/boot/setup.S
--- a/arch/i386/boot/setup.S ===================================================================
--- linux-2.6.22.19.orig/arch/i386/boot/setup.S
+++ /dev/null +++ /dev/null
@@ -1,1075 +0,0 @@ @@ -1,1075 +0,0 @@
-/* -/*
@ -5484,9 +5510,10 @@ diff -puN arch/i386/boot/setup.S~git-newsetup /dev/null
-enddata: -enddata:
-.bss -.bss
-endbss: -endbss:
diff -puN /dev/null arch/i386/boot/setup.ld Index: linux-2.6.22.19/arch/i386/boot/setup.ld
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/setup.ld +++ linux-2.6.22.19/arch/i386/boot/setup.ld
@@ -0,0 +1,54 @@ @@ -0,0 +1,54 @@
+/* +/*
+ * setup.ld + * setup.ld
@ -5542,9 +5569,10 @@ diff -puN /dev/null arch/i386/boot/setup.ld
+ . = ASSERT(_end <= 0x8000, "Setup too big!"); + . = ASSERT(_end <= 0x8000, "Setup too big!");
+ . = ASSERT(hdr == 0x1f1, "The setup header has the wrong offset!"); + . = ASSERT(hdr == 0x1f1, "The setup header has the wrong offset!");
+} +}
diff -puN /dev/null arch/i386/boot/string.c Index: linux-2.6.22.19/arch/i386/boot/string.c
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/string.c +++ linux-2.6.22.19/arch/i386/boot/string.c
@@ -0,0 +1,34 @@ @@ -0,0 +1,34 @@
+/* -*- linux-c -*- ------------------------------------------------------- * +/* -*- linux-c -*- ------------------------------------------------------- *
+ * + *
@ -5580,9 +5608,10 @@ diff -puN /dev/null arch/i386/boot/string.c
+ } + }
+ return 0; + return 0;
+} +}
diff -puN arch/i386/boot/tools/build.c~git-newsetup arch/i386/boot/tools/build.c Index: linux-2.6.22.19/arch/i386/boot/tools/build.c
--- a/arch/i386/boot/tools/build.c~git-newsetup ===================================================================
+++ a/arch/i386/boot/tools/build.c --- linux-2.6.22.19.orig/arch/i386/boot/tools/build.c
+++ linux-2.6.22.19/arch/i386/boot/tools/build.c
@@ -1,13 +1,12 @@ @@ -1,13 +1,12 @@
/* /*
* Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 1991, 1992 Linus Torvalds
@ -5821,9 +5850,10 @@ diff -puN arch/i386/boot/tools/build.c~git-newsetup arch/i386/boot/tools/build.c
+ /* Everything is OK */ + /* Everything is OK */
+ return 0; + return 0;
} }
diff -puN /dev/null arch/i386/boot/tty.c Index: linux-2.6.22.19/arch/i386/boot/tty.c
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/tty.c +++ linux-2.6.22.19/arch/i386/boot/tty.c
@@ -0,0 +1,112 @@ @@ -0,0 +1,112 @@
+/* -*- linux-c -*- ------------------------------------------------------- * +/* -*- linux-c -*- ------------------------------------------------------- *
+ * + *
@ -5937,9 +5967,10 @@ diff -puN /dev/null arch/i386/boot/tty.c
+ +
+ return 0; /* Timeout! */ + return 0; /* Timeout! */
+} +}
diff -puN /dev/null arch/i386/boot/version.c Index: linux-2.6.22.19/arch/i386/boot/version.c
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/version.c +++ linux-2.6.22.19/arch/i386/boot/version.c
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
+/* -*- linux-c -*- ------------------------------------------------------- * +/* -*- linux-c -*- ------------------------------------------------------- *
+ * + *
@ -5964,9 +5995,10 @@ diff -puN /dev/null arch/i386/boot/version.c
+const char kernel_version[] = +const char kernel_version[] =
+ UTS_RELEASE " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ") " + UTS_RELEASE " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ") "
+ UTS_VERSION; + UTS_VERSION;
diff -puN /dev/null arch/i386/boot/vesa.h Index: linux-2.6.22.19/arch/i386/boot/vesa.h
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/vesa.h +++ linux-2.6.22.19/arch/i386/boot/vesa.h
@@ -0,0 +1,79 @@ @@ -0,0 +1,79 @@
+/* ----------------------------------------------------------------------- * +/* ----------------------------------------------------------------------- *
+ * + *
@ -6047,9 +6079,10 @@ diff -puN /dev/null arch/i386/boot/vesa.h
+} __attribute__((packed)); +} __attribute__((packed));
+ +
+#endif /* LIB_SYS_VESA_H */ +#endif /* LIB_SYS_VESA_H */
diff -puN /dev/null arch/i386/boot/video-bios.c Index: linux-2.6.22.19/arch/i386/boot/video-bios.c
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/video-bios.c +++ linux-2.6.22.19/arch/i386/boot/video-bios.c
@@ -0,0 +1,125 @@ @@ -0,0 +1,125 @@
+/* -*- linux-c -*- ------------------------------------------------------- * +/* -*- linux-c -*- ------------------------------------------------------- *
+ * + *
@ -6176,9 +6209,10 @@ diff -puN /dev/null arch/i386/boot/video-bios.c
+ .xmode_first = VIDEO_FIRST_BIOS, + .xmode_first = VIDEO_FIRST_BIOS,
+ .xmode_n = 0x80, + .xmode_n = 0x80,
+}; +};
diff -puN /dev/null arch/i386/boot/video-vesa.c Index: linux-2.6.22.19/arch/i386/boot/video-vesa.c
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/video-vesa.c +++ linux-2.6.22.19/arch/i386/boot/video-vesa.c
@@ -0,0 +1,283 @@ @@ -0,0 +1,283 @@
+/* -*- linux-c -*- ------------------------------------------------------- * +/* -*- linux-c -*- ------------------------------------------------------- *
+ * + *
@ -6463,9 +6497,10 @@ diff -puN /dev/null arch/i386/boot/video-vesa.c
+ .xmode_first = VIDEO_FIRST_VESA, + .xmode_first = VIDEO_FIRST_VESA,
+ .xmode_n = 0x200, + .xmode_n = 0x200,
+}; +};
diff -puN /dev/null arch/i386/boot/video-vga.c Index: linux-2.6.22.19/arch/i386/boot/video-vga.c
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/video-vga.c +++ linux-2.6.22.19/arch/i386/boot/video-vga.c
@@ -0,0 +1,260 @@ @@ -0,0 +1,260 @@
+/* -*- linux-c -*- ------------------------------------------------------- * +/* -*- linux-c -*- ------------------------------------------------------- *
+ * + *
@ -6727,8 +6762,9 @@ diff -puN /dev/null arch/i386/boot/video-vga.c
+ .probe = vga_probe, + .probe = vga_probe,
+ .set_mode = vga_set_mode, + .set_mode = vga_set_mode,
+}; +};
diff -puN arch/i386/boot/video.S~git-newsetup /dev/null Index: linux-2.6.22.19/arch/i386/boot/video.S
--- a/arch/i386/boot/video.S ===================================================================
--- linux-2.6.22.19.orig/arch/i386/boot/video.S
+++ /dev/null +++ /dev/null
@@ -1,2043 +0,0 @@ @@ -1,2043 +0,0 @@
-/* video.S -/* video.S
@ -8774,9 +8810,10 @@ diff -puN arch/i386/boot/video.S~git-newsetup /dev/null
-adapter: .byte 0 # Video adapter: 0=CGA/MDA/HGA,1=EGA,2=VGA -adapter: .byte 0 # Video adapter: 0=CGA/MDA/HGA,1=EGA,2=VGA
-video_segment: .word 0xb800 # Video memory segment -video_segment: .word 0xb800 # Video memory segment
-force_size: .word 0 # Use this size instead of the one in BIOS vars -force_size: .word 0 # Use this size instead of the one in BIOS vars
diff -puN /dev/null arch/i386/boot/video.c Index: linux-2.6.22.19/arch/i386/boot/video.c
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/video.c +++ linux-2.6.22.19/arch/i386/boot/video.c
@@ -0,0 +1,456 @@ @@ -0,0 +1,456 @@
+/* -*- linux-c -*- ------------------------------------------------------- * +/* -*- linux-c -*- ------------------------------------------------------- *
+ * + *
@ -9234,9 +9271,10 @@ diff -puN /dev/null arch/i386/boot/video.c
+ if (do_restore) + if (do_restore)
+ restore_screen(); + restore_screen();
+} +}
diff -puN /dev/null arch/i386/boot/video.h Index: linux-2.6.22.19/arch/i386/boot/video.h
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/video.h +++ linux-2.6.22.19/arch/i386/boot/video.h
@@ -0,0 +1,145 @@ @@ -0,0 +1,145 @@
+/* -*- linux-c -*- ------------------------------------------------------- * +/* -*- linux-c -*- ------------------------------------------------------- *
+ * + *
@ -9383,9 +9421,10 @@ diff -puN /dev/null arch/i386/boot/video.h
+u16 vga_crtc(void); /* video-vga.c */ +u16 vga_crtc(void); /* video-vga.c */
+ +
+#endif /* BOOT_VIDEO_H */ +#endif /* BOOT_VIDEO_H */
diff -puN /dev/null arch/i386/boot/voyager.c Index: linux-2.6.22.19/arch/i386/boot/voyager.c
===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/boot/voyager.c +++ linux-2.6.22.19/arch/i386/boot/voyager.c
@@ -0,0 +1,46 @@ @@ -0,0 +1,46 @@
+/* -*- linux-c -*- ------------------------------------------------------- * +/* -*- linux-c -*- ------------------------------------------------------- *
+ * + *
@ -9433,10 +9472,10 @@ diff -puN /dev/null arch/i386/boot/voyager.c
+} +}
+ +
+#endif /* CONFIG_X86_VOYAGER */ +#endif /* CONFIG_X86_VOYAGER */
diff -puN arch/i386/kernel/cpu/Makefile~git-newsetup arch/i386/kernel/cpu/Makefile Index: linux-2.6.22.19/arch/i386/kernel/cpu/addon_cpuid_features.c
diff -puN /dev/null arch/i386/kernel/cpu/addon_cpuid_features.c ===================================================================
--- /dev/null --- /dev/null
+++ a/arch/i386/kernel/cpu/addon_cpuid_features.c +++ linux-2.6.22.19/arch/i386/kernel/cpu/addon_cpuid_features.c
@@ -0,0 +1,50 @@ @@ -0,0 +1,50 @@
+ +
+/* +/*
@ -9488,9 +9527,10 @@ diff -puN /dev/null arch/i386/kernel/cpu/addon_cpuid_features.c
+ set_bit(cb->feature, c->x86_capability); + set_bit(cb->feature, c->x86_capability);
+ } + }
+} +}
diff -puN arch/i386/kernel/cpu/common.c~git-newsetup arch/i386/kernel/cpu/common.c Index: linux-2.6.22.19/arch/i386/kernel/cpu/common.c
--- a/arch/i386/kernel/cpu/common.c~git-newsetup ===================================================================
+++ a/arch/i386/kernel/cpu/common.c --- linux-2.6.22.19.orig/arch/i386/kernel/cpu/common.c
+++ linux-2.6.22.19/arch/i386/kernel/cpu/common.c
@@ -353,6 +353,8 @@ static void __cpuinit generic_identify(s @@ -353,6 +353,8 @@ static void __cpuinit generic_identify(s
if ( xlvl >= 0x80000004 ) if ( xlvl >= 0x80000004 )
get_model_name(c); /* Default name */ get_model_name(c); /* Default name */
@ -9500,9 +9540,10 @@ diff -puN arch/i386/kernel/cpu/common.c~git-newsetup arch/i386/kernel/cpu/common
} }
early_intel_workaround(c); early_intel_workaround(c);
diff -puN arch/i386/kernel/cpu/proc.c~git-newsetup arch/i386/kernel/cpu/proc.c Index: linux-2.6.22.19/arch/i386/kernel/cpu/proc.c
--- a/arch/i386/kernel/cpu/proc.c~git-newsetup ===================================================================
+++ a/arch/i386/kernel/cpu/proc.c --- linux-2.6.22.19.orig/arch/i386/kernel/cpu/proc.c
+++ linux-2.6.22.19/arch/i386/kernel/cpu/proc.c
@@ -29,7 +29,8 @@ static int show_cpuinfo(struct seq_file @@ -29,7 +29,8 @@ static int show_cpuinfo(struct seq_file
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL, NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,
@ -9545,10 +9586,11 @@ diff -puN arch/i386/kernel/cpu/proc.c~git-newsetup arch/i386/kernel/cpu/proc.c
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
}; };
diff -puN arch/i386/kernel/e820.c~git-newsetup arch/i386/kernel/e820.c Index: linux-2.6.22.19/arch/i386/kernel/e820.c
--- a/arch/i386/kernel/e820.c~git-newsetup ===================================================================
+++ a/arch/i386/kernel/e820.c --- linux-2.6.22.19.orig/arch/i386/kernel/e820.c
@@ -766,7 +766,7 @@ void __init print_memory_map(char *who) +++ linux-2.6.22.19/arch/i386/kernel/e820.c
@@ -734,7 +734,7 @@ void __init print_memory_map(char *who)
case E820_NVS: case E820_NVS:
printk("(ACPI NVS)\n"); printk("(ACPI NVS)\n");
break; break;
@ -9557,9 +9599,10 @@ diff -puN arch/i386/kernel/e820.c~git-newsetup arch/i386/kernel/e820.c
break; break;
} }
} }
diff -puN arch/i386/kernel/setup.c~git-newsetup arch/i386/kernel/setup.c Index: linux-2.6.22.19/arch/i386/kernel/setup.c
--- a/arch/i386/kernel/setup.c~git-newsetup ===================================================================
+++ a/arch/i386/kernel/setup.c --- linux-2.6.22.19.orig/arch/i386/kernel/setup.c
+++ linux-2.6.22.19/arch/i386/kernel/setup.c
@@ -102,19 +102,10 @@ static unsigned int highmem_pages = -1; @@ -102,19 +102,10 @@ static unsigned int highmem_pages = -1;
/* /*
* Setup options * Setup options
@ -9597,8 +9640,9 @@ diff -puN arch/i386/kernel/setup.c~git-newsetup arch/i386/kernel/setup.c
screen_info = SCREEN_INFO; screen_info = SCREEN_INFO;
edid_info = EDID_INFO; edid_info = EDID_INFO;
apm_info.bios = APM_BIOS_INFO; apm_info.bios = APM_BIOS_INFO;
diff -puN arch/i386/kernel/verify_cpu.S~git-newsetup /dev/null Index: linux-2.6.22.19/arch/i386/kernel/verify_cpu.S
--- a/arch/i386/kernel/verify_cpu.S ===================================================================
--- linux-2.6.22.19.orig/arch/i386/kernel/verify_cpu.S
+++ /dev/null +++ /dev/null
@@ -1,94 +0,0 @@ @@ -1,94 +0,0 @@
-/* Check if CPU has some minimum CPUID bits -/* Check if CPU has some minimum CPUID bits
@ -9695,10 +9739,11 @@ diff -puN arch/i386/kernel/verify_cpu.S~git-newsetup /dev/null
- popfl - popfl
- movl $1,%eax - movl $1,%eax
- ret - ret
diff -puN arch/x86_64/Kconfig~git-newsetup arch/x86_64/Kconfig Index: linux-2.6.22.19/arch/x86_64/Kconfig
--- a/arch/x86_64/Kconfig~git-newsetup ===================================================================
+++ a/arch/x86_64/Kconfig --- linux-2.6.22.19.orig/arch/x86_64/Kconfig
@@ -453,6 +453,10 @@ config NR_CPUS +++ linux-2.6.22.19/arch/x86_64/Kconfig
@@ -427,6 +427,10 @@ config NR_CPUS
This is purely to save memory - each supported CPU requires This is purely to save memory - each supported CPU requires
memory in the static kernel configuration. memory in the static kernel configuration.
@ -9709,9 +9754,10 @@ diff -puN arch/x86_64/Kconfig~git-newsetup arch/x86_64/Kconfig
config HOTPLUG_CPU config HOTPLUG_CPU
bool "Support for suspend on SMP and hot-pluggable CPUs (EXPERIMENTAL)" bool "Support for suspend on SMP and hot-pluggable CPUs (EXPERIMENTAL)"
depends on SMP && HOTPLUG && EXPERIMENTAL depends on SMP && HOTPLUG && EXPERIMENTAL
diff -puN arch/x86_64/boot/Makefile~git-newsetup arch/x86_64/boot/Makefile Index: linux-2.6.22.19/arch/x86_64/boot/Makefile
--- a/arch/x86_64/boot/Makefile~git-newsetup ===================================================================
+++ a/arch/x86_64/boot/Makefile --- linux-2.6.22.19.orig/arch/x86_64/boot/Makefile
+++ linux-2.6.22.19/arch/x86_64/boot/Makefile
@@ -1,135 +1,9 @@ @@ -1,135 +1,9 @@
# #
# arch/x86_64/boot/Makefile # arch/x86_64/boot/Makefile
@ -9853,8 +9899,9 @@ diff -puN arch/x86_64/boot/Makefile~git-newsetup arch/x86_64/boot/Makefile
- sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)" - sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)"
+src := arch/i386/boot +src := arch/i386/boot
+include $(src)/Makefile +include $(src)/Makefile
diff -puN arch/x86_64/boot/bootsect.S~git-newsetup /dev/null Index: linux-2.6.22.19/arch/x86_64/boot/bootsect.S
--- a/arch/x86_64/boot/bootsect.S ===================================================================
--- linux-2.6.22.19.orig/arch/x86_64/boot/bootsect.S
+++ /dev/null +++ /dev/null
@@ -1,98 +0,0 @@ @@ -1,98 +0,0 @@
-/* -/*
@ -9955,9 +10002,10 @@ diff -puN arch/x86_64/boot/bootsect.S~git-newsetup /dev/null
-vid_mode: .word SVGA_MODE -vid_mode: .word SVGA_MODE
-root_dev: .word ROOT_DEV -root_dev: .word ROOT_DEV
-boot_flag: .word 0xAA55 -boot_flag: .word 0xAA55
diff -puN arch/x86_64/boot/compressed/Makefile~git-newsetup arch/x86_64/boot/compressed/Makefile Index: linux-2.6.22.19/arch/x86_64/boot/compressed/Makefile
--- a/arch/x86_64/boot/compressed/Makefile~git-newsetup ===================================================================
+++ a/arch/x86_64/boot/compressed/Makefile --- linux-2.6.22.19.orig/arch/x86_64/boot/compressed/Makefile
+++ linux-2.6.22.19/arch/x86_64/boot/compressed/Makefile
@@ -7,11 +7,12 @@ @@ -7,11 +7,12 @@
# #
@ -9975,9 +10023,10 @@ diff -puN arch/x86_64/boot/compressed/Makefile~git-newsetup arch/x86_64/boot/com
LDFLAGS := -m elf_x86_64 LDFLAGS := -m elf_x86_64
LDFLAGS_vmlinux := -T LDFLAGS_vmlinux := -T
diff -puN arch/x86_64/boot/compressed/head.S~git-newsetup arch/x86_64/boot/compressed/head.S Index: linux-2.6.22.19/arch/x86_64/boot/compressed/head.S
--- a/arch/x86_64/boot/compressed/head.S~git-newsetup ===================================================================
+++ a/arch/x86_64/boot/compressed/head.S --- linux-2.6.22.19.orig/arch/x86_64/boot/compressed/head.S
+++ linux-2.6.22.19/arch/x86_64/boot/compressed/head.S
@@ -46,10 +46,10 @@ startup_32: @@ -46,10 +46,10 @@ startup_32:
* at and where we were actually loaded at. This can only be done * at and where we were actually loaded at. This can only be done
* with a short local call on x86. Nothing else will tell us what * with a short local call on x86. Nothing else will tell us what
@ -9992,14 +10041,16 @@ diff -puN arch/x86_64/boot/compressed/head.S~git-newsetup arch/x86_64/boot/compr
call 1f call 1f
1: popl %ebp 1: popl %ebp
subl $1b, %ebp subl $1b, %ebp
diff -puN arch/x86_64/boot/install.sh~git-newsetup /dev/null Index: linux-2.6.22.19/arch/x86_64/boot/install.sh
--- a/arch/x86_64/boot/install.sh ===================================================================
--- linux-2.6.22.19.orig/arch/x86_64/boot/install.sh
+++ /dev/null +++ /dev/null
@@ -1,2 +0,0 @@ @@ -1,2 +0,0 @@
-#!/bin/sh -#!/bin/sh
-. $srctree/arch/i386/boot/install.sh -. $srctree/arch/i386/boot/install.sh
diff -puN arch/x86_64/boot/mtools.conf.in~git-newsetup /dev/null Index: linux-2.6.22.19/arch/x86_64/boot/mtools.conf.in
--- a/arch/x86_64/boot/mtools.conf.in ===================================================================
--- linux-2.6.22.19.orig/arch/x86_64/boot/mtools.conf.in
+++ /dev/null +++ /dev/null
@@ -1,17 +0,0 @@ @@ -1,17 +0,0 @@
-# -#
@ -10019,8 +10070,9 @@ diff -puN arch/x86_64/boot/mtools.conf.in~git-newsetup /dev/null
- file="@OBJ@/fdimage" cylinders=80 heads=2 sectors=36 filter - file="@OBJ@/fdimage" cylinders=80 heads=2 sectors=36 filter
- -
- -
diff -puN arch/x86_64/boot/setup.S~git-newsetup /dev/null Index: linux-2.6.22.19/arch/x86_64/boot/setup.S
--- a/arch/x86_64/boot/setup.S ===================================================================
--- linux-2.6.22.19.orig/arch/x86_64/boot/setup.S
+++ /dev/null +++ /dev/null
@@ -1,826 +0,0 @@ @@ -1,826 +0,0 @@
-/* -/*
@ -10849,8 +10901,9 @@ diff -puN arch/x86_64/boot/setup.S~git-newsetup /dev/null
-enddata: -enddata:
-.bss -.bss
-endbss: -endbss:
diff -puN arch/x86_64/boot/tools/build.c~git-newsetup /dev/null Index: linux-2.6.22.19/arch/x86_64/boot/tools/build.c
--- a/arch/x86_64/boot/tools/build.c ===================================================================
--- linux-2.6.22.19.orig/arch/x86_64/boot/tools/build.c
+++ /dev/null +++ /dev/null
@@ -1,185 +0,0 @@ @@ -1,185 +0,0 @@
-/* -/*
@ -11038,10 +11091,11 @@ diff -puN arch/x86_64/boot/tools/build.c~git-newsetup /dev/null
- -
- return 0; /* Everything is OK */ - return 0; /* Everything is OK */
-} -}
diff -puN arch/x86_64/kernel/Makefile~git-newsetup arch/x86_64/kernel/Makefile Index: linux-2.6.22.19/arch/x86_64/kernel/Makefile
--- a/arch/x86_64/kernel/Makefile~git-newsetup ===================================================================
+++ a/arch/x86_64/kernel/Makefile --- linux-2.6.22.19.orig/arch/x86_64/kernel/Makefile
@@ -45,6 +45,7 @@ obj-$(CONFIG_PCI) += early-quirks.o +++ linux-2.6.22.19/arch/x86_64/kernel/Makefile
@@ -43,6 +43,7 @@ obj-$(CONFIG_PCI) += early-quirks.o
obj-y += topology.o obj-y += topology.o
obj-y += intel_cacheinfo.o obj-y += intel_cacheinfo.o
@ -11049,7 +11103,7 @@ diff -puN arch/x86_64/kernel/Makefile~git-newsetup arch/x86_64/kernel/Makefile
obj-y += pcspeaker.o obj-y += pcspeaker.o
CFLAGS_vsyscall.o := $(PROFILING) -g0 CFLAGS_vsyscall.o := $(PROFILING) -g0
@@ -58,6 +59,7 @@ cpuid-$(subst m,y,$(CONFIG_X86_CPUID)) @@ -53,6 +54,7 @@ cpuid-$(subst m,y,$(CONFIG_X86_CPUID))
topology-y += ../../i386/kernel/topology.o topology-y += ../../i386/kernel/topology.o
microcode-$(subst m,y,$(CONFIG_MICROCODE)) += ../../i386/kernel/microcode.o microcode-$(subst m,y,$(CONFIG_MICROCODE)) += ../../i386/kernel/microcode.o
intel_cacheinfo-y += ../../i386/kernel/cpu/intel_cacheinfo.o intel_cacheinfo-y += ../../i386/kernel/cpu/intel_cacheinfo.o
@ -11057,10 +11111,11 @@ diff -puN arch/x86_64/kernel/Makefile~git-newsetup arch/x86_64/kernel/Makefile
quirks-y += ../../i386/kernel/quirks.o quirks-y += ../../i386/kernel/quirks.o
i8237-y += ../../i386/kernel/i8237.o i8237-y += ../../i386/kernel/i8237.o
msr-$(subst m,y,$(CONFIG_X86_MSR)) += ../../i386/kernel/msr.o msr-$(subst m,y,$(CONFIG_X86_MSR)) += ../../i386/kernel/msr.o
diff -puN arch/x86_64/kernel/setup.c~git-newsetup arch/x86_64/kernel/setup.c Index: linux-2.6.22.19/arch/x86_64/kernel/setup.c
--- a/arch/x86_64/kernel/setup.c~git-newsetup ===================================================================
+++ a/arch/x86_64/kernel/setup.c --- linux-2.6.22.19.orig/arch/x86_64/kernel/setup.c
@@ -855,6 +855,8 @@ void __cpuinit identify_cpu(struct cpuin +++ linux-2.6.22.19/arch/x86_64/kernel/setup.c
@@ -846,6 +846,8 @@ void __cpuinit identify_cpu(struct cpuin
c->x86_capability[2] = cpuid_edx(0x80860001); c->x86_capability[2] = cpuid_edx(0x80860001);
} }
@ -11069,7 +11124,7 @@ diff -puN arch/x86_64/kernel/setup.c~git-newsetup arch/x86_64/kernel/setup.c
c->apicid = phys_pkg_id(0); c->apicid = phys_pkg_id(0);
/* /*
@@ -940,7 +942,7 @@ static int show_cpuinfo(struct seq_file @@ -931,7 +933,7 @@ static int show_cpuinfo(struct seq_file
"fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",
"cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov", "cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov",
"pat", "pse36", "pn", "clflush", NULL, "dts", "acpi", "mmx", "pat", "pse36", "pn", "clflush", NULL, "dts", "acpi", "mmx",
@ -11078,7 +11133,7 @@ diff -puN arch/x86_64/kernel/setup.c~git-newsetup arch/x86_64/kernel/setup.c
/* AMD-defined */ /* AMD-defined */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -956,10 +958,11 @@ static int show_cpuinfo(struct seq_file @@ -947,10 +949,11 @@ static int show_cpuinfo(struct seq_file
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* Other (Linux-defined) */ /* Other (Linux-defined) */
@ -11094,7 +11149,7 @@ diff -puN arch/x86_64/kernel/setup.c~git-newsetup arch/x86_64/kernel/setup.c
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* Intel-defined (#2) */ /* Intel-defined (#2) */
@@ -970,7 +973,7 @@ static int show_cpuinfo(struct seq_file @@ -961,7 +964,7 @@ static int show_cpuinfo(struct seq_file
/* VIA/Cyrix/Centaur-defined */ /* VIA/Cyrix/Centaur-defined */
NULL, NULL, "rng", "rng_en", NULL, NULL, "ace", "ace_en", NULL, NULL, "rng", "rng_en", NULL, NULL, "ace", "ace_en",
@ -11103,7 +11158,7 @@ diff -puN arch/x86_64/kernel/setup.c~git-newsetup arch/x86_64/kernel/setup.c
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -981,6 +984,12 @@ static int show_cpuinfo(struct seq_file @@ -972,6 +975,12 @@ static int show_cpuinfo(struct seq_file
"osvw", "ibs", NULL, NULL, NULL, NULL, "osvw", "ibs", NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@ -11116,9 +11171,10 @@ diff -puN arch/x86_64/kernel/setup.c~git-newsetup arch/x86_64/kernel/setup.c
}; };
static char *x86_power_flags[] = { static char *x86_power_flags[] = {
"ts", /* temperature sensor */ "ts", /* temperature sensor */
diff -puN arch/x86_64/kernel/verify_cpu.S~git-newsetup arch/x86_64/kernel/verify_cpu.S Index: linux-2.6.22.19/arch/x86_64/kernel/verify_cpu.S
--- a/arch/x86_64/kernel/verify_cpu.S~git-newsetup ===================================================================
+++ a/arch/x86_64/kernel/verify_cpu.S --- linux-2.6.22.19.orig/arch/x86_64/kernel/verify_cpu.S
+++ linux-2.6.22.19/arch/x86_64/kernel/verify_cpu.S
@@ -37,20 +37,6 @@ verify_cpu: @@ -37,20 +37,6 @@ verify_cpu:
pushl $0 # Kill any dangerous flags pushl $0 # Kill any dangerous flags
popfl popfl
@ -11162,9 +11218,10 @@ diff -puN arch/x86_64/kernel/verify_cpu.S~git-newsetup arch/x86_64/kernel/verify
jnz verify_cpu_no_longmode jnz verify_cpu_no_longmode
verify_cpu_sse_test: verify_cpu_sse_test:
diff -puN drivers/ide/legacy/hd.c~git-newsetup drivers/ide/legacy/hd.c Index: linux-2.6.22.19/drivers/ide/legacy/hd.c
--- a/drivers/ide/legacy/hd.c~git-newsetup ===================================================================
+++ a/drivers/ide/legacy/hd.c --- linux-2.6.22.19.orig/drivers/ide/legacy/hd.c
+++ linux-2.6.22.19/drivers/ide/legacy/hd.c
@@ -718,74 +718,25 @@ static int __init hd_init(void) @@ -718,74 +718,25 @@ static int __init hd_init(void)
device_timer.function = hd_times_out; device_timer.function = hd_times_out;
blk_queue_hardsect_size(hd_queue, 512); blk_queue_hardsect_size(hd_queue, 512);
@ -11252,9 +11309,10 @@ diff -puN drivers/ide/legacy/hd.c~git-newsetup drivers/ide/legacy/hd.c
for (drive=0 ; drive < NR_HD ; drive++) { for (drive=0 ; drive < NR_HD ; drive++) {
struct gendisk *disk = alloc_disk(64); struct gendisk *disk = alloc_disk(64);
diff -puN include/asm-i386/boot.h~git-newsetup include/asm-i386/boot.h Index: linux-2.6.22.19/include/asm-i386/boot.h
--- a/include/asm-i386/boot.h~git-newsetup ===================================================================
+++ a/include/asm-i386/boot.h --- linux-2.6.22.19.orig/include/asm-i386/boot.h
+++ linux-2.6.22.19/include/asm-i386/boot.h
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
-#ifndef _LINUX_BOOT_H -#ifndef _LINUX_BOOT_H
-#define _LINUX_BOOT_H -#define _LINUX_BOOT_H
@ -11269,9 +11327,10 @@ diff -puN include/asm-i386/boot.h~git-newsetup include/asm-i386/boot.h
-#endif /* _LINUX_BOOT_H */ -#endif /* _LINUX_BOOT_H */
+#endif /* _ASM_BOOT_H */ +#endif /* _ASM_BOOT_H */
diff -puN /dev/null include/asm-i386/bootparam.h Index: linux-2.6.22.19/include/asm-i386/bootparam.h
===================================================================
--- /dev/null --- /dev/null
+++ a/include/asm-i386/bootparam.h +++ linux-2.6.22.19/include/asm-i386/bootparam.h
@@ -0,0 +1,85 @@ @@ -0,0 +1,85 @@
+#ifndef _ASM_BOOTPARAM_H +#ifndef _ASM_BOOTPARAM_H
+#define _ASM_BOOTPARAM_H +#define _ASM_BOOTPARAM_H
@ -11358,9 +11417,10 @@ diff -puN /dev/null include/asm-i386/bootparam.h
+} __attribute__((packed)); +} __attribute__((packed));
+ +
+#endif /* _ASM_BOOTPARAM_H */ +#endif /* _ASM_BOOTPARAM_H */
diff -puN include/asm-i386/cpufeature.h~git-newsetup include/asm-i386/cpufeature.h Index: linux-2.6.22.19/include/asm-i386/cpufeature.h
--- a/include/asm-i386/cpufeature.h~git-newsetup ===================================================================
+++ a/include/asm-i386/cpufeature.h --- linux-2.6.22.19.orig/include/asm-i386/cpufeature.h
+++ linux-2.6.22.19/include/asm-i386/cpufeature.h
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
#endif #endif
#include <asm/required-features.h> #include <asm/required-features.h>
@ -11372,7 +11432,7 @@ diff -puN include/asm-i386/cpufeature.h~git-newsetup include/asm-i386/cpufeature
#define X86_FEATURE_FPU (0*32+ 0) /* Onboard FPU */ #define X86_FEATURE_FPU (0*32+ 0) /* Onboard FPU */
@@ -81,6 +81,7 @@ @@ -81,6 +81,7 @@
#define X86_FEATURE_BTS (3*32+13) /* Branch Trace Store */ #define X86_FEATURE_BTS (3*32+13) /* Branch Trace Store */
#define X86_FEATURE_LAPIC_TIMER_BROKEN (3*32+ 14) /* lapic timer broken in C1 */ /* 14 free */
#define X86_FEATURE_SYNC_RDTSC (3*32+15) /* RDTSC synchronizes the CPU */ #define X86_FEATURE_SYNC_RDTSC (3*32+15) /* RDTSC synchronizes the CPU */
+#define X86_FEATURE_REP_GOOD (3*32+16) /* rep microcode works well on this CPU */ +#define X86_FEATURE_REP_GOOD (3*32+16) /* rep microcode works well on this CPU */
@ -11408,9 +11468,10 @@ diff -puN include/asm-i386/cpufeature.h~git-newsetup include/asm-i386/cpufeature
#define boot_cpu_has(bit) cpu_has(&boot_cpu_data, bit) #define boot_cpu_has(bit) cpu_has(&boot_cpu_data, bit)
#define cpu_has_fpu boot_cpu_has(X86_FEATURE_FPU) #define cpu_has_fpu boot_cpu_has(X86_FEATURE_FPU)
diff -puN include/asm-i386/e820.h~git-newsetup include/asm-i386/e820.h Index: linux-2.6.22.19/include/asm-i386/e820.h
--- a/include/asm-i386/e820.h~git-newsetup ===================================================================
+++ a/include/asm-i386/e820.h --- linux-2.6.22.19.orig/include/asm-i386/e820.h
+++ linux-2.6.22.19/include/asm-i386/e820.h
@@ -25,13 +25,15 @@ @@ -25,13 +25,15 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
@ -11433,10 +11494,11 @@ diff -puN include/asm-i386/e820.h~git-newsetup include/asm-i386/e820.h
}; };
extern struct e820map e820; extern struct e820map e820;
diff -puN include/asm-i386/processor.h~git-newsetup include/asm-i386/processor.h Index: linux-2.6.22.19/include/asm-i386/processor.h
--- a/include/asm-i386/processor.h~git-newsetup ===================================================================
+++ a/include/asm-i386/processor.h --- linux-2.6.22.19.orig/include/asm-i386/processor.h
@@ -118,6 +118,7 @@ void __init cpu_detect(struct cpuinfo_x8 +++ linux-2.6.22.19/include/asm-i386/processor.h
@@ -119,6 +119,7 @@ void __init cpu_detect(struct cpuinfo_x8
extern void identify_boot_cpu(void); extern void identify_boot_cpu(void);
extern void identify_secondary_cpu(struct cpuinfo_x86 *); extern void identify_secondary_cpu(struct cpuinfo_x86 *);
extern void print_cpu_info(struct cpuinfo_x86 *); extern void print_cpu_info(struct cpuinfo_x86 *);
@ -11444,9 +11506,10 @@ diff -puN include/asm-i386/processor.h~git-newsetup include/asm-i386/processor.h
extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c); extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c);
extern unsigned short num_cache_leaves; extern unsigned short num_cache_leaves;
diff -puN include/asm-i386/required-features.h~git-newsetup include/asm-i386/required-features.h Index: linux-2.6.22.19/include/asm-i386/required-features.h
--- a/include/asm-i386/required-features.h~git-newsetup ===================================================================
+++ a/include/asm-i386/required-features.h --- linux-2.6.22.19.orig/include/asm-i386/required-features.h
+++ linux-2.6.22.19/include/asm-i386/required-features.h
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
/* Define minimum CPUID feature set for kernel These bits are checked /* Define minimum CPUID feature set for kernel These bits are checked
@ -11509,9 +11572,10 @@ diff -puN include/asm-i386/required-features.h~git-newsetup include/asm-i386/req
+#define REQUIRED_MASK7 0 +#define REQUIRED_MASK7 0
#endif #endif
diff -puN include/asm-i386/setup.h~git-newsetup include/asm-i386/setup.h Index: linux-2.6.22.19/include/asm-i386/setup.h
--- a/include/asm-i386/setup.h~git-newsetup ===================================================================
+++ a/include/asm-i386/setup.h --- linux-2.6.22.19.orig/include/asm-i386/setup.h
+++ linux-2.6.22.19/include/asm-i386/setup.h
@@ -26,12 +26,15 @@ @@ -26,12 +26,15 @@
#define NEW_CL_POINTER 0x228 /* Relative to real mode data */ #define NEW_CL_POINTER 0x228 /* Relative to real mode data */
@ -11540,9 +11604,10 @@ diff -puN include/asm-i386/setup.h~git-newsetup include/asm-i386/setup.h
#define EFI_SYSTAB ((efi_system_table_t *) *((unsigned long *)(PARAM+0x1c4))) #define EFI_SYSTAB ((efi_system_table_t *) *((unsigned long *)(PARAM+0x1c4)))
#define EFI_MEMDESC_SIZE (*((unsigned long *) (PARAM+0x1c8))) #define EFI_MEMDESC_SIZE (*((unsigned long *) (PARAM+0x1c8)))
#define EFI_MEMDESC_VERSION (*((unsigned long *) (PARAM+0x1cc))) #define EFI_MEMDESC_VERSION (*((unsigned long *) (PARAM+0x1cc)))
diff -puN include/asm-x86_64/alternative.h~git-newsetup include/asm-x86_64/alternative.h Index: linux-2.6.22.19/include/asm-x86_64/alternative.h
--- a/include/asm-x86_64/alternative.h~git-newsetup ===================================================================
+++ a/include/asm-x86_64/alternative.h --- linux-2.6.22.19.orig/include/asm-x86_64/alternative.h
+++ linux-2.6.22.19/include/asm-x86_64/alternative.h
@@ -5,6 +5,41 @@ @@ -5,6 +5,41 @@
#include <linux/types.h> #include <linux/types.h>
@ -11625,9 +11690,10 @@ diff -puN include/asm-x86_64/alternative.h~git-newsetup include/asm-x86_64/alter
struct paravirt_patch; struct paravirt_patch;
#ifdef CONFIG_PARAVIRT #ifdef CONFIG_PARAVIRT
void apply_paravirt(struct paravirt_patch *start, struct paravirt_patch *end); void apply_paravirt(struct paravirt_patch *start, struct paravirt_patch *end);
diff -puN include/asm-x86_64/boot.h~git-newsetup include/asm-x86_64/boot.h Index: linux-2.6.22.19/include/asm-x86_64/boot.h
--- a/include/asm-x86_64/boot.h~git-newsetup ===================================================================
+++ a/include/asm-x86_64/boot.h --- linux-2.6.22.19.orig/include/asm-x86_64/boot.h
+++ linux-2.6.22.19/include/asm-x86_64/boot.h
@@ -1,15 +1 @@ @@ -1,15 +1 @@
-#ifndef _LINUX_BOOT_H -#ifndef _LINUX_BOOT_H
-#define _LINUX_BOOT_H -#define _LINUX_BOOT_H
@ -11645,14 +11711,16 @@ diff -puN include/asm-x86_64/boot.h~git-newsetup include/asm-x86_64/boot.h
- -
-#endif -#endif
+#include <asm-i386/boot.h> +#include <asm-i386/boot.h>
diff -puN /dev/null include/asm-x86_64/bootparam.h Index: linux-2.6.22.19/include/asm-x86_64/bootparam.h
===================================================================
--- /dev/null --- /dev/null
+++ a/include/asm-x86_64/bootparam.h +++ linux-2.6.22.19/include/asm-x86_64/bootparam.h
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+#include <asm-i386/bootparam.h> +#include <asm-i386/bootparam.h>
diff -puN include/asm-x86_64/cpufeature.h~git-newsetup include/asm-x86_64/cpufeature.h Index: linux-2.6.22.19/include/asm-x86_64/cpufeature.h
--- a/include/asm-x86_64/cpufeature.h~git-newsetup ===================================================================
+++ a/include/asm-x86_64/cpufeature.h --- linux-2.6.22.19.orig/include/asm-x86_64/cpufeature.h
+++ linux-2.6.22.19/include/asm-x86_64/cpufeature.h
@@ -7,115 +7,24 @@ @@ -7,115 +7,24 @@
#ifndef __ASM_X8664_CPUFEATURE_H #ifndef __ASM_X8664_CPUFEATURE_H
#define __ASM_X8664_CPUFEATURE_H #define __ASM_X8664_CPUFEATURE_H
@ -11781,9 +11849,10 @@ diff -puN include/asm-x86_64/cpufeature.h~git-newsetup include/asm-x86_64/cpufea
-#define cpu_has_bts boot_cpu_has(X86_FEATURE_BTS) -#define cpu_has_bts boot_cpu_has(X86_FEATURE_BTS)
#endif /* __ASM_X8664_CPUFEATURE_H */ #endif /* __ASM_X8664_CPUFEATURE_H */
diff -puN include/asm-x86_64/e820.h~git-newsetup include/asm-x86_64/e820.h Index: linux-2.6.22.19/include/asm-x86_64/e820.h
--- a/include/asm-x86_64/e820.h~git-newsetup ===================================================================
+++ a/include/asm-x86_64/e820.h --- linux-2.6.22.19.orig/include/asm-x86_64/e820.h
+++ linux-2.6.22.19/include/asm-x86_64/e820.h
@@ -11,7 +11,9 @@ @@ -11,7 +11,9 @@
#ifndef __E820_HEADER #ifndef __E820_HEADER
#define __E820_HEADER #define __E820_HEADER
@ -11804,10 +11873,11 @@ diff -puN include/asm-x86_64/e820.h~git-newsetup include/asm-x86_64/e820.h
struct e820entry map[E820MAX]; struct e820entry map[E820MAX];
}; };
diff -puN include/asm-x86_64/processor.h~git-newsetup include/asm-x86_64/processor.h Index: linux-2.6.22.19/include/asm-x86_64/processor.h
--- a/include/asm-x86_64/processor.h~git-newsetup ===================================================================
+++ a/include/asm-x86_64/processor.h --- linux-2.6.22.19.orig/include/asm-x86_64/processor.h
@@ -99,6 +99,7 @@ extern char ignore_irq13; +++ linux-2.6.22.19/include/asm-x86_64/processor.h
@@ -100,6 +100,7 @@ extern char ignore_irq13;
extern void identify_cpu(struct cpuinfo_x86 *); extern void identify_cpu(struct cpuinfo_x86 *);
extern void print_cpu_info(struct cpuinfo_x86 *); extern void print_cpu_info(struct cpuinfo_x86 *);
@ -11815,7 +11885,7 @@ diff -puN include/asm-x86_64/processor.h~git-newsetup include/asm-x86_64/process
extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c); extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c);
extern unsigned short num_cache_leaves; extern unsigned short num_cache_leaves;
@@ -367,8 +368,6 @@ static inline void sync_core(void) @@ -368,8 +369,6 @@ static inline void sync_core(void)
asm volatile("cpuid" : "=a" (tmp) : "0" (1) : "ebx","ecx","edx","memory"); asm volatile("cpuid" : "=a" (tmp) : "0" (1) : "ebx","ecx","edx","memory");
} }
@ -11824,9 +11894,10 @@ diff -puN include/asm-x86_64/processor.h~git-newsetup include/asm-x86_64/process
#define ARCH_HAS_PREFETCH #define ARCH_HAS_PREFETCH
static inline void prefetch(void *x) static inline void prefetch(void *x)
{ {
diff -puN /dev/null include/asm-x86_64/required-features.h Index: linux-2.6.22.19/include/asm-x86_64/required-features.h
===================================================================
--- /dev/null --- /dev/null
+++ a/include/asm-x86_64/required-features.h +++ linux-2.6.22.19/include/asm-x86_64/required-features.h
@@ -0,0 +1,46 @@ @@ -0,0 +1,46 @@
+#ifndef _ASM_REQUIRED_FEATURES_H +#ifndef _ASM_REQUIRED_FEATURES_H
+#define _ASM_REQUIRED_FEATURES_H 1 +#define _ASM_REQUIRED_FEATURES_H 1
@ -11874,9 +11945,10 @@ diff -puN /dev/null include/asm-x86_64/required-features.h
+#define REQUIRED_MASK7 0 +#define REQUIRED_MASK7 0
+ +
+#endif +#endif
diff -puN include/asm-x86_64/segment.h~git-newsetup include/asm-x86_64/segment.h Index: linux-2.6.22.19/include/asm-x86_64/segment.h
--- a/include/asm-x86_64/segment.h~git-newsetup ===================================================================
+++ a/include/asm-x86_64/segment.h --- linux-2.6.22.19.orig/include/asm-x86_64/segment.h
+++ linux-2.6.22.19/include/asm-x86_64/segment.h
@@ -3,6 +3,14 @@ @@ -3,6 +3,14 @@
#include <asm/cache.h> #include <asm/cache.h>
@ -11892,9 +11964,10 @@ diff -puN include/asm-x86_64/segment.h~git-newsetup include/asm-x86_64/segment.h
#define __KERNEL_CS 0x10 #define __KERNEL_CS 0x10
#define __KERNEL_DS 0x18 #define __KERNEL_DS 0x18
diff -puN include/linux/edd.h~git-newsetup include/linux/edd.h Index: linux-2.6.22.19/include/linux/edd.h
--- a/include/linux/edd.h~git-newsetup ===================================================================
+++ a/include/linux/edd.h --- linux-2.6.22.19.orig/include/linux/edd.h
+++ linux-2.6.22.19/include/linux/edd.h
@@ -49,10 +49,6 @@ @@ -49,10 +49,6 @@
#define EDD_MBR_SIG_MAX 16 /* max number of signatures to store */ #define EDD_MBR_SIG_MAX 16 /* max number of signatures to store */
#define EDD_MBR_SIG_NR_BUF 0x1ea /* addr of number of MBR signtaures at EDD_MBR_SIG_BUF #define EDD_MBR_SIG_NR_BUF 0x1ea /* addr of number of MBR signtaures at EDD_MBR_SIG_BUF
@ -11906,9 +11979,10 @@ diff -puN include/linux/edd.h~git-newsetup include/linux/edd.h
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
diff -puN include/linux/screen_info.h~git-newsetup include/linux/screen_info.h Index: linux-2.6.22.19/include/linux/screen_info.h
--- a/include/linux/screen_info.h~git-newsetup ===================================================================
+++ a/include/linux/screen_info.h --- linux-2.6.22.19.orig/include/linux/screen_info.h
+++ linux-2.6.22.19/include/linux/screen_info.h
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
struct screen_info { struct screen_info {
u8 orig_x; /* 0x00 */ u8 orig_x; /* 0x00 */
@ -11939,4 +12013,3 @@ diff -puN include/linux/screen_info.h~git-newsetup include/linux/screen_info.h
extern struct screen_info screen_info; extern struct screen_info screen_info;
_

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

@ -6,9 +6,10 @@ 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(-)
diff -puN arch/i386/kernel/cpu/Makefile~git-newsetup-fixup arch/i386/kernel/cpu/Makefile Index: linux-2.6.22.19/arch/i386/kernel/cpu/Makefile
--- a/arch/i386/kernel/cpu/Makefile~git-newsetup-fixup ===================================================================
+++ a/arch/i386/kernel/cpu/Makefile --- linux-2.6.22.19.orig/arch/i386/kernel/cpu/Makefile
+++ linux-2.6.22.19/arch/i386/kernel/cpu/Makefile
@@ -8,7 +8,7 @@ obj-y += amd.o @@ -8,7 +8,7 @@ obj-y += amd.o
obj-y += cyrix.o obj-y += cyrix.o
obj-y += centaur.o obj-y += centaur.o
@ -18,5 +19,3 @@ diff -puN arch/i386/kernel/cpu/Makefile~git-newsetup-fixup arch/i386/kernel/cpu/
obj-y += rise.o obj-y += rise.o
obj-y += nexgen.o obj-y += nexgen.o
obj-y += umc.o obj-y += umc.o
_

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

@ -1,6 +1,7 @@
diff -urN linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c linux-2.6.21.1.dev/drivers/mtd/devices/block2mtd.c Index: linux-2.6.22.19/drivers/mtd/devices/block2mtd.c
--- linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/drivers/mtd/devices/block2mtd.c 2007-05-26 20:06:13.547923960 +0200 --- 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>
@ -9,7 +10,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c linux-2.6.21.1.dev/
#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 @@ @@ -237,10 +238,11 @@ static void block2mtd_free_device(struct
/* FIXME: ensure that mtd->size % erase_size == 0 */ /* FIXME: ensure that mtd->size % erase_size == 0 */
@ -22,7 +23,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c linux-2.6.21.1.dev/
if (!devname) if (!devname)
return NULL; return NULL;
@@ -279,14 +281,18 @@ @@ -279,14 +281,18 @@ static struct block2mtd_dev *add_device(
/* Setup the MTD structure */ /* Setup the MTD structure */
/* make the name contain the block device in */ /* make the name contain the block device in */
@ -46,7 +47,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c linux-2.6.21.1.dev/
dev->mtd.erasesize = erase_size; dev->mtd.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 @@ @@ -298,15 +304,18 @@ static struct block2mtd_dev *add_device(
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;
@ -69,7 +70,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c linux-2.6.21.1.dev/
return dev; return dev;
devinit_err: devinit_err:
@@ -379,9 +388,9 @@ @@ -379,9 +388,9 @@ static char block2mtd_paramline[80 + 12]
static int block2mtd_setup2(const char *val) static int block2mtd_setup2(const char *val)
{ {
@ -81,7 +82,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c linux-2.6.21.1.dev/
char *name; char *name;
size_t erase_size = PAGE_SIZE; size_t erase_size = PAGE_SIZE;
int i, ret; int i, ret;
@@ -392,7 +401,7 @@ @@ -392,7 +401,7 @@ static int block2mtd_setup2(const char *
strcpy(str, val); strcpy(str, val);
kill_final_newline(str); kill_final_newline(str);
@ -90,7 +91,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c linux-2.6.21.1.dev/
token[i] = strsep(&str, ","); token[i] = strsep(&str, ",");
if (str) if (str)
@@ -412,8 +421,10 @@ @@ -412,8 +421,10 @@ static int block2mtd_setup2(const char *
parse_err("illegal erase size"); parse_err("illegal erase size");
} }
} }
@ -102,7 +103,7 @@ diff -urN linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c linux-2.6.21.1.dev/
return 0; return 0;
} }
@@ -447,7 +458,7 @@ @@ -447,7 +458,7 @@ static int block2mtd_setup(const char *v
module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200); module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);

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

@ -1,8 +1,8 @@
Index: linux-2.6.22.1/drivers/mtd/Kconfig Index: linux-2.6.22.19/drivers/mtd/Kconfig
=================================================================== ===================================================================
--- linux-2.6.22.1.orig/drivers/mtd/Kconfig 2007-08-19 23:30:07.068115074 +0200 --- linux-2.6.22.19.orig/drivers/mtd/Kconfig
+++ linux-2.6.22.1/drivers/mtd/Kconfig 2007-08-19 23:31:43.961636725 +0200 +++ linux-2.6.22.19/drivers/mtd/Kconfig
@@ -47,6 +47,16 @@ @@ -47,6 +47,16 @@ config MTD_PARTITIONS
devices. Partitioning on NFTL 'devices' is a different - that's the devices. Partitioning on NFTL 'devices' is a different - that's the
'normal' form of partitioning used on a block device. 'normal' form of partitioning used on a block device.
@ -19,10 +19,10 @@ Index: linux-2.6.22.1/drivers/mtd/Kconfig
config MTD_REDBOOT_PARTS config MTD_REDBOOT_PARTS
tristate "RedBoot partition table parsing" tristate "RedBoot partition table parsing"
depends on MTD_PARTITIONS depends on MTD_PARTITIONS
Index: linux-2.6.22.1/drivers/mtd/mtdpart.c Index: linux-2.6.22.19/drivers/mtd/mtdpart.c
=================================================================== ===================================================================
--- linux-2.6.22.1.orig/drivers/mtd/mtdpart.c 2007-08-19 23:30:07.076115531 +0200 --- linux-2.6.22.19.orig/drivers/mtd/mtdpart.c
+++ linux-2.6.22.1/drivers/mtd/mtdpart.c 2007-08-19 23:31:44.065642653 +0200 +++ 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 +32,7 @@ Index: linux-2.6.22.1/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 @@ @@ -39,7 +41,7 @@ struct mtd_part {
* 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 +41,7 @@ Index: linux-2.6.22.1/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 @@ @@ -308,6 +310,312 @@ int del_mtd_partitions(struct mtd_info *
return 0; return 0;
} }
@ -354,7 +354,7 @@ Index: linux-2.6.22.1/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 @@ @@ -320,168 +628,31 @@ int add_mtd_partitions(struct mtd_info *
int nbparts) int nbparts)
{ {
struct mtd_part *slave; struct mtd_part *slave;
@ -544,7 +544,7 @@ Index: linux-2.6.22.1/drivers/mtd/mtdpart.c
} }
} }
@@ -557,7 +728,33 @@ @@ -557,6 +728,32 @@ int parse_mtd_partitions(struct mtd_info
return ret; return ret;
} }
@ -577,12 +577,11 @@ Index: linux-2.6.22.1/drivers/mtd/mtdpart.c
+EXPORT_SYMBOL_GPL(refresh_mtd_partitions); +EXPORT_SYMBOL_GPL(refresh_mtd_partitions);
EXPORT_SYMBOL_GPL(register_mtd_parser); EXPORT_SYMBOL_GPL(register_mtd_parser);
EXPORT_SYMBOL_GPL(deregister_mtd_parser); EXPORT_SYMBOL_GPL(deregister_mtd_parser);
Index: linux-2.6.22.19/drivers/mtd/devices/block2mtd.c
Index: linux-2.6.22.1/drivers/mtd/devices/block2mtd.c
=================================================================== ===================================================================
--- linux-2.6.22.1.orig/drivers/mtd/devices/block2mtd.c 2007-08-19 23:30:49.794549917 +0200 --- linux-2.6.22.19.orig/drivers/mtd/devices/block2mtd.c
+++ linux-2.6.22.1/drivers/mtd/devices/block2mtd.c 2007-08-19 23:31:44.025640373 +0200 +++ linux-2.6.22.19/drivers/mtd/devices/block2mtd.c
@@ -34,6 +34,8 @@ @@ -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;
@ -591,7 +590,7 @@ Index: linux-2.6.22.1/drivers/mtd/devices/block2mtd.c
}; };
@@ -86,6 +88,12 @@ @@ -86,6 +88,12 @@ static int block2mtd_erase(struct mtd_in
size_t len = instr->len; size_t len = instr->len;
int err; int err;
@ -604,7 +603,7 @@ Index: linux-2.6.22.1/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 @@ @@ -98,6 +106,10 @@ static int block2mtd_erase(struct mtd_in
instr->state = MTD_ERASE_DONE; instr->state = MTD_ERASE_DONE;
mtd_erase_callback(instr); mtd_erase_callback(instr);
@ -615,7 +614,7 @@ Index: linux-2.6.22.1/drivers/mtd/devices/block2mtd.c
return err; return err;
} }
@@ -109,10 +121,14 @@ @@ -109,10 +121,14 @@ static int block2mtd_read(struct mtd_inf
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);
@ -633,7 +632,7 @@ Index: linux-2.6.22.1/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 @@ @@ -127,10 +143,14 @@ static int block2mtd_read(struct mtd_inf
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);
@ -652,7 +651,7 @@ Index: linux-2.6.22.1/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 @@ @@ -141,7 +161,10 @@ static int block2mtd_read(struct mtd_inf
offset = 0; offset = 0;
index++; index++;
} }
@ -664,7 +663,7 @@ Index: linux-2.6.22.1/drivers/mtd/devices/block2mtd.c
} }
@@ -193,12 +216,22 @@ @@ -193,12 +216,22 @@ static int block2mtd_write(struct mtd_in
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;
@ -691,7 +690,7 @@ Index: linux-2.6.22.1/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 @@ @@ -207,6 +240,9 @@ static int block2mtd_write(struct mtd_in
mutex_unlock(&dev->write_mutex); mutex_unlock(&dev->write_mutex);
if (err > 0) if (err > 0)
err = 0; err = 0;
@ -701,7 +700,7 @@ Index: linux-2.6.22.1/drivers/mtd/devices/block2mtd.c
return err; return err;
} }
@@ -215,51 +251,29 @@ @@ -215,51 +251,29 @@ static int block2mtd_write(struct mtd_in
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;
@ -761,7 +760,7 @@ Index: linux-2.6.22.1/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 @@ @@ -267,17 +281,96 @@ static struct block2mtd_dev *add_device(
#endif #endif
if (IS_ERR(bdev)) { if (IS_ERR(bdev)) {
@ -861,7 +860,7 @@ Index: linux-2.6.22.1/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 @@ @@ -304,6 +397,7 @@ static struct block2mtd_dev *add_device(
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;
@ -869,10 +868,10 @@ Index: linux-2.6.22.1/drivers/mtd/devices/block2mtd.c
part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL); part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
part->name = dev->mtd.name; part->name = dev->mtd.name;
Index: linux-2.6.22.1/drivers/mtd/mtdchar.c Index: linux-2.6.22.19/drivers/mtd/mtdchar.c
=================================================================== ===================================================================
--- linux-2.6.22.1.orig/drivers/mtd/mtdchar.c 2007-08-19 23:30:07.096116671 +0200 --- linux-2.6.22.19.orig/drivers/mtd/mtdchar.c
+++ linux-2.6.22.1/drivers/mtd/mtdchar.c 2007-08-19 23:31:44.041641284 +0200 +++ 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>
@ -881,7 +880,7 @@ Index: linux-2.6.22.1/drivers/mtd/mtdchar.c
#include <asm/uaccess.h> #include <asm/uaccess.h>
@@ -752,6 +753,13 @@ @@ -752,6 +753,13 @@ static int mtd_ioctl(struct inode *inode
file->f_pos = 0; file->f_pos = 0;
break; break;
} }
@ -895,11 +894,11 @@ Index: linux-2.6.22.1/drivers/mtd/mtdchar.c
default: default:
ret = -ENOTTY; ret = -ENOTTY;
Index: linux-2.6.22.1/include/linux/mtd/mtd.h Index: linux-2.6.22.19/include/linux/mtd/mtd.h
=================================================================== ===================================================================
--- linux-2.6.22.1.orig/include/linux/mtd/mtd.h 2007-08-19 23:30:07.100116893 +0200 --- linux-2.6.22.19.orig/include/linux/mtd/mtd.h
+++ linux-2.6.22.1/include/linux/mtd/mtd.h 2007-08-19 23:31:44.105644933 +0200 +++ linux-2.6.22.19/include/linux/mtd/mtd.h
@@ -98,6 +98,7 @@ @@ -98,6 +98,7 @@ struct mtd_oob_ops {
uint8_t *oobbuf; uint8_t *oobbuf;
}; };
@ -907,7 +906,7 @@ Index: linux-2.6.22.1/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 @@ @@ -195,6 +196,9 @@ struct mtd_info {
struct module *owner; struct module *owner;
int usecount; int usecount;
@ -917,10 +916,10 @@ Index: linux-2.6.22.1/include/linux/mtd/mtd.h
/* If the driver is something smart, like UBI, it may need to maintain /* If the driver is something smart, like UBI, it may need to maintain
* its own reference counting. The below functions are only for driver. * its own reference counting. The below functions are only for driver.
* The driver may register its callbacks. These callbacks are not * The driver may register its callbacks. These callbacks are not
Index: linux-2.6.22.1/include/linux/mtd/partitions.h Index: linux-2.6.22.19/include/linux/mtd/partitions.h
=================================================================== ===================================================================
--- linux-2.6.22.1.orig/include/linux/mtd/partitions.h 2007-08-19 23:30:07.112117591 +0200 --- linux-2.6.22.19.orig/include/linux/mtd/partitions.h
+++ linux-2.6.22.1/include/linux/mtd/partitions.h 2007-08-19 23:31:44.133646528 +0200 +++ 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).
*/ */
@ -929,7 +928,7 @@ Index: linux-2.6.22.1/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 @@ @@ -43,6 +44,7 @@ struct mtd_partition {
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 */
@ -937,7 +936,7 @@ Index: linux-2.6.22.1/include/linux/mtd/partitions.h
}; };
#define MTDPART_OFS_NXTBLK (-2) #define MTDPART_OFS_NXTBLK (-2)
@@ -52,6 +54,7 @@ @@ -52,6 +54,7 @@ struct mtd_partition {
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 *);
@ -945,11 +944,11 @@ Index: linux-2.6.22.1/include/linux/mtd/partitions.h
/* /*
* Functions dealing with the various ways of partitioning the space * Functions dealing with the various ways of partitioning the space
Index: linux-2.6.22.1/include/mtd/mtd-abi.h Index: linux-2.6.22.19/include/mtd/mtd-abi.h
=================================================================== ===================================================================
--- linux-2.6.22.1.orig/include/mtd/mtd-abi.h 2007-08-19 23:30:07.124118264 +0200 --- linux-2.6.22.19.orig/include/mtd/mtd-abi.h
+++ linux-2.6.22.1/include/mtd/mtd-abi.h 2007-08-19 23:31:44.157647897 +0200 +++ linux-2.6.22.19/include/mtd/mtd-abi.h
@@ -95,6 +95,7 @@ @@ -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)

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

@ -1,7 +1,7 @@
Index: linux-2.6.22.18/net/netfilter/Kconfig Index: linux-2.6.22.19/net/netfilter/Kconfig
=================================================================== ===================================================================
--- linux-2.6.22.18.orig/net/netfilter/Kconfig --- linux-2.6.22.19.orig/net/netfilter/Kconfig
+++ linux-2.6.22.18/net/netfilter/Kconfig +++ linux-2.6.22.19/net/netfilter/Kconfig
@@ -603,6 +603,27 @@ config NETFILTER_XT_MATCH_STATE @@ -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,10 +30,10 @@ Index: linux-2.6.22.18/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.18/net/netfilter/Makefile Index: linux-2.6.22.19/net/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.6.22.18.orig/net/netfilter/Makefile --- linux-2.6.22.19.orig/net/netfilter/Makefile
+++ linux-2.6.22.18/net/netfilter/Makefile +++ linux-2.6.22.19/net/netfilter/Makefile
@@ -68,6 +68,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_QUOTA) + @@ -68,6 +68,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_QUOTA) +
obj-$(CONFIG_NETFILTER_XT_MATCH_REALM) += xt_realm.o obj-$(CONFIG_NETFILTER_XT_MATCH_REALM) += xt_realm.o
obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
@ -42,10 +42,10 @@ Index: linux-2.6.22.18/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.18/net/netfilter/xt_layer7.c Index: linux-2.6.22.19/net/netfilter/xt_layer7.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.18/net/netfilter/xt_layer7.c +++ linux-2.6.22.19/net/netfilter/xt_layer7.c
@@ -0,0 +1,634 @@ @@ -0,0 +1,634 @@
+/* +/*
+ Kernel module to match application layer (OSI layer 7) data in connections. + Kernel module to match application layer (OSI layer 7) data in connections.
@ -681,10 +681,10 @@ Index: linux-2.6.22.18/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.18/net/netfilter/regexp/regexp.c Index: linux-2.6.22.19/net/netfilter/regexp/regexp.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.18/net/netfilter/regexp/regexp.c +++ linux-2.6.22.19/net/netfilter/regexp/regexp.c
@@ -0,0 +1,1197 @@ @@ -0,0 +1,1197 @@
+/* +/*
+ * regcomp and regexec -- regsub and regerror are elsewhere + * regcomp and regexec -- regsub and regerror are elsewhere
@ -1883,10 +1883,10 @@ Index: linux-2.6.22.18/net/netfilter/regexp/regexp.c
+#endif +#endif
+ +
+ +
Index: linux-2.6.22.18/net/netfilter/regexp/regexp.h Index: linux-2.6.22.19/net/netfilter/regexp/regexp.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.18/net/netfilter/regexp/regexp.h +++ linux-2.6.22.19/net/netfilter/regexp/regexp.h
@@ -0,0 +1,41 @@ @@ -0,0 +1,41 @@
+/* +/*
+ * Definitions etc. for regexp(3) routines. + * Definitions etc. for regexp(3) routines.
@ -1929,20 +1929,20 @@ Index: linux-2.6.22.18/net/netfilter/regexp/regexp.h
+void regerror(char *s); +void regerror(char *s);
+ +
+#endif +#endif
Index: linux-2.6.22.18/net/netfilter/regexp/regmagic.h Index: linux-2.6.22.19/net/netfilter/regexp/regmagic.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.18/net/netfilter/regexp/regmagic.h +++ linux-2.6.22.19/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.18/net/netfilter/regexp/regsub.c Index: linux-2.6.22.19/net/netfilter/regexp/regsub.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.18/net/netfilter/regexp/regsub.c +++ linux-2.6.22.19/net/netfilter/regexp/regsub.c
@@ -0,0 +1,95 @@ @@ -0,0 +1,95 @@
+/* +/*
+ * regsub + * regsub
@ -2039,10 +2039,10 @@ Index: linux-2.6.22.18/net/netfilter/regexp/regsub.c
+ } + }
+ *dst++ = '\0'; + *dst++ = '\0';
+} +}
Index: linux-2.6.22.18/net/netfilter/nf_conntrack_core.c Index: linux-2.6.22.19/net/netfilter/nf_conntrack_core.c
=================================================================== ===================================================================
--- linux-2.6.22.18.orig/net/netfilter/nf_conntrack_core.c --- linux-2.6.22.19.orig/net/netfilter/nf_conntrack_core.c
+++ linux-2.6.22.18/net/netfilter/nf_conntrack_core.c +++ linux-2.6.22.19/net/netfilter/nf_conntrack_core.c
@@ -330,6 +330,14 @@ destroy_conntrack(struct nf_conntrack *n @@ -330,6 +330,14 @@ destroy_conntrack(struct nf_conntrack *n
* too. */ * too. */
nf_ct_remove_expectations(ct); nf_ct_remove_expectations(ct);
@ -2058,10 +2058,10 @@ Index: linux-2.6.22.18/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.18/net/netfilter/nf_conntrack_standalone.c Index: linux-2.6.22.19/net/netfilter/nf_conntrack_standalone.c
=================================================================== ===================================================================
--- linux-2.6.22.18.orig/net/netfilter/nf_conntrack_standalone.c --- linux-2.6.22.19.orig/net/netfilter/nf_conntrack_standalone.c
+++ linux-2.6.22.18/net/netfilter/nf_conntrack_standalone.c +++ linux-2.6.22.19/net/netfilter/nf_conntrack_standalone.c
@@ -184,7 +184,12 @@ static int ct_seq_show(struct seq_file * @@ -184,7 +184,12 @@ static int ct_seq_show(struct seq_file *
return -ENOSPC; return -ENOSPC;
#endif #endif
@ -2076,10 +2076,10 @@ Index: linux-2.6.22.18/net/netfilter/nf_conntrack_standalone.c
return -ENOSPC; return -ENOSPC;
return 0; return 0;
Index: linux-2.6.22.18/include/net/netfilter/nf_conntrack.h Index: linux-2.6.22.19/include/net/netfilter/nf_conntrack.h
=================================================================== ===================================================================
--- linux-2.6.22.18.orig/include/net/netfilter/nf_conntrack.h --- linux-2.6.22.19.orig/include/net/netfilter/nf_conntrack.h
+++ linux-2.6.22.18/include/net/netfilter/nf_conntrack.h +++ linux-2.6.22.19/include/net/netfilter/nf_conntrack.h
@@ -128,6 +128,22 @@ struct nf_conn @@ -128,6 +128,22 @@ struct nf_conn
u_int32_t secmark; u_int32_t secmark;
#endif #endif
@ -2103,10 +2103,10 @@ Index: linux-2.6.22.18/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.18/include/linux/netfilter/xt_layer7.h Index: linux-2.6.22.19/include/linux/netfilter/xt_layer7.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.18/include/linux/netfilter/xt_layer7.h +++ linux-2.6.22.19/include/linux/netfilter/xt_layer7.h
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
+#ifndef _XT_LAYER7_H +#ifndef _XT_LAYER7_H
+#define _XT_LAYER7_H +#define _XT_LAYER7_H

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

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

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

@ -1,7 +1,7 @@
Index: linux-2.6.22.18/include/linux/netfilter_ipv4/ipt_ipp2p.h Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ipt_ipp2p.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.18/include/linux/netfilter_ipv4/ipt_ipp2p.h +++ linux-2.6.22.19/include/linux/netfilter_ipv4/ipt_ipp2p.h
@@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
+#ifndef __IPT_IPP2P_H +#ifndef __IPT_IPP2P_H
+#define __IPT_IPP2P_H +#define __IPT_IPP2P_H
@ -34,10 +34,10 @@ Index: linux-2.6.22.18/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.18/net/ipv4/netfilter/ipt_ipp2p.c Index: linux-2.6.22.19/net/ipv4/netfilter/ipt_ipp2p.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.18/net/ipv4/netfilter/ipt_ipp2p.c +++ linux-2.6.22.19/net/ipv4/netfilter/ipt_ipp2p.c
@@ -0,0 +1,882 @@ @@ -0,0 +1,882 @@
+#if defined(MODVERSIONS) +#if defined(MODVERSIONS)
+#include <linux/modversions.h> +#include <linux/modversions.h>
@ -921,10 +921,10 @@ Index: linux-2.6.22.18/net/ipv4/netfilter/ipt_ipp2p.c
+module_exit(fini); +module_exit(fini);
+ +
+ +
Index: linux-2.6.22.18/net/ipv4/netfilter/Kconfig Index: linux-2.6.22.19/net/ipv4/netfilter/Kconfig
=================================================================== ===================================================================
--- linux-2.6.22.18.orig/net/ipv4/netfilter/Kconfig --- linux-2.6.22.19.orig/net/ipv4/netfilter/Kconfig
+++ linux-2.6.22.18/net/ipv4/netfilter/Kconfig +++ linux-2.6.22.19/net/ipv4/netfilter/Kconfig
@@ -63,6 +63,12 @@ config IP_NF_MATCH_IPRANGE @@ -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,10 +938,10 @@ Index: linux-2.6.22.18/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.18/net/ipv4/netfilter/Makefile Index: linux-2.6.22.19/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.6.22.18.orig/net/ipv4/netfilter/Makefile --- linux-2.6.22.19.orig/net/ipv4/netfilter/Makefile
+++ linux-2.6.22.18/net/ipv4/netfilter/Makefile +++ linux-2.6.22.19/net/ipv4/netfilter/Makefile
@@ -49,6 +49,7 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn @@ -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

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

@ -1,6 +1,7 @@
diff -urN linux-2.6.21.1.old/include/net/xfrmudp.h linux-2.6.21.1.dev/include/net/xfrmudp.h Index: linux-2.6.22.19/include/net/xfrmudp.h
--- linux-2.6.21.1.old/include/net/xfrmudp.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/include/net/xfrmudp.h 2007-05-26 20:24:53.933599448 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -12,10 +13,11 @@ diff -urN linux-2.6.21.1.old/include/net/xfrmudp.h linux-2.6.21.1.dev/include/ne
+extern int udp4_register_esp_rcvencap(xfrm4_rcv_encap_t func +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);
diff -urN linux-2.6.21.1.old/net/ipv4/Kconfig linux-2.6.21.1.dev/net/ipv4/Kconfig Index: linux-2.6.22.19/net/ipv4/Kconfig
--- linux-2.6.21.1.old/net/ipv4/Kconfig 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/net/ipv4/Kconfig 2007-05-26 20:24:53.965594584 +0200 --- 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.
@ -28,9 +30,10 @@ diff -urN linux-2.6.21.1.old/net/ipv4/Kconfig linux-2.6.21.1.dev/net/ipv4/Kconfi
config IP_MROUTE config IP_MROUTE
bool "IP: multicast routing" bool "IP: multicast routing"
depends on IP_MULTICAST depends on IP_MULTICAST
diff -urN linux-2.6.21.1.old/net/ipv4/udp.c linux-2.6.21.1.dev/net/ipv4/udp.c Index: linux-2.6.22.19/net/ipv4/udp.c
--- linux-2.6.21.1.old/net/ipv4/udp.c 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/net/ipv4/udp.c 2007-05-26 20:24:53.966594432 +0200 --- 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>
@ -47,7 +50,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/udp.c linux-2.6.21.1.dev/net/ipv4/udp.c
DEFINE_SNMP_STAT(struct udp_mib, udp_statistics) __read_mostly; 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];
@@ -1008,6 +1011,42 @@ @@ -919,6 +922,42 @@ int udp_disconnect(struct sock *sk, int
return 0; return 0;
} }
@ -90,7 +93,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/udp.c linux-2.6.21.1.dev/net/ipv4/udp.c
/* return: /* 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
@@ -1015,7 +1054,7 @@ @@ -926,7 +965,7 @@ int udp_disconnect(struct sock *sk, int
*/ */
static int udp_encap_rcv(struct sock * sk, struct sk_buff *skb) static int udp_encap_rcv(struct sock * sk, struct sk_buff *skb)
{ {
@ -99,7 +102,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/udp.c linux-2.6.21.1.dev/net/ipv4/udp.c
return 1; return 1;
#else #else
struct udp_sock *up = udp_sk(sk); struct udp_sock *up = udp_sk(sk);
@@ -1030,11 +1069,11 @@ @@ -941,11 +980,11 @@ static int udp_encap_rcv(struct sock * s
/* 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)
@ -113,7 +116,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/udp.c linux-2.6.21.1.dev/net/ipv4/udp.c
/* If this is a paged skb, make sure we pull up /* 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. */
@@ -1057,7 +1096,7 @@ @@ -968,7 +1007,7 @@ static int udp_encap_rcv(struct sock * s
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 */
@ -122,7 +125,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/udp.c linux-2.6.21.1.dev/net/ipv4/udp.c
break; 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. */
@@ -1070,7 +1109,7 @@ @@ -981,7 +1020,7 @@ static int udp_encap_rcv(struct sock * s
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 */
@ -131,7 +134,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/udp.c linux-2.6.21.1.dev/net/ipv4/udp.c
break; break;
} }
@@ -1081,6 +1120,8 @@ @@ -992,6 +1031,8 @@ static int udp_encap_rcv(struct sock * s
*/ */
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;
@ -140,7 +143,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/udp.c linux-2.6.21.1.dev/net/ipv4/udp.c
/* Now we can update and verify the packet length... */ /* Now we can update and verify the packet length... */
iph = ip_hdr(skb); iph = ip_hdr(skb);
@@ -1145,9 +1186,13 @@ @@ -1056,9 +1097,13 @@ int udp_queue_rcv_skb(struct sock * sk,
return 0; return 0;
} }
if (ret < 0) { if (ret < 0) {
@ -157,7 +160,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/udp.c linux-2.6.21.1.dev/net/ipv4/udp.c
return -ret; return -ret;
} }
/* FALLTHROUGH -- it's a UDP Packet */ /* FALLTHROUGH -- it's a UDP Packet */
@@ -1847,3 +1892,9 @@ @@ -1742,3 +1787,9 @@ EXPORT_SYMBOL(udp_poll);
EXPORT_SYMBOL(udp_proc_register); EXPORT_SYMBOL(udp_proc_register);
EXPORT_SYMBOL(udp_proc_unregister); EXPORT_SYMBOL(udp_proc_unregister);
#endif #endif

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

@ -1,6 +1,7 @@
diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set.h linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ip_set.h Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set.h
--- ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ip_set.h 2007-10-12 14:31:55.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -500,9 +501,10 @@ diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set.h linux-2.6.22.4.
+#endif /* __KERNEL__ */ +#endif /* __KERNEL__ */
+ +
+#endif /*_IP_SET_H*/ +#endif /*_IP_SET_H*/
diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_iphash.h linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iphash.h Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_iphash.h
--- ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_iphash.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iphash.h 2007-10-12 14:31:55.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -534,9 +536,10 @@ diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_iphash.h linux-2.
+}; +};
+ +
+#endif /* __IP_SET_IPHASH_H */ +#endif /* __IP_SET_IPHASH_H */
diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_ipmap.h linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ip_set_ipmap.h Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_ipmap.h
--- ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_ipmap.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ip_set_ipmap.h 2007-10-12 14:31:55.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -594,9 +597,10 @@ diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_ipmap.h linux-2.6
+} +}
+ +
+#endif /* __IP_SET_IPMAP_H */ +#endif /* __IP_SET_IPMAP_H */
diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ip_set_ipporthash.h Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_ipporthash.h
--- ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ip_set_ipporthash.h 2007-10-12 14:31:55.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -632,9 +636,10 @@ diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h linu
+}; +};
+ +
+#endif /* __IP_SET_IPPORTHASH_H */ +#endif /* __IP_SET_IPPORTHASH_H */
diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_iptree.h linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iptree.h Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_iptree.h
--- ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_iptree.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iptree.h 2007-10-12 14:31:55.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -676,9 +681,10 @@ diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_iptree.h linux-2.
+}; +};
+ +
+#endif /* __IP_SET_IPTREE_H */ +#endif /* __IP_SET_IPTREE_H */
diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_iptreemap.h linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iptreemap.h Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_iptreemap.h
--- ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_iptreemap.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iptreemap.h 2007-10-12 14:31:55.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -720,9 +726,10 @@ diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_iptreemap.h linux
+}; +};
+ +
+#endif /* __IP_SET_IPTREEMAP_H */ +#endif /* __IP_SET_IPTREEMAP_H */
diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_jhash.h linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ip_set_jhash.h Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_jhash.h
--- ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_jhash.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ip_set_jhash.h 2007-10-12 14:31:55.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -872,9 +879,10 @@ diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_jhash.h linux-2.6
+} +}
+ +
+#endif /* _LINUX_IPSET_JHASH_H */ +#endif /* _LINUX_IPSET_JHASH_H */
diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_macipmap.h linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ip_set_macipmap.h Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_macipmap.h
--- ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_macipmap.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ip_set_macipmap.h 2007-10-12 14:31:55.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -914,9 +922,10 @@ diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_macipmap.h linux-
+}; +};
+ +
+#endif /* __IP_SET_MACIPMAP_H */ +#endif /* __IP_SET_MACIPMAP_H */
diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_malloc.h linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ip_set_malloc.h Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_malloc.h
--- ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_malloc.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ip_set_malloc.h 2007-10-12 14:31:55.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -1034,9 +1043,10 @@ diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_malloc.h linux-2.
+#endif /* __KERNEL__ */ +#endif /* __KERNEL__ */
+ +
+#endif /*_IP_SET_MALLOC_H*/ +#endif /*_IP_SET_MALLOC_H*/
diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_nethash.h linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ip_set_nethash.h Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_nethash.h
--- ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_nethash.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ip_set_nethash.h 2007-10-12 14:31:55.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -1093,9 +1103,10 @@ diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_nethash.h linux-2
+} +}
+ +
+#endif /* __IP_SET_NETHASH_H */ +#endif /* __IP_SET_NETHASH_H */
diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_portmap.h linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ip_set_portmap.h Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ip_set_portmap.h
--- ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_portmap.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ip_set_portmap.h 2007-10-12 14:31:55.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -1122,9 +1133,10 @@ diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ip_set_portmap.h linux-2
+}; +};
+ +
+#endif /* __IP_SET_PORTMAP_H */ +#endif /* __IP_SET_PORTMAP_H */
diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ipt_set.h linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ipt_set.h Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ipt_set.h
--- ./linux-2.6.22.4/include/linux/netfilter_ipv4/ipt_set.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/include/linux/netfilter_ipv4/ipt_set.h 2007-10-12 14:31:55.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -1147,9 +1159,10 @@ diff -Nru ./linux-2.6.22.4/include/linux/netfilter_ipv4/ipt_set.h linux-2.6.22.4
+}; +};
+ +
+#endif /*_IPT_SET_H*/ +#endif /*_IPT_SET_H*/
diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/ip_set.c linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/ip_set.c Index: linux-2.6.22.19/net/ipv4/netfilter/ip_set.c
--- ./linux-2.6.22.4/net/ipv4/netfilter/ip_set.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/ip_set.c 2007-10-12 14:31:55.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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>
@ -3154,9 +3167,10 @@ diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/ip_set.c linux-2.6.22.4.pom2patch.
+ +
+module_init(ip_set_init); +module_init(ip_set_init);
+module_exit(ip_set_fini); +module_exit(ip_set_fini);
diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_iphash.c linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/ip_set_iphash.c Index: linux-2.6.22.19/net/ipv4/netfilter/ip_set_iphash.c
--- ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_iphash.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/ip_set_iphash.c 2007-10-12 14:31:55.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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>
+ * + *
@ -3587,9 +3601,10 @@ diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_iphash.c linux-2.6.22.4.pom
+ +
+module_init(ip_set_iphash_init); +module_init(ip_set_iphash_init);
+module_exit(ip_set_iphash_fini); +module_exit(ip_set_iphash_fini);
diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_ipmap.c linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/ip_set_ipmap.c Index: linux-2.6.22.19/net/ipv4/netfilter/ip_set_ipmap.c
--- ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_ipmap.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/ip_set_ipmap.c 2007-10-12 14:31:55.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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>
@ -3927,9 +3942,10 @@ diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_ipmap.c linux-2.6.22.4.pom2
+ +
+module_init(ip_set_ipmap_init); +module_init(ip_set_ipmap_init);
+module_exit(ip_set_ipmap_fini); +module_exit(ip_set_ipmap_fini);
diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_ipporthash.c linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/ip_set_ipporthash.c Index: linux-2.6.22.19/net/ipv4/netfilter/ip_set_ipporthash.c
--- ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_ipporthash.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/ip_set_ipporthash.c 2007-10-12 14:31:55.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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>
+ * + *
@ -4512,9 +4528,10 @@ diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_ipporthash.c linux-2.6.22.4
+ +
+module_init(ip_set_ipporthash_init); +module_init(ip_set_ipporthash_init);
+module_exit(ip_set_ipporthash_fini); +module_exit(ip_set_ipporthash_fini);
diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_iptree.c linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/ip_set_iptree.c Index: linux-2.6.22.19/net/ipv4/netfilter/ip_set_iptree.c
--- ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_iptree.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/ip_set_iptree.c 2007-10-12 14:31:55.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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>
+ * + *
@ -5128,9 +5145,10 @@ diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_iptree.c linux-2.6.22.4.pom
+ +
+module_init(ip_set_iptree_init); +module_init(ip_set_iptree_init);
+module_exit(ip_set_iptree_fini); +module_exit(ip_set_iptree_fini);
diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_iptreemap.c linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/ip_set_iptreemap.c Index: linux-2.6.22.19/net/ipv4/netfilter/ip_set_iptreemap.c
--- ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_iptreemap.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/ip_set_iptreemap.c 2007-10-12 14:31:55.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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>
+ * + *
@ -5961,9 +5979,10 @@ diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_iptreemap.c linux-2.6.22.4.
+ +
+module_init(ip_set_iptreemap_init); +module_init(ip_set_iptreemap_init);
+module_exit(ip_set_iptreemap_fini); +module_exit(ip_set_iptreemap_fini);
diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_macipmap.c linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/ip_set_macipmap.c Index: linux-2.6.22.19/net/ipv4/netfilter/ip_set_macipmap.c
--- ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_macipmap.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/ip_set_macipmap.c 2007-10-12 14:31:55.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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>
@ -6340,9 +6359,10 @@ diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_macipmap.c linux-2.6.22.4.p
+ +
+module_init(ip_set_macipmap_init); +module_init(ip_set_macipmap_init);
+module_exit(ip_set_macipmap_fini); +module_exit(ip_set_macipmap_fini);
diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_nethash.c linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/ip_set_nethash.c Index: linux-2.6.22.19/net/ipv4/netfilter/ip_set_nethash.c
--- ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_nethash.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/ip_set_nethash.c 2007-10-12 14:31:55.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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>
+ * + *
@ -6841,9 +6861,10 @@ diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_nethash.c linux-2.6.22.4.po
+ +
+module_init(ip_set_nethash_init); +module_init(ip_set_nethash_init);
+module_exit(ip_set_nethash_fini); +module_exit(ip_set_nethash_fini);
diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_portmap.c linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/ip_set_portmap.c Index: linux-2.6.22.19/net/ipv4/netfilter/ip_set_portmap.c
--- ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_portmap.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/ip_set_portmap.c 2007-10-12 14:31:55.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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>
+ * + *
@ -7191,9 +7212,10 @@ diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/ip_set_portmap.c linux-2.6.22.4.po
+ +
+module_init(ip_set_portmap_init); +module_init(ip_set_portmap_init);
+module_exit(ip_set_portmap_fini); +module_exit(ip_set_portmap_fini);
diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/ipt_set.c linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/ipt_set.c Index: linux-2.6.22.19/net/ipv4/netfilter/ipt_set.c
--- ./linux-2.6.22.4/net/ipv4/netfilter/ipt_set.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/ipt_set.c 2007-10-12 14:31:55.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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>
@ -7355,9 +7377,10 @@ diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/ipt_set.c linux-2.6.22.4.pom2patch
+ +
+module_init(ipt_ipset_init); +module_init(ipt_ipset_init);
+module_exit(ipt_ipset_fini); +module_exit(ipt_ipset_fini);
diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/ipt_SET.c linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/ipt_SET.c Index: linux-2.6.22.19/net/ipv4/netfilter/ipt_SET.c
--- ./linux-2.6.22.4/net/ipv4/netfilter/ipt_SET.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/ipt_SET.c 2007-10-12 14:31:55.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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>
@ -7531,10 +7554,11 @@ diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/ipt_SET.c linux-2.6.22.4.pom2patch
+ +
+module_init(ipt_SET_init); +module_init(ipt_SET_init);
+module_exit(ipt_SET_fini); +module_exit(ipt_SET_fini);
diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/Kconfig linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/Kconfig Index: linux-2.6.22.19/net/ipv4/netfilter/Kconfig
--- ./linux-2.6.22.4/net/ipv4/netfilter/Kconfig 2007-08-21 06:33:06.000000000 +0200 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/Kconfig 2007-10-12 14:31:55.000000000 +0200 --- linux-2.6.22.19.orig/net/ipv4/netfilter/Kconfig
@@ -402,5 +402,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.
@ -7657,18 +7681,19 @@ diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/Kconfig linux-2.6.22.4.pom2patch.s
+ +
endmenu endmenu
diff -Nru ./linux-2.6.22.4/net/ipv4/netfilter/Makefile linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/Makefile Index: linux-2.6.22.19/net/ipv4/netfilter/Makefile
--- ./linux-2.6.22.4/net/ipv4/netfilter/Makefile 2007-08-21 06:33:06.000000000 +0200 ===================================================================
+++ linux-2.6.22.4.pom2patch.set/net/ipv4/netfilter/Makefile 2007-10-12 14:31:55.000000000 +0200 --- 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
+obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o +obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o
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
# targets @@ -63,6 +64,18 @@ obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LO
@@ -62,6 +63,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

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

@ -1,6 +1,7 @@
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_time.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_time.h Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ipt_time.h
--- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_time.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_time.h 2007-05-26 20:31:03.596402160 +0200 --- /dev/null
+++ linux-2.6.22.19/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__
@ -20,9 +21,10 @@ diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_time.h linux-2.6.2
+ +
+ +
+#endif /* __ipt_time_h_included__ */ +#endif /* __ipt_time_h_included__ */
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ipt_time.c linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_time.c Index: linux-2.6.22.19/net/ipv4/netfilter/ipt_time.c
--- linux-2.6.21.1.old/net/ipv4/netfilter/ipt_time.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_time.c 2007-05-26 20:31:03.596402160 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -204,10 +206,11 @@ diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ipt_time.c linux-2.6.21.1.dev/ne
+ r->tm_mon=i; + r->tm_mon=i;
+ r->tm_mday=work-__spm[i]+1; + r->tm_mday=work-__spm[i]+1;
+} +}
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig Index: linux-2.6.22.19/net/ipv4/netfilter/Kconfig
--- linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig 2007-05-26 20:31:03.452424048 +0200 ===================================================================
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig 2007-05-26 20:31:03.597402008 +0200 --- linux-2.6.22.19.orig/net/ipv4/netfilter/Kconfig
@@ -96,6 +96,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.
@ -230,10 +233,11 @@ diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig linux-2.6.21.1.dev/net/i
config IP_NF_MATCH_RECENT config IP_NF_MATCH_RECENT
tristate "recent match support" tristate "recent match support"
depends on IP_NF_IPTABLES depends on IP_NF_IPTABLES
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Makefile linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile Index: linux-2.6.22.19/net/ipv4/netfilter/Makefile
--- linux-2.6.21.1.old/net/ipv4/netfilter/Makefile 2007-05-26 20:31:03.452424048 +0200 ===================================================================
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile 2007-05-26 20:31:03.597402008 +0200 --- 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

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

@ -1,7 +1,7 @@
Index: linux-2.6.22-rc6/drivers/net/imq.c Index: linux-2.6.22.19/drivers/net/imq.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.6.22-rc6/drivers/net/imq.c 2007-07-02 07:26:41.305182000 +0200 +++ linux-2.6.22.19/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 +405,11 @@ Index: linux-2.6.22-rc6/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-rc6/drivers/net/Kconfig Index: linux-2.6.22.19/drivers/net/Kconfig
=================================================================== ===================================================================
--- linux-2.6.22-rc6.orig/drivers/net/Kconfig 2007-07-02 07:26:15.155547750 +0200 --- linux-2.6.22.19.orig/drivers/net/Kconfig
+++ linux-2.6.22-rc6/drivers/net/Kconfig 2007-07-02 07:26:41.309182250 +0200 +++ linux-2.6.22.19/drivers/net/Kconfig
@@ -96,6 +96,129 @@ @@ -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 +539,11 @@ Index: linux-2.6.22-rc6/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-rc6/drivers/net/Makefile Index: linux-2.6.22.19/drivers/net/Makefile
=================================================================== ===================================================================
--- linux-2.6.22-rc6.orig/drivers/net/Makefile 2007-07-02 07:26:15.163548250 +0200 --- linux-2.6.22.19.orig/drivers/net/Makefile
+++ linux-2.6.22-rc6/drivers/net/Makefile 2007-07-02 07:26:41.309182250 +0200 +++ linux-2.6.22.19/drivers/net/Makefile
@@ -124,6 +124,7 @@ @@ -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 +551,10 @@ Index: linux-2.6.22-rc6/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-rc6/include/linux/imq.h Index: linux-2.6.22.19/include/linux/imq.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.6.22-rc6/include/linux/imq.h 2007-07-02 07:26:41.333183750 +0200 +++ linux-2.6.22.19/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 +565,10 @@ Index: linux-2.6.22-rc6/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-rc6/include/linux/netfilter_ipv4/ipt_IMQ.h Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ipt_IMQ.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.6.22-rc6/include/linux/netfilter_ipv4/ipt_IMQ.h 2007-07-02 07:26:41.357185250 +0200 +++ linux-2.6.22.19/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 +578,10 @@ Index: linux-2.6.22-rc6/include/linux/netfilter_ipv4/ipt_IMQ.h
+}; +};
+ +
+#endif /* _IPT_IMQ_H */ +#endif /* _IPT_IMQ_H */
Index: linux-2.6.22-rc6/include/linux/netfilter_ipv6/ip6t_IMQ.h Index: linux-2.6.22.19/include/linux/netfilter_ipv6/ip6t_IMQ.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.6.22-rc6/include/linux/netfilter_ipv6/ip6t_IMQ.h 2007-07-02 07:26:41.385187000 +0200 +++ linux-2.6.22.19/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 +591,11 @@ Index: linux-2.6.22-rc6/include/linux/netfilter_ipv6/ip6t_IMQ.h
+}; +};
+ +
+#endif /* _IP6T_IMQ_H */ +#endif /* _IP6T_IMQ_H */
Index: linux-2.6.22-rc6/include/linux/skbuff.h Index: linux-2.6.22.19/include/linux/skbuff.h
=================================================================== ===================================================================
--- linux-2.6.22-rc6.orig/include/linux/skbuff.h 2007-07-02 07:26:15.199550500 +0200 --- linux-2.6.22.19.orig/include/linux/skbuff.h
+++ linux-2.6.22-rc6/include/linux/skbuff.h 2007-07-02 07:26:41.405188250 +0200 +++ linux-2.6.22.19/include/linux/skbuff.h
@@ -285,6 +285,10 @@ @@ -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 +606,10 @@ Index: linux-2.6.22-rc6/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-rc6/net/core/dev.c Index: linux-2.6.22.19/net/core/dev.c
=================================================================== ===================================================================
--- linux-2.6.22-rc6.orig/net/core/dev.c 2007-07-02 07:26:15.207551000 +0200 --- linux-2.6.22.19.orig/net/core/dev.c
+++ linux-2.6.22-rc6/net/core/dev.c 2007-07-02 07:28:00.814151000 +0200 +++ 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 +620,7 @@ Index: linux-2.6.22-rc6/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 @@ @@ -1404,6 +1407,9 @@ int dev_hard_start_xmit(struct sk_buff *
{ {
if (likely(!skb->next)) { if (likely(!skb->next)) {
if (!list_empty(&ptype_all)) if (!list_empty(&ptype_all))
@ -630,11 +630,11 @@ Index: linux-2.6.22-rc6/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-rc6/net/core/skbuff.c Index: linux-2.6.22.19/net/core/skbuff.c
=================================================================== ===================================================================
--- linux-2.6.22-rc6.orig/net/core/skbuff.c 2007-06-25 01:21:48.000000000 +0200 --- linux-2.6.22.19.orig/net/core/skbuff.c
+++ linux-2.6.22-rc6/net/core/skbuff.c 2007-07-02 08:18:13.558435750 +0200 +++ linux-2.6.22.19/net/core/skbuff.c
@@ -419,6 +419,10 @@ @@ -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 +645,7 @@ Index: linux-2.6.22-rc6/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 @@ @@ -485,6 +489,10 @@ static void copy_skb_header(struct sk_bu
#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 +656,10 @@ Index: linux-2.6.22-rc6/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-rc6/net/ipv4/netfilter/ipt_IMQ.c Index: linux-2.6.22.19/net/ipv4/netfilter/ipt_IMQ.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.6.22-rc6/net/ipv4/netfilter/ipt_IMQ.c 2007-07-02 07:26:41.493193750 +0200 +++ linux-2.6.22.19/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 +730,11 @@ Index: linux-2.6.22-rc6/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-rc6/net/ipv4/netfilter/Kconfig Index: linux-2.6.22.19/net/ipv4/netfilter/Kconfig
=================================================================== ===================================================================
--- linux-2.6.22-rc6.orig/net/ipv4/netfilter/Kconfig 2007-07-02 07:26:15.223552000 +0200 --- linux-2.6.22.19.orig/net/ipv4/netfilter/Kconfig
+++ linux-2.6.22-rc6/net/ipv4/netfilter/Kconfig 2007-07-02 08:16:57.545685250 +0200 +++ linux-2.6.22.19/net/ipv4/netfilter/Kconfig
@@ -351,6 +351,17 @@ @@ -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 +752,11 @@ Index: linux-2.6.22-rc6/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-rc6/net/ipv4/netfilter/Makefile Index: linux-2.6.22.19/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.6.22-rc6.orig/net/ipv4/netfilter/Makefile 2007-07-02 07:26:15.235552750 +0200 --- linux-2.6.22.19.orig/net/ipv4/netfilter/Makefile
+++ linux-2.6.22-rc6/net/ipv4/netfilter/Makefile 2007-07-02 08:16:57.557686000 +0200 +++ linux-2.6.22.19/net/ipv4/netfilter/Makefile
@@ -58,6 +58,7 @@ @@ -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 +764,10 @@ Index: linux-2.6.22-rc6/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-rc6/net/ipv6/netfilter/ip6t_IMQ.c Index: linux-2.6.22.19/net/ipv6/netfilter/ip6t_IMQ.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.6.22-rc6/net/ipv6/netfilter/ip6t_IMQ.c 2007-07-02 07:26:41.593200000 +0200 +++ linux-2.6.22.19/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 +838,11 @@ Index: linux-2.6.22-rc6/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-rc6/net/ipv6/netfilter/Kconfig Index: linux-2.6.22.19/net/ipv6/netfilter/Kconfig
=================================================================== ===================================================================
--- linux-2.6.22-rc6.orig/net/ipv6/netfilter/Kconfig 2007-07-02 07:26:15.247553500 +0200 --- linux-2.6.22.19.orig/net/ipv6/netfilter/Kconfig
+++ linux-2.6.22-rc6/net/ipv6/netfilter/Kconfig 2007-07-02 08:16:57.581687500 +0200 +++ linux-2.6.22.19/net/ipv6/netfilter/Kconfig
@@ -173,6 +173,15 @@ @@ -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 +858,11 @@ Index: linux-2.6.22-rc6/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-rc6/net/ipv6/netfilter/Makefile Index: linux-2.6.22.19/net/ipv6/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.6.22-rc6.orig/net/ipv6/netfilter/Makefile 2007-07-02 07:26:15.259554250 +0200 --- linux-2.6.22.19.orig/net/ipv6/netfilter/Makefile
+++ linux-2.6.22-rc6/net/ipv6/netfilter/Makefile 2007-07-02 08:16:57.597688500 +0200 +++ linux-2.6.22.19/net/ipv6/netfilter/Makefile
@@ -13,6 +13,7 @@ @@ -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 +870,11 @@ Index: linux-2.6.22-rc6/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-rc6/net/sched/sch_generic.c Index: linux-2.6.22.19/net/sched/sch_generic.c
=================================================================== ===================================================================
--- linux-2.6.22-rc6.orig/net/sched/sch_generic.c 2007-07-02 07:26:15.271555000 +0200 --- linux-2.6.22.19.orig/net/sched/sch_generic.c
+++ linux-2.6.22-rc6/net/sched/sch_generic.c 2007-07-02 07:26:41.665204500 +0200 +++ linux-2.6.22.19/net/sched/sch_generic.c
@@ -77,7 +77,6 @@ @@ -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 +882,7 @@ Index: linux-2.6.22-rc6/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 @@ @@ -177,6 +176,11 @@ out:
return q->q.qlen; return q->q.qlen;
} }
@ -894,7 +894,7 @@ Index: linux-2.6.22-rc6/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 @@ @@ -608,3 +612,4 @@ EXPORT_SYMBOL(qdisc_destroy);
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);

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

@ -1,6 +1,7 @@
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_ROUTE.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_ROUTE.h Index: linux-2.6.22.19/include/linux/netfilter_ipv4/ipt_ROUTE.h
--- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_ROUTE.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_ROUTE.h 2007-05-26 20:37:08.971856648 +0200 --- /dev/null
+++ linux-2.6.22.19/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
+ * + *
@ -25,9 +26,10 @@ diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_ROUTE.h linux-2.6.
+#define IPT_ROUTE_TEE 0x02 +#define IPT_ROUTE_TEE 0x02
+ +
+#endif /*_IPT_ROUTE_H_target*/ +#endif /*_IPT_ROUTE_H_target*/
diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv6/ip6t_ROUTE.h linux-2.6.21.1.dev/include/linux/netfilter_ipv6/ip6t_ROUTE.h Index: linux-2.6.22.19/include/linux/netfilter_ipv6/ip6t_ROUTE.h
--- linux-2.6.21.1.old/include/linux/netfilter_ipv6/ip6t_ROUTE.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv6/ip6t_ROUTE.h 2007-05-26 20:37:09.001852088 +0200 --- /dev/null
+++ linux-2.6.22.19/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
+ * + *
@ -52,9 +54,10 @@ diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv6/ip6t_ROUTE.h linux-2.6
+#define IP6T_ROUTE_TEE 0x02 +#define IP6T_ROUTE_TEE 0x02
+ +
+#endif /*_IP6T_ROUTE_H_target*/ +#endif /*_IP6T_ROUTE_H_target*/
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ipt_ROUTE.c linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_ROUTE.c Index: linux-2.6.22.19/net/ipv4/netfilter/ipt_ROUTE.c
--- linux-2.6.21.1.old/net/ipv4/netfilter/ipt_ROUTE.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_ROUTE.c 2007-05-26 20:37:09.001852088 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -539,10 +542,11 @@ diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ipt_ROUTE.c linux-2.6.21.1.dev/n
+ +
+module_init(init); +module_init(init);
+module_exit(fini); +module_exit(fini);
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig Index: linux-2.6.22.19/net/ipv4/netfilter/Kconfig
--- linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig 2007-05-26 20:37:08.734892672 +0200 ===================================================================
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig 2007-05-26 20:37:09.002851936 +0200 --- linux-2.6.22.19.orig/net/ipv4/netfilter/Kconfig
@@ -562,5 +562,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.
@ -565,10 +569,11 @@ diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig linux-2.6.21.1.dev/net/i
+ +
endmenu endmenu
diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Makefile linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile Index: linux-2.6.22.19/net/ipv4/netfilter/Makefile
--- linux-2.6.21.1.old/net/ipv4/netfilter/Makefile 2007-05-26 20:37:08.735892520 +0200 ===================================================================
+++ linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile 2007-05-26 20:37:09.002851936 +0200 --- linux-2.6.22.19.orig/net/ipv4/netfilter/Makefile
@@ -61,6 +61,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
@ -576,10 +581,11 @@ diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Makefile linux-2.6.21.1.dev/net/
obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o obj-$(CONFIG_IP_NF_TARGET_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
diff -urN linux-2.6.21.1.old/net/ipv6/ndisc.c linux-2.6.21.1.dev/net/ipv6/ndisc.c Index: linux-2.6.22.19/net/ipv6/ndisc.c
--- linux-2.6.21.1.old/net/ipv6/ndisc.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/net/ipv6/ndisc.c 2007-05-26 20:37:09.003851784 +0200 --- 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,
}; };
@ -588,9 +594,10 @@ diff -urN linux-2.6.21.1.old/net/ipv6/ndisc.c linux-2.6.21.1.dev/net/ipv6/ndisc.
/* 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];
diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/ip6t_ROUTE.c linux-2.6.21.1.dev/net/ipv6/netfilter/ip6t_ROUTE.c Index: linux-2.6.22.19/net/ipv6/netfilter/ip6t_ROUTE.c
--- linux-2.6.21.1.old/net/ipv6/netfilter/ip6t_ROUTE.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/net/ipv6/netfilter/ip6t_ROUTE.c 2007-05-26 20:37:09.003851784 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -922,10 +929,11 @@ diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/ip6t_ROUTE.c linux-2.6.21.1.dev/
+module_init(init); +module_init(init);
+module_exit(fini); +module_exit(fini);
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv6/netfilter/Kconfig Index: linux-2.6.22.19/net/ipv6/netfilter/Kconfig
--- linux-2.6.21.1.old/net/ipv6/netfilter/Kconfig 2007-05-26 20:37:08.809881272 +0200 ===================================================================
+++ linux-2.6.21.1.dev/net/ipv6/netfilter/Kconfig 2007-05-26 20:37:09.003851784 +0200 --- 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'.
@ -944,10 +952,11 @@ diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/Kconfig linux-2.6.21.1.dev/net/i
+ +
endmenu endmenu
diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/Makefile linux-2.6.21.1.dev/net/ipv6/netfilter/Makefile Index: linux-2.6.22.19/net/ipv6/netfilter/Makefile
--- linux-2.6.21.1.old/net/ipv6/netfilter/Makefile 2007-05-26 20:37:08.809881272 +0200 ===================================================================
+++ linux-2.6.21.1.dev/net/ipv6/netfilter/Makefile 2007-05-26 20:37:09.003851784 +0200 --- 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

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

@ -1,17 +1,17 @@
Index: linux-2.6.22.18/include/linux/netfilter/oot_conntrack.h Index: linux-2.6.22.19/include/linux/netfilter/oot_conntrack.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.18/include/linux/netfilter/oot_conntrack.h +++ linux-2.6.22.19/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.18/include/linux/netfilter/oot_trans.h Index: linux-2.6.22.19/include/linux/netfilter/oot_trans.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.18/include/linux/netfilter/oot_trans.h +++ linux-2.6.22.19/include/linux/netfilter/oot_trans.h
@@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
+/* Out of tree workarounds */ +/* Out of tree workarounds */
+#include <linux/version.h> +#include <linux/version.h>
@ -27,10 +27,10 @@ Index: linux-2.6.22.18/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.18/include/linux/netfilter/xt_CHAOS.h Index: linux-2.6.22.19/include/linux/netfilter/xt_CHAOS.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.18/include/linux/netfilter/xt_CHAOS.h +++ linux-2.6.22.19/include/linux/netfilter/xt_CHAOS.h
@@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
+#ifndef _LINUX_NETFILTER_XT_CHAOS_H +#ifndef _LINUX_NETFILTER_XT_CHAOS_H
+#define _LINUX_NETFILTER_XT_CHAOS_H 1 +#define _LINUX_NETFILTER_XT_CHAOS_H 1
@ -46,10 +46,10 @@ Index: linux-2.6.22.18/include/linux/netfilter/xt_CHAOS.h
+}; +};
+ +
+#endif /* _LINUX_NETFILTER_XT_CHAOS_H */ +#endif /* _LINUX_NETFILTER_XT_CHAOS_H */
Index: linux-2.6.22.18/include/linux/netfilter/xt_portscan.h Index: linux-2.6.22.19/include/linux/netfilter/xt_portscan.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.18/include/linux/netfilter/xt_portscan.h +++ linux-2.6.22.19/include/linux/netfilter/xt_portscan.h
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
+#ifndef _LINUX_NETFILTER_XT_PORTSCAN_H +#ifndef _LINUX_NETFILTER_XT_PORTSCAN_H
+#define _LINUX_NETFILTER_XT_PORTSCAN_H 1 +#define _LINUX_NETFILTER_XT_PORTSCAN_H 1
@ -59,10 +59,10 @@ Index: linux-2.6.22.18/include/linux/netfilter/xt_portscan.h
+}; +};
+ +
+#endif /* _LINUX_NETFILTER_XT_PORTSCAN_H */ +#endif /* _LINUX_NETFILTER_XT_PORTSCAN_H */
Index: linux-2.6.22.18/net/netfilter/find_match.c Index: linux-2.6.22.19/net/netfilter/find_match.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.18/net/netfilter/find_match.c +++ linux-2.6.22.19/net/netfilter/find_match.c
@@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
+/* +/*
+ xt_request_find_match + xt_request_find_match
@ -103,10 +103,10 @@ Index: linux-2.6.22.18/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.18/net/netfilter/Kconfig Index: linux-2.6.22.19/net/netfilter/Kconfig
=================================================================== ===================================================================
--- linux-2.6.22.18.orig/net/netfilter/Kconfig --- linux-2.6.22.19.orig/net/netfilter/Kconfig
+++ linux-2.6.22.18/net/netfilter/Kconfig +++ linux-2.6.22.19/net/netfilter/Kconfig
@@ -255,6 +255,14 @@ config NETFILTER_XTABLES @@ -255,6 +255,14 @@ config NETFILTER_XTABLES
# alphabetically ordered list of targets # alphabetically ordered list of targets
@ -152,10 +152,10 @@ Index: linux-2.6.22.18/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.18/net/netfilter/Makefile Index: linux-2.6.22.19/net/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.6.22.18.orig/net/netfilter/Makefile --- linux-2.6.22.19.orig/net/netfilter/Makefile
+++ linux-2.6.22.18/net/netfilter/Makefile +++ linux-2.6.22.19/net/netfilter/Makefile
@@ -47,6 +47,8 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK @@ -47,6 +47,8 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK
obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o
obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o
@ -170,10 +170,10 @@ Index: linux-2.6.22.18/net/netfilter/Makefile
obj-$(CONFIG_NETFILTER_XT_MATCH_PHYSDEV) += xt_physdev.o obj-$(CONFIG_NETFILTER_XT_MATCH_PHYSDEV) += xt_physdev.o
obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
+obj-$(CONFIG_NETFILTER_XT_MATCH_PORTSCAN) += xt_portscan.o +obj-$(CONFIG_NETFILTER_XT_MATCH_PORTSCAN) += xt_portscan.o
Index: linux-2.6.22.18/net/netfilter/xt_CHAOS.c Index: linux-2.6.22.19/net/netfilter/xt_CHAOS.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.18/net/netfilter/xt_CHAOS.c +++ linux-2.6.22.19/net/netfilter/xt_CHAOS.c
@@ -0,0 +1,200 @@ @@ -0,0 +1,200 @@
+/* +/*
+ * CHAOS target for netfilter + * CHAOS target for netfilter
@ -375,10 +375,10 @@ Index: linux-2.6.22.18/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.18/net/netfilter/xt_DELUDE.c Index: linux-2.6.22.19/net/netfilter/xt_DELUDE.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.18/net/netfilter/xt_DELUDE.c +++ linux-2.6.22.19/net/netfilter/xt_DELUDE.c
@@ -0,0 +1,197 @@ @@ -0,0 +1,197 @@
+/* +/*
+ * DELUDE target + * DELUDE target
@ -577,10 +577,10 @@ Index: linux-2.6.22.18/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.18/net/netfilter/xt_portscan.c Index: linux-2.6.22.19/net/netfilter/xt_portscan.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.18/net/netfilter/xt_portscan.c +++ linux-2.6.22.19/net/netfilter/xt_portscan.c
@@ -0,0 +1,269 @@ @@ -0,0 +1,269 @@
+/* +/*
+ * portscan match for netfilter + * portscan match for netfilter
@ -851,10 +851,10 @@ Index: linux-2.6.22.18/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.18/drivers/char/random.c Index: linux-2.6.22.19/drivers/char/random.c
=================================================================== ===================================================================
--- linux-2.6.22.18.orig/drivers/char/random.c --- linux-2.6.22.19.orig/drivers/char/random.c
+++ linux-2.6.22.18/drivers/char/random.c +++ linux-2.6.22.19/drivers/char/random.c
@@ -1564,6 +1564,8 @@ __u32 secure_tcp_sequence_number(__be32 @@ -1564,6 +1564,8 @@ __u32 secure_tcp_sequence_number(__be32
return seq; return seq;
} }

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

@ -1,7 +1,7 @@
Index: linux-2.6.22.18/net/netfilter/Kconfig Index: linux-2.6.22.19/net/netfilter/Kconfig
=================================================================== ===================================================================
--- linux-2.6.22.18.orig/net/netfilter/Kconfig --- linux-2.6.22.19.orig/net/netfilter/Kconfig
+++ linux-2.6.22.18/net/netfilter/Kconfig +++ linux-2.6.22.19/net/netfilter/Kconfig
@@ -379,6 +379,23 @@ config NETFILTER_XT_TARGET_CONNSECMARK @@ -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,10 +26,10 @@ Index: linux-2.6.22.18/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.18/net/netfilter/Makefile Index: linux-2.6.22.19/net/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.6.22.18.orig/net/netfilter/Makefile --- linux-2.6.22.19.orig/net/netfilter/Makefile
+++ linux-2.6.22.18/net/netfilter/Makefile +++ linux-2.6.22.19/net/netfilter/Makefile
@@ -45,6 +45,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE @@ -45,6 +45,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE
obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o
obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_NOTRACK.o obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_NOTRACK.o
@ -38,10 +38,10 @@ Index: linux-2.6.22.18/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.18/net/netfilter/xt_TARPIT.c Index: linux-2.6.22.19/net/netfilter/xt_TARPIT.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.22.18/net/netfilter/xt_TARPIT.c +++ linux-2.6.22.19/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,6 +1,8 @@
--- linux.old/net/netfilter/Kconfig 2007-05-26 20:05:39.270134976 +0200 Index: linux-2.6.22.19/net/netfilter/Kconfig
+++ linux.dev/net/netfilter/Kconfig 2007-05-26 20:12:44.258526920 +0200 ===================================================================
@@ -133,7 +133,7 @@ --- linux-2.6.22.19.orig/net/netfilter/Kconfig
+++ 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)"
@ -9,7 +11,7 @@
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
@@ -381,7 +381,7 @@ @@ -398,7 +398,7 @@ config NETFILTER_XT_TARGET_TARPIT
config NETFILTER_XT_TARGET_TCPMSS config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support' tristate '"TCPMSS" target support'

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

@ -1,6 +1,7 @@
diff -urN linux-2.6.21-rc7/include/linux/netfilter/nf_conntrack_rtsp.h linux-2.6.21-rc7.rtsp/include/linux/netfilter/nf_conntrack_rtsp.h Index: linux-2.6.22.19/include/linux/netfilter/nf_conntrack_rtsp.h
--- linux-2.6.21-rc7/include/linux/netfilter/nf_conntrack_rtsp.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21-rc7.rtsp/include/linux/netfilter/nf_conntrack_rtsp.h 2007-04-16 14:07:06.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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.
@ -65,9 +66,10 @@ diff -urN linux-2.6.21-rc7/include/linux/netfilter/nf_conntrack_rtsp.h linux-2.6
+#endif /* __KERNEL__ */ +#endif /* __KERNEL__ */
+ +
+#endif /* _IP_CONNTRACK_RTSP_H */ +#endif /* _IP_CONNTRACK_RTSP_H */
diff -urN linux-2.6.21-rc7/include/linux/netfilter_helpers.h linux-2.6.21-rc7.rtsp/include/linux/netfilter_helpers.h Index: linux-2.6.22.19/include/linux/netfilter_helpers.h
--- linux-2.6.21-rc7/include/linux/netfilter_helpers.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21-rc7.rtsp/include/linux/netfilter_helpers.h 2007-04-15 00:34:57.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -202,9 +204,10 @@ diff -urN linux-2.6.21-rc7/include/linux/netfilter_helpers.h linux-2.6.21-rc7.rt
+#endif /* __KERNEL__ */ +#endif /* __KERNEL__ */
+ +
+#endif /* _NETFILTER_HELPERS_H */ +#endif /* _NETFILTER_HELPERS_H */
diff -urN linux-2.6.21-rc7/include/linux/netfilter_mime.h linux-2.6.21-rc7.rtsp/include/linux/netfilter_mime.h Index: linux-2.6.22.19/include/linux/netfilter_mime.h
--- linux-2.6.21-rc7/include/linux/netfilter_mime.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21-rc7.rtsp/include/linux/netfilter_mime.h 2007-04-15 00:34:57.000000000 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -295,10 +298,11 @@ diff -urN linux-2.6.21-rc7/include/linux/netfilter_mime.h linux-2.6.21-rc7.rtsp/
+#endif /* __KERNEL__ */ +#endif /* __KERNEL__ */
+ +
+#endif /* _NETFILTER_MIME_H */ +#endif /* _NETFILTER_MIME_H */
diff -urN linux-2.6.21-rc7/net/ipv4/netfilter/Makefile linux-2.6.21-rc7.rtsp/net/ipv4/netfilter/Makefile Index: linux-2.6.22.19/net/ipv4/netfilter/Makefile
--- linux-2.6.21-rc7/net/ipv4/netfilter/Makefile 2007-04-18 23:26:10.000000000 +0200 ===================================================================
+++ linux-2.6.21-rc7.rtsp/net/ipv4/netfilter/Makefile 2007-04-18 21:17:33.000000000 +0200 --- linux-2.6.22.19.orig/net/ipv4/netfilter/Makefile
@@ -64,6 +66,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
@ -306,10 +310,11 @@ diff -urN linux-2.6.21-rc7/net/ipv4/netfilter/Makefile linux-2.6.21-rc7.rtsp/net
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
diff -urN linux-2.6.21-rc7/net/netfilter/Kconfig linux-2.6.21-rc7.rtsp/net/netfilter/Kconfig Index: linux-2.6.22.19/net/netfilter/Kconfig
--- linux-2.6.21-rc7/net/netfilter/Kconfig 2007-04-18 23:26:10.000000000 +0200 ===================================================================
+++ linux-2.6.21-rc7.rtsp/net/netfilter/Kconfig 2007-04-18 22:25:13.000000000 +0200 --- linux-2.6.22.19.orig/net/netfilter/Kconfig
@@ -271,6 +272,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.
@ -326,10 +331,11 @@ diff -urN linux-2.6.21-rc7/net/netfilter/Kconfig linux-2.6.21-rc7.rtsp/net/netfi
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
diff -urN linux-2.6.21-rc7/net/netfilter/Makefile linux-2.6.21-rc7.rtsp/net/netfilter/Makefile Index: linux-2.6.22.19/net/netfilter/Makefile
--- linux-2.6.21-rc7/net/netfilter/Makefile 2007-04-18 23:26:10.000000000 +0200 ===================================================================
+++ linux-2.6.21-rc7.rtsp/net/netfilter/Makefile 2007-04-18 21:17:33.000000000 +0200 --- 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
@ -337,9 +343,11 @@ diff -urN linux-2.6.21-rc7/net/netfilter/Makefile linux-2.6.21-rc7.rtsp/net/netf
# 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
--- linux-2.6.22.1/net/ipv4/netfilter/Kconfig.orig 2007-07-29 23:57:51.000000000 +0200 Index: linux-2.6.22.19/net/ipv4/netfilter/Kconfig
+++ linux-2.6.22.1/net/ipv4/netfilter/Kconfig 2007-07-30 00:00:19.000000000 +0200 ===================================================================
@@ -274,6 +274,11 @@ --- linux-2.6.22.19.orig/net/ipv4/netfilter/Kconfig
+++ 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
@ -351,8 +359,10 @@ diff -urN linux-2.6.21-rc7/net/netfilter/Makefile linux-2.6.21-rc7.rtsp/net/netf
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
--- linux-2.6.22.1/net/netfilter/nf_conntrack_rtsp.c.orig 2007-07-30 17:37:14.000000000 +0200 Index: linux-2.6.22.19/net/netfilter/nf_conntrack_rtsp.c
+++ linux-2.6.22.1/net/netfilter/nf_conntrack_rtsp.c 2007-07-30 00:03:07.000000000 +0200 ===================================================================
--- /dev/null
+++ linux-2.6.22.19/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
@ -869,8 +879,10 @@ diff -urN linux-2.6.21-rc7/net/netfilter/Makefile linux-2.6.21-rc7.rtsp/net/netf
+ +
+EXPORT_SYMBOL(nf_nat_rtsp_hook_expectfn); +EXPORT_SYMBOL(nf_nat_rtsp_hook_expectfn);
+ +
--- linux-2.6.22.1/net/ipv4/netfilter/nf_nat_rtsp.c.orig 2007-07-30 17:35:02.000000000 +0200 Index: linux-2.6.22.19/net/ipv4/netfilter/nf_nat_rtsp.c
+++ linux-2.6.22.1/net/ipv4/netfilter/nf_nat_rtsp.c 2007-07-30 00:05:28.000000000 +0200 ===================================================================
--- /dev/null
+++ linux-2.6.22.19/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

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

@ -1,7 +1,8 @@
diff -urN linux-2.6.21.1.old/include/linux/pkt_sched.h linux-2.6.21.1.dev/include/linux/pkt_sched.h Index: linux-2.6.22.19/include/linux/pkt_sched.h
--- linux-2.6.21.1.old/include/linux/pkt_sched.h 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/include/linux/pkt_sched.h 2007-05-26 20:43:12.530587320 +0200 --- 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.
@ -42,10 +43,11 @@ diff -urN linux-2.6.21.1.old/include/linux/pkt_sched.h linux-2.6.21.1.dev/includ
/* RED section */ /* RED section */
enum enum
diff -urN linux-2.6.21.1.old/net/sched/Kconfig linux-2.6.21.1.dev/net/sched/Kconfig Index: linux-2.6.22.19/net/sched/Kconfig
--- linux-2.6.21.1.old/net/sched/Kconfig 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/net/sched/Kconfig 2007-05-26 20:43:12.572580936 +0200 --- 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.
@ -72,10 +74,11 @@ diff -urN linux-2.6.21.1.old/net/sched/Kconfig linux-2.6.21.1.dev/net/sched/Kcon
config NET_SCH_TEQL config NET_SCH_TEQL
tristate "True Link Equalizer (TEQL)" tristate "True Link Equalizer (TEQL)"
---help--- ---help---
diff -urN linux-2.6.21.1.old/net/sched/Makefile linux-2.6.21.1.dev/net/sched/Makefile Index: linux-2.6.22.19/net/sched/Makefile
--- linux-2.6.21.1.old/net/sched/Makefile 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/net/sched/Makefile 2007-05-26 20:43:12.577580176 +0200 --- 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
@ -83,9 +86,10 @@ diff -urN linux-2.6.21.1.old/net/sched/Makefile linux-2.6.21.1.dev/net/sched/Mak
obj-$(CONFIG_NET_SCH_TBF) += sch_tbf.o obj-$(CONFIG_NET_SCH_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
diff -urN linux-2.6.21.1.old/net/sched/sch_esfq.c linux-2.6.21.1.dev/net/sched/sch_esfq.c Index: linux-2.6.22.19/net/sched/sch_esfq.c
--- linux-2.6.21.1.old/net/sched/sch_esfq.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/net/sched/sch_esfq.c 2007-05-26 20:43:12.578580024 +0200 --- /dev/null
+++ linux-2.6.22.19/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.

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

@ -1,7 +1,8 @@
diff -urN linux-2.6.21.1.old/include/linux/rtnetlink.h linux-2.6.21.1.dev/include/linux/rtnetlink.h Index: linux-2.6.22.19/include/linux/rtnetlink.h
--- linux-2.6.21.1.old/include/linux/rtnetlink.h 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/include/linux/rtnetlink.h 2007-05-26 20:46:11.883321560 +0200 --- 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 */
@ -10,10 +11,11 @@ diff -urN linux-2.6.21.1.old/include/linux/rtnetlink.h linux-2.6.21.1.dev/includ
/* Macros to handle hexthops */ /* Macros to handle hexthops */
diff -urN linux-2.6.21.1.old/include/net/flow.h linux-2.6.21.1.dev/include/net/flow.h Index: linux-2.6.22.19/include/net/flow.h
--- linux-2.6.21.1.old/include/net/flow.h 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/include/net/flow.h 2007-05-26 20:46:11.922315632 +0200 --- 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;
@ -22,7 +24,7 @@ diff -urN linux-2.6.21.1.old/include/net/flow.h linux-2.6.21.1.dev/include/net/f
__u8 tos; __u8 tos;
__u8 scope; __u8 scope;
} ip4_u; } ip4_u;
@@ -43,6 +45,8 @@ @@ -43,6 +45,8 @@ struct flowi {
#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
@ -31,10 +33,11 @@ diff -urN linux-2.6.21.1.old/include/net/flow.h linux-2.6.21.1.dev/include/net/f
#define fl4_tos nl_u.ip4_u.tos #define fl4_tos nl_u.ip4_u.tos
#define fl4_scope nl_u.ip4_u.scope #define fl4_scope nl_u.ip4_u.scope
diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.c Index: linux-2.6.22.19/net/ipv4/route.c
--- linux-2.6.21.1.old/net/ipv4/route.c 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/net/ipv4/route.c 2007-05-26 20:46:11.967308792 +0200 --- 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;
@ -42,7 +45,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
/* Redirect received -> path was valid */ /* Redirect received -> path was valid */
dst_confirm(&rth->u.dst); dst_confirm(&rth->u.dst);
@@ -1643,6 +1644,7 @@ @@ -1643,6 +1644,7 @@ static int ip_route_input_mc(struct sk_b
rth->fl.fl4_tos = tos; rth->fl.fl4_tos = tos;
rth->fl.mark = skb->mark; rth->fl.mark = skb->mark;
rth->fl.fl4_src = saddr; rth->fl.fl4_src = saddr;
@ -50,7 +53,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
rth->rt_src = saddr; 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 @@ @@ -1653,6 +1655,7 @@ static int ip_route_input_mc(struct sk_b
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;
@ -58,7 +61,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
rth->rt_gateway = daddr; rth->rt_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 @@ @@ -1716,7 +1719,7 @@ static void ip_handle_martian_source(str
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,
@ -67,7 +70,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
struct rtable **result) struct rtable **result)
{ {
@@ -1751,6 +1754,7 @@ @@ -1751,6 +1754,7 @@ static inline int __mkroute_input(struct
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)) &&
@ -75,7 +78,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
(IN_DEV_SHARED_MEDIA(out_dev) || (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 @@ @@ -1788,6 +1792,7 @@ static inline int __mkroute_input(struct
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;
@ -83,7 +86,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
rth->rt_gateway = daddr; rth->rt_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 @@ @@ -1795,6 +1800,7 @@ static inline int __mkroute_input(struct
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;
@ -91,7 +94,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
rth->rt_spec_dst= spec_dst; rth->rt_spec_dst= spec_dst;
rth->u.dst.input = ip_forward; rth->u.dst.input = ip_forward;
@@ -1816,19 +1822,21 @@ @@ -1816,19 +1822,21 @@ static inline int ip_mkroute_input_def(s
struct fib_result* res, struct fib_result* res,
const struct flowi *fl, const struct flowi *fl,
struct in_device *in_dev, struct in_device *in_dev,
@ -116,7 +119,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
if (err) if (err)
return err; return err;
@@ -1841,7 +1849,8 @@ @@ -1841,7 +1849,8 @@ static inline int ip_mkroute_input(struc
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,
@ -126,7 +129,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
{ {
#ifdef CONFIG_IP_ROUTE_MULTIPATH_CACHED #ifdef CONFIG_IP_ROUTE_MULTIPATH_CACHED
struct rtable* rth = NULL, *rtres; struct rtable* rth = NULL, *rtres;
@@ -1857,7 +1866,7 @@ @@ -1857,7 +1866,7 @@ static inline int ip_mkroute_input(struc
/* distinguish between multipath and singlepath */ /* 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,
@ -135,7 +138,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
/* add all alternatives to the routing cache */ /* add all alternatives to the routing cache */
for (hop = 0; hop < hopcount; hop++) { for (hop = 0; hop < hopcount; hop++) {
@@ -1869,7 +1878,7 @@ @@ -1869,7 +1878,7 @@ static inline int ip_mkroute_input(struc
/* create a routing cache entry */ /* 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,
@ -144,7 +147,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
if (err) if (err)
return err; return err;
@@ -1889,7 +1898,7 @@ @@ -1889,7 +1898,7 @@ static inline int ip_mkroute_input(struc
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 */
@ -153,7 +156,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
#endif /* CONFIG_IP_ROUTE_MULTIPATH_CACHED */ #endif /* CONFIG_IP_ROUTE_MULTIPATH_CACHED */
} }
@@ -1905,18 +1914,18 @@ @@ -1905,18 +1914,18 @@ static inline int ip_mkroute_input(struc
*/ */
static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr, static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
@ -175,7 +178,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
unsigned flags = 0; unsigned flags = 0;
u32 itag = 0; u32 itag = 0;
struct rtable * rth; struct rtable * rth;
@@ -1949,6 +1958,12 @@ @@ -1949,6 +1958,12 @@ static int ip_route_input_slow(struct sk
if (BADCLASS(daddr) || ZERONET(daddr) || LOOPBACK(daddr)) if (BADCLASS(daddr) || ZERONET(daddr) || LOOPBACK(daddr))
goto martian_destination; goto martian_destination;
@ -188,7 +191,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
/* /*
* Now we are ready to route packet. * Now we are ready to route packet.
*/ */
@@ -1958,6 +1973,10 @@ @@ -1958,6 +1973,10 @@ static int ip_route_input_slow(struct sk
goto no_route; goto no_route;
} }
free_res = 1; free_res = 1;
@ -199,7 +202,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
RT_CACHE_STAT_INC(in_slow_tot); RT_CACHE_STAT_INC(in_slow_tot);
@@ -1982,7 +2001,7 @@ @@ -1982,7 +2001,7 @@ static int ip_route_input_slow(struct sk
if (res.type != RTN_UNICAST) if (res.type != RTN_UNICAST)
goto martian_destination; goto martian_destination;
@ -208,7 +211,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
if (err == -ENOBUFS) if (err == -ENOBUFS)
goto e_nobufs; goto e_nobufs;
if (err == -EINVAL) if (err == -EINVAL)
@@ -1997,6 +2016,8 @@ @@ -1997,6 +2016,8 @@ out: return err;
brd_input: brd_input:
if (skb->protocol != htons(ETH_P_IP)) if (skb->protocol != htons(ETH_P_IP))
goto e_inval; goto e_inval;
@ -217,7 +220,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
if (ZERONET(saddr)) 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 @@ @@ -2037,6 +2058,7 @@ local_input:
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);
@ -225,7 +228,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
rth->rt_gateway = daddr; rth->rt_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 @@ @@ -2086,8 +2108,9 @@ martian_source:
goto e_inval; goto e_inval;
} }
@ -237,7 +240,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
{ {
struct rtable * rth; struct rtable * rth;
unsigned hash; unsigned hash;
@@ -2102,6 +2125,7 @@ @@ -2102,6 +2125,7 @@ int ip_route_input(struct sk_buff *skb,
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 &&
@ -245,7 +248,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
rth->fl.oif == 0 && rth->fl.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 @@ @@ -2148,7 +2172,19 @@ int ip_route_input(struct sk_buff *skb,
rcu_read_unlock(); rcu_read_unlock();
return -EINVAL; return -EINVAL;
} }
@ -266,7 +269,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
} }
static inline int __mkroute_output(struct rtable **result, static inline int __mkroute_output(struct rtable **result,
@@ -2227,6 +2263,7 @@ @@ -2227,6 +2263,7 @@ static inline int __mkroute_output(struc
rth->fl.fl4_tos = tos; rth->fl.fl4_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;
@ -274,7 +277,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
rth->fl.mark = oldflp->mark; rth->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 @@ @@ -2367,6 +2404,7 @@ static int ip_route_output_slow(struct r
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,
@ -282,7 +285,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
.tos = tos & IPTOS_RT_MASK, .tos = tos & IPTOS_RT_MASK,
.scope = ((tos & RTO_ONLINK) ? .scope = ((tos & RTO_ONLINK) ?
RT_SCOPE_LINK : RT_SCOPE_LINK :
@@ -2470,6 +2508,7 @@ @@ -2470,6 +2508,7 @@ static int ip_route_output_slow(struct r
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;
@ -290,7 +293,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
res.type = RTN_LOCAL; res.type = RTN_LOCAL;
flags |= RTCF_LOCAL; flags |= RTCF_LOCAL;
goto make_route; goto make_route;
@@ -2477,7 +2516,7 @@ @@ -2477,7 +2516,7 @@ static int ip_route_output_slow(struct r
if (fib_lookup(&fl, &res)) { if (fib_lookup(&fl, &res)) {
res.fi = NULL; res.fi = NULL;
@ -299,7 +302,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
/* Apparently, routing tables are wrong. Assume, /* Apparently, routing tables are wrong. Assume,
that the destination is on link. that the destination is on link.
@@ -2517,6 +2556,7 @@ @@ -2517,6 +2556,7 @@ static int ip_route_output_slow(struct r
dev_out = &loopback_dev; dev_out = &loopback_dev;
dev_hold(dev_out); dev_hold(dev_out);
fl.oif = dev_out->ifindex; fl.oif = dev_out->ifindex;
@ -307,7 +310,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
if (res.fi) if (res.fi)
fib_info_put(res.fi); fib_info_put(res.fi);
res.fi = NULL; res.fi = NULL;
@@ -2524,13 +2564,12 @@ @@ -2524,13 +2564,12 @@ static int ip_route_output_slow(struct r
goto make_route; goto make_route;
} }
@ -324,7 +327,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
if (!fl.fl4_src) if (!fl.fl4_src)
fl.fl4_src = FIB_RES_PREFSRC(res); fl.fl4_src = FIB_RES_PREFSRC(res);
@@ -2567,6 +2606,7 @@ @@ -2567,6 +2606,7 @@ int __ip_route_output_key(struct rtable
rth->fl.fl4_src == flp->fl4_src && rth->fl.fl4_src == flp->fl4_src &&
rth->fl.iif == 0 && rth->fl.iif == 0 &&
rth->fl.oif == flp->oif && rth->fl.oif == flp->oif &&
@ -332,7 +335,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/route.c linux-2.6.21.1.dev/net/ipv4/route.
rth->fl.mark == flp->mark && rth->fl.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))) {
@@ -3271,3 +3311,4 @@ @@ -3267,3 +3307,4 @@ int __init ip_rt_init(void)
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);

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

@ -1,7 +1,8 @@
diff -urN linux-2.6.21.1.old/arch/mips/Makefile linux-2.6.21.1.dev/arch/mips/Makefile Index: linux-2.6.22.19/arch/mips/Makefile
--- linux-2.6.21.1.old/arch/mips/Makefile 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/arch/mips/Makefile 2007-05-26 20:49:09.358341256 +0200 --- 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

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

@ -1,7 +1,8 @@
diff -urN linux-2.6.21.1.old/fs/jffs2/build.c linux-2.6.21.1.dev/fs/jffs2/build.c Index: linux-2.6.22.19/fs/jffs2/build.c
--- linux-2.6.21.1.old/fs/jffs2/build.c 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/fs/jffs2/build.c 2007-05-26 20:52:04.425726968 +0200 --- 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);
@ -19,10 +20,11 @@ diff -urN linux-2.6.21.1.old/fs/jffs2/build.c linux-2.6.21.1.dev/fs/jffs2/build.
dbg_fsbuild("pass 1 starting\n"); 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. */
diff -urN linux-2.6.21.1.old/fs/jffs2/scan.c linux-2.6.21.1.dev/fs/jffs2/scan.c Index: linux-2.6.22.19/fs/jffs2/scan.c
--- linux-2.6.21.1.old/fs/jffs2/scan.c 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/fs/jffs2/scan.c 2007-05-26 20:52:04.491716936 +0200 --- 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);
@ -38,7 +40,7 @@ diff -urN linux-2.6.21.1.old/fs/jffs2/scan.c linux-2.6.21.1.dev/fs/jffs2/scan.c
if (ret < 0) if (ret < 0)
goto out; goto out;
@@ -545,6 +548,17 @@ @@ -545,6 +548,17 @@ static int jffs2_scan_eraseblock (struct
return err; return err;
} }

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

@ -1,6 +1,7 @@
diff -urN linux-2.6.21.1.old/include/asm-powerpc/segment.h linux-2.6.21.1.dev/include/asm-powerpc/segment.h Index: linux-2.6.22.19/include/asm-powerpc/segment.h
--- linux-2.6.21.1.old/include/asm-powerpc/segment.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/include/asm-powerpc/segment.h 2007-05-26 20:55:12.738099136 +0200 --- /dev/null
+++ linux-2.6.22.19/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

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

@ -1,7 +1,8 @@
diff -urN linux-2.6.21.1.old/drivers/net/r8169.c linux-2.6.21.1.dev/drivers/net/r8169.c Index: linux-2.6.22.19/drivers/net/r8169.c
--- linux-2.6.21.1.old/drivers/net/r8169.c 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/drivers/net/r8169.c 2007-05-26 20:58:17.370030816 +0200 --- 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 =
@ -10,7 +11,7 @@ diff -urN linux-2.6.21.1.old/drivers/net/r8169.c linux-2.6.21.1.dev/drivers/net/
static const u16 rtl8169_napi_event = 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 @@ @@ -2640,10 +2640,12 @@ rtl8169_interrupt(int irq, void *dev_ins
if (!(status & rtl8169_intr_mask)) if (!(status & rtl8169_intr_mask))
break; break;

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

@ -1,7 +1,8 @@
diff -urN linux-2.6.21.1.old/fs/Kconfig linux-2.6.21.1.dev/fs/Kconfig Index: linux-2.6.22.19/fs/Kconfig
--- linux-2.6.21.1.old/fs/Kconfig 2007-05-26 19:03:45.497714200 +0200 ===================================================================
+++ linux-2.6.21.1.dev/fs/Kconfig 2007-05-26 21:01:26.154331240 +0200 --- 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.
@ -11,10 +12,11 @@ diff -urN linux-2.6.21.1.old/fs/Kconfig linux-2.6.21.1.dev/fs/Kconfig
config MINIX_FS config MINIX_FS
tristate "Minix fs support" tristate "Minix fs support"
help help
diff -urN linux-2.6.21.1.old/fs/Makefile linux-2.6.21.1.dev/fs/Makefile Index: linux-2.6.22.19/fs/Makefile
--- linux-2.6.21.1.old/fs/Makefile 2007-05-26 19:03:45.497714200 +0200 ===================================================================
+++ linux-2.6.21.1.dev/fs/Makefile 2007-05-26 21:01:26.160330328 +0200 --- 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/
@ -22,9 +24,10 @@ diff -urN linux-2.6.21.1.old/fs/Makefile linux-2.6.21.1.dev/fs/Makefile
obj-$(CONFIG_MINIX_FS) += minix/ obj-$(CONFIG_MINIX_FS) += minix/
obj-$(CONFIG_FAT_FS) += fat/ obj-$(CONFIG_FAT_FS) += fat/
obj-$(CONFIG_MSDOS_FS) += msdos/ obj-$(CONFIG_MSDOS_FS) += msdos/
diff -urN linux-2.6.21.1.old/fs/mini_fo/aux.c linux-2.6.21.1.dev/fs/mini_fo/aux.c Index: linux-2.6.22.19/fs/mini_fo/aux.c
--- linux-2.6.21.1.old/fs/mini_fo/aux.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/fs/mini_fo/aux.c 2007-05-26 21:01:26.160330328 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -606,9 +609,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/aux.c linux-2.6.21.1.dev/fs/mini_fo/aux.
+ +
+#endif /* unused */ +#endif /* unused */
+ +
diff -urN linux-2.6.21.1.old/fs/mini_fo/ChangeLog linux-2.6.21.1.dev/fs/mini_fo/ChangeLog Index: linux-2.6.22.19/fs/mini_fo/ChangeLog
--- linux-2.6.21.1.old/fs/mini_fo/ChangeLog 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/fs/mini_fo/ChangeLog 2007-05-26 21:01:26.161330176 +0200 --- /dev/null
+++ linux-2.6.22.19/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>
+ +
@ -891,9 +895,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/ChangeLog linux-2.6.21.1.dev/fs/mini_fo/
+ * Implementation of mini_fo_mknod and mini_fo_rename, support + * Implementation of mini_fo_mknod and mini_fo_rename, support
+ for device files. + for device files.
+ +
diff -urN linux-2.6.21.1.old/fs/mini_fo/dentry.c linux-2.6.21.1.dev/fs/mini_fo/dentry.c Index: linux-2.6.22.19/fs/mini_fo/dentry.c
--- linux-2.6.21.1.old/fs/mini_fo/dentry.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/fs/mini_fo/dentry.c 2007-05-26 21:01:26.161330176 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -1139,9 +1144,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/dentry.c linux-2.6.21.1.dev/fs/mini_fo/d
+ d_delete: mini_fo_d_delete, + d_delete: mini_fo_d_delete,
+ d_iput: mini_fo_d_iput, + d_iput: mini_fo_d_iput,
+}; +};
diff -urN linux-2.6.21.1.old/fs/mini_fo/file.c linux-2.6.21.1.dev/fs/mini_fo/file.c Index: linux-2.6.22.19/fs/mini_fo/file.c
--- linux-2.6.21.1.old/fs/mini_fo/file.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/fs/mini_fo/file.c 2007-05-26 21:01:26.162330024 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -1856,9 +1862,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/file.c linux-2.6.21.1.dev/fs/mini_fo/fil
+ /* not implemented: sendpage */ + /* not implemented: sendpage */
+ /* not implemented: get_unmapped_area */ + /* not implemented: get_unmapped_area */
+ }; + };
diff -urN linux-2.6.21.1.old/fs/mini_fo/fist.h linux-2.6.21.1.dev/fs/mini_fo/fist.h Index: linux-2.6.22.19/fs/mini_fo/fist.h
--- linux-2.6.21.1.old/fs/mini_fo/fist.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/fs/mini_fo/fist.h 2007-05-26 21:01:26.162330024 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -2112,9 +2119,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/fist.h linux-2.6.21.1.dev/fs/mini_fo/fis
+# define FIST_IOCTL_SET_DEBUG_VALUE _IOW(0x15, 2, int) +# define FIST_IOCTL_SET_DEBUG_VALUE _IOW(0x15, 2, int)
+ +
+#endif /* not __FIST_H_ */ +#endif /* not __FIST_H_ */
diff -urN linux-2.6.21.1.old/fs/mini_fo/inode.c linux-2.6.21.1.dev/fs/mini_fo/inode.c Index: linux-2.6.22.19/fs/mini_fo/inode.c
--- linux-2.6.21.1.old/fs/mini_fo/inode.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/fs/mini_fo/inode.c 2007-05-26 21:01:26.164329720 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -3680,9 +3688,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/inode.c linux-2.6.21.1.dev/fs/mini_fo/in
+ removexattr: mini_fo_removexattr + removexattr: mini_fo_removexattr
+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */ +# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
+ }; + };
diff -urN linux-2.6.21.1.old/fs/mini_fo/main.c linux-2.6.21.1.dev/fs/mini_fo/main.c Index: linux-2.6.22.19/fs/mini_fo/main.c
--- linux-2.6.21.1.old/fs/mini_fo/main.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/fs/mini_fo/main.c 2007-05-26 21:01:26.164329720 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -4107,9 +4116,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/main.c linux-2.6.21.1.dev/fs/mini_fo/mai
+ +
+module_init(init_mini_fo_fs) +module_init(init_mini_fo_fs)
+module_exit(exit_mini_fo_fs) +module_exit(exit_mini_fo_fs)
diff -urN linux-2.6.21.1.old/fs/mini_fo/Makefile linux-2.6.21.1.dev/fs/mini_fo/Makefile Index: linux-2.6.22.19/fs/mini_fo/Makefile
--- linux-2.6.21.1.old/fs/mini_fo/Makefile 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/fs/mini_fo/Makefile 2007-05-26 21:01:26.164329720 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -4128,9 +4138,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/Makefile linux-2.6.21.1.dev/fs/mini_fo/M
+# dependencies +# dependencies
+${mini_fo-objs}: mini_fo.h fist.h +${mini_fo-objs}: mini_fo.h fist.h
+ +
diff -urN linux-2.6.21.1.old/fs/mini_fo/meta.c linux-2.6.21.1.dev/fs/mini_fo/meta.c Index: linux-2.6.22.19/fs/mini_fo/meta.c
--- linux-2.6.21.1.old/fs/mini_fo/meta.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/fs/mini_fo/meta.c 2007-05-26 21:01:26.166329416 +0200 --- /dev/null
+++ linux-2.6.22.19/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>
@ -5132,9 +5143,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/meta.c linux-2.6.21.1.dev/fs/mini_fo/met
+ return 0; + return 0;
+} +}
+ +
diff -urN linux-2.6.21.1.old/fs/mini_fo/mini_fo.h linux-2.6.21.1.dev/fs/mini_fo/mini_fo.h Index: linux-2.6.22.19/fs/mini_fo/mini_fo.h
--- linux-2.6.21.1.old/fs/mini_fo/mini_fo.h 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/fs/mini_fo/mini_fo.h 2007-05-26 21:01:26.167329264 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -5646,9 +5658,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/mini_fo.h linux-2.6.21.1.dev/fs/mini_fo/
+/* ioctls */ +/* ioctls */
+ +
+#endif /* not __MINI_FO_H_ */ +#endif /* not __MINI_FO_H_ */
diff -urN linux-2.6.21.1.old/fs/mini_fo/mini_fo-merge linux-2.6.21.1.dev/fs/mini_fo/mini_fo-merge Index: linux-2.6.22.19/fs/mini_fo/mini_fo-merge
--- linux-2.6.21.1.old/fs/mini_fo/mini_fo-merge 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/fs/mini_fo/mini_fo-merge 2007-05-26 21:01:26.167329264 +0200 --- /dev/null
+++ linux-2.6.22.19/fs/mini_fo/mini_fo-merge
@@ -0,0 +1,180 @@ @@ -0,0 +1,180 @@
+#!/bin/bash +#!/bin/bash
+# +#
@ -5830,9 +5843,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/mini_fo-merge linux-2.6.21.1.dev/fs/mini
+#rm $TMP/$SKIP_DEL_LIST +#rm $TMP/$SKIP_DEL_LIST
+ +
+echo "Done!" +echo "Done!"
diff -urN linux-2.6.21.1.old/fs/mini_fo/mini_fo-overlay linux-2.6.21.1.dev/fs/mini_fo/mini_fo-overlay Index: linux-2.6.22.19/fs/mini_fo/mini_fo-overlay
--- linux-2.6.21.1.old/fs/mini_fo/mini_fo-overlay 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/fs/mini_fo/mini_fo-overlay 2007-05-26 21:01:26.167329264 +0200 --- /dev/null
+++ linux-2.6.22.19/fs/mini_fo/mini_fo-overlay
@@ -0,0 +1,130 @@ @@ -0,0 +1,130 @@
+#!/bin/bash +#!/bin/bash
+# +#
@ -5964,9 +5978,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/mini_fo-overlay linux-2.6.21.1.dev/fs/mi
+if [ $? -ne 0 ]; then +if [ $? -ne 0 ]; then
+ echo "Error, mounting failed, maybe no permisson to mount?" + echo "Error, mounting failed, maybe no permisson to mount?"
+fi +fi
diff -urN linux-2.6.21.1.old/fs/mini_fo/mmap.c linux-2.6.21.1.dev/fs/mini_fo/mmap.c Index: linux-2.6.22.19/fs/mini_fo/mmap.c
--- linux-2.6.21.1.old/fs/mini_fo/mmap.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/fs/mini_fo/mmap.c 2007-05-26 21:01:26.168329112 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -6605,9 +6620,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/mmap.c linux-2.6.21.1.dev/fs/mini_fo/mma
+ print_exit_status(err); + print_exit_status(err);
+ return err; + return err;
+} +}
diff -urN linux-2.6.21.1.old/fs/mini_fo/README linux-2.6.21.1.dev/fs/mini_fo/README Index: linux-2.6.22.19/fs/mini_fo/README
--- linux-2.6.21.1.old/fs/mini_fo/README 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/fs/mini_fo/README 2007-05-26 21:01:26.168329112 +0200 --- /dev/null
+++ linux-2.6.22.19/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
+========================================= +=========================================
@ -6772,9 +6788,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/README linux-2.6.21.1.dev/fs/mini_fo/REA
+2 of the License, or (at your option) any later version. +2 of the License, or (at your option) any later version.
+ +
+ +
diff -urN linux-2.6.21.1.old/fs/mini_fo/RELEASE_NOTES linux-2.6.21.1.dev/fs/mini_fo/RELEASE_NOTES Index: linux-2.6.22.19/fs/mini_fo/RELEASE_NOTES
--- linux-2.6.21.1.old/fs/mini_fo/RELEASE_NOTES 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/fs/mini_fo/RELEASE_NOTES 2007-05-26 21:01:26.168329112 +0200 --- /dev/null
+++ linux-2.6.22.19/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
@ -6887,9 +6904,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/RELEASE_NOTES linux-2.6.21.1.dev/fs/mini
+original state. I hope to fix this someday. Please note that this does +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.
diff -urN linux-2.6.21.1.old/fs/mini_fo/state.c linux-2.6.21.1.dev/fs/mini_fo/state.c Index: linux-2.6.22.19/fs/mini_fo/state.c
--- linux-2.6.21.1.old/fs/mini_fo/state.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/fs/mini_fo/state.c 2007-05-26 21:01:26.169328960 +0200 --- /dev/null
+++ linux-2.6.22.19/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>
@ -7511,9 +7529,10 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/state.c linux-2.6.21.1.dev/fs/mini_fo/st
+ return err; + return err;
+} +}
+ +
diff -urN linux-2.6.21.1.old/fs/mini_fo/super.c linux-2.6.21.1.dev/fs/mini_fo/super.c Index: linux-2.6.22.19/fs/mini_fo/super.c
--- linux-2.6.21.1.old/fs/mini_fo/super.c 1970-01-01 01:00:00.000000000 +0100 ===================================================================
+++ linux-2.6.21.1.dev/fs/mini_fo/super.c 2007-05-26 21:01:26.169328960 +0200 --- /dev/null
+++ linux-2.6.22.19/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,8 @@
Index: linux-2.6.22-rc5/include/linux/ieee80211.h Index: linux-2.6.22.19/include/linux/ieee80211.h
=================================================================== ===================================================================
--- linux-2.6.22-rc5.orig/include/linux/ieee80211.h 2007-06-21 23:26:23.000000000 +0100 --- linux-2.6.22.19.orig/include/linux/ieee80211.h
+++ linux-2.6.22-rc5/include/linux/ieee80211.h 2007-06-21 23:35:39.000000000 +0100 +++ linux-2.6.22.19/include/linux/ieee80211.h
@@ -106,6 +106,75 @@ @@ -106,6 +106,75 @@ struct ieee80211_hdr {
} __attribute__ ((packed)); } __attribute__ ((packed));
@ -78,7 +78,7 @@ Index: linux-2.6.22-rc5/include/linux/ieee80211.h
struct ieee80211_mgmt { struct ieee80211_mgmt {
__le16 frame_control; __le16 frame_control;
__le16 duration; __le16 duration;
@@ -173,9 +242,51 @@ @@ -173,9 +242,51 @@ struct ieee80211_mgmt {
struct { struct {
u8 action_code; u8 action_code;
u8 dialog_token; u8 dialog_token;
@ -130,7 +130,7 @@ Index: linux-2.6.22-rc5/include/linux/ieee80211.h
struct{ struct{
u8 action_code; u8 action_code;
u8 element_id; u8 element_id;
@@ -184,6 +295,25 @@ @@ -184,6 +295,25 @@ struct ieee80211_mgmt {
u8 new_chan; u8 new_chan;
u8 switch_count; u8 switch_count;
} __attribute__((packed)) chan_switch; } __attribute__((packed)) chan_switch;
@ -156,7 +156,7 @@ Index: linux-2.6.22-rc5/include/linux/ieee80211.h
} u; } u;
} __attribute__ ((packed)) action; } __attribute__ ((packed)) action;
} u; } u;
@@ -259,6 +389,18 @@ @@ -259,6 +389,18 @@ enum ieee80211_statuscode {
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 +175,7 @@ Index: linux-2.6.22-rc5/include/linux/ieee80211.h
}; };
@@ -289,9 +431,50 @@ @@ -289,9 +431,50 @@ enum ieee80211_reasoncode {
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 +226,7 @@ Index: linux-2.6.22-rc5/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 @@ @@ -307,6 +490,15 @@ enum ieee80211_eid {
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 +242,7 @@ Index: linux-2.6.22-rc5/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 @@ @@ -321,6 +513,9 @@ enum ieee80211_eid {
/* 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 +252,7 @@ Index: linux-2.6.22-rc5/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 @@ @@ -329,6 +524,9 @@ enum ieee80211_eid {
WLAN_EID_QOS_PARAMETER = 222 WLAN_EID_QOS_PARAMETER = 222
}; };
@ -262,7 +262,7 @@ Index: linux-2.6.22-rc5/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 @@ @@ -339,4 +537,37 @@ enum ieee80211_eid {
#define WLAN_MAX_KEY_LEN 32 #define WLAN_MAX_KEY_LEN 32
@ -300,10 +300,10 @@ Index: linux-2.6.22-rc5/include/linux/ieee80211.h
+}; +};
+ +
#endif /* IEEE80211_H */ #endif /* IEEE80211_H */
Index: linux-2.6.22-rc5/include/linux/nl80211.h Index: linux-2.6.22.19/include/linux/nl80211.h
=================================================================== ===================================================================
--- linux-2.6.22-rc5.orig/include/linux/nl80211.h 2007-06-21 23:26:23.000000000 +0100 --- linux-2.6.22.19.orig/include/linux/nl80211.h
+++ linux-2.6.22-rc5/include/linux/nl80211.h 2007-06-21 23:34:24.000000000 +0100 +++ linux-2.6.22.19/include/linux/nl80211.h
@@ -7,6 +7,217 @@ @@ -7,6 +7,217 @@
*/ */
@ -522,7 +522,7 @@ Index: linux-2.6.22-rc5/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 @@ @@ -35,4 +246,56 @@ enum nl80211_iftype {
}; };
#define NL80211_IFTYPE_MAX (__NL80211_IFTYPE_AFTER_LAST - 1) #define NL80211_IFTYPE_MAX (__NL80211_IFTYPE_AFTER_LAST - 1)
@ -579,10 +579,10 @@ Index: linux-2.6.22-rc5/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-rc5/include/net/cfg80211.h Index: linux-2.6.22.19/include/net/cfg80211.h
=================================================================== ===================================================================
--- linux-2.6.22-rc5.orig/include/net/cfg80211.h 2007-06-21 23:26:23.000000000 +0100 --- linux-2.6.22.19.orig/include/net/cfg80211.h
+++ linux-2.6.22-rc5/include/net/cfg80211.h 2007-06-21 23:35:53.000000000 +0100 +++ 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 +661,7 @@ Index: linux-2.6.22-rc5/include/net/cfg80211.h
/* from net/wireless.h */ /* from net/wireless.h */
struct wiphy; struct wiphy;
@@ -30,11 +94,62 @@ @@ -30,11 +94,62 @@ struct wiphy;
* @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 +725,11 @@ Index: linux-2.6.22-rc5/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-rc5/include/net/iw_handler.h Index: linux-2.6.22.19/include/net/iw_handler.h
=================================================================== ===================================================================
--- linux-2.6.22-rc5.orig/include/net/iw_handler.h 2007-06-21 23:26:23.000000000 +0100 --- linux-2.6.22.19.orig/include/net/iw_handler.h
+++ linux-2.6.22-rc5/include/net/iw_handler.h 2007-06-21 23:34:24.000000000 +0100 +++ linux-2.6.22.19/include/net/iw_handler.h
@@ -431,7 +431,13 @@ @@ -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 +744,11 @@ Index: linux-2.6.22-rc5/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-rc5/include/net/mac80211.h Index: linux-2.6.22.19/include/net/mac80211.h
=================================================================== ===================================================================
--- linux-2.6.22-rc5.orig/include/net/mac80211.h 2007-06-21 23:26:23.000000000 +0100 --- linux-2.6.22.19.orig/include/net/mac80211.h
+++ linux-2.6.22-rc5/include/net/mac80211.h 2007-06-21 23:34:24.000000000 +0100 +++ linux-2.6.22.19/include/net/mac80211.h
@@ -300,7 +300,6 @@ @@ -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 +756,7 @@ Index: linux-2.6.22-rc5/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 @@ @@ -514,6 +513,9 @@ struct ieee80211_hw {
* 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 +766,7 @@ Index: linux-2.6.22-rc5/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 @@ @@ -641,8 +643,7 @@ struct ieee80211_ops {
* 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 +776,7 @@ Index: linux-2.6.22-rc5/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 @@ @@ -694,8 +695,9 @@ struct ieee80211_ops {
/* 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 +788,7 @@ Index: linux-2.6.22-rc5/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 @@ @@ -705,12 +707,25 @@ struct ieee80211_ops {
* 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,6 +1,8 @@
--- linux-2.6.22-rc5/lib/kobject_uevent.c.old 2007-06-25 07:34:27.002266528 +0200 Index: linux-2.6.22.19/lib/kobject_uevent.c
+++ linux-2.6.22-rc5/lib/kobject_uevent.c 2007-06-25 08:39:53.762308264 +0200 ===================================================================
@@ -30,9 +30,22 @@ --- linux-2.6.22.19.orig/lib/kobject_uevent.c
+++ 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)
@ -24,7 +26,7 @@
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 @@ @@ -169,9 +182,7 @@ int kobject_uevent_env(struct kobject *k
} }
/* 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,6 +1,8 @@
--- linux-2.6.21.1.orig/drivers/leds/Kconfig 2007-09-09 07:15:28.000000000 +0200 Index: linux-2.6.22.19/drivers/leds/Kconfig
+++ linux-2.6.21.1/drivers/leds/Kconfig 2007-09-13 19:36:35.000000000 +0200 ===================================================================
@@ -149,5 +149,9 @@ --- linux-2.6.22.19.orig/drivers/leds/Kconfig
+++ 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.
@ -10,9 +12,11 @@
+ +
endmenu endmenu
--- linux-2.6.21.1.orig/drivers/leds/Makefile 2007-09-09 07:15:28.000000000 +0200 Index: linux-2.6.22.19/drivers/leds/Makefile
+++ linux-2.6.21.1/drivers/leds/Makefile 2007-09-13 19:33:15.000000000 +0200 ===================================================================
@@ -23,3 +23,4 @@ --- linux-2.6.22.19.orig/drivers/leds/Makefile
+++ 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,6 +1,8 @@
--- linux-2.6.22.orig/drivers/input/misc/Kconfig 2007-08-21 06:33:06.000000000 +0200 Index: linux-2.6.22.19/drivers/input/misc/Kconfig
+++ linux-2.6.22/drivers/input/misc/Kconfig 2007-10-08 10:57:23.000000000 +0200 ===================================================================
@@ -178,4 +178,20 @@ --- linux-2.6.22.19.orig/drivers/input/misc/Kconfig
+++ 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.
@ -21,9 +23,11 @@
+ module will be called gpio-buttons. + module will be called gpio-buttons.
+ +
endif endif
--- linux-2.6.22.4.orig/drivers/input/misc/Makefile 2007-08-21 06:33:06.000000000 +0200 Index: linux-2.6.22.19/drivers/input/misc/Makefile
+++ linux-2.6.22.4/drivers/input/misc/Makefile 2007-10-08 10:50:12.000000000 +0200 ===================================================================
@@ -18,3 +18,4 @@ --- linux-2.6.22.19.orig/drivers/input/misc/Makefile
+++ 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

18
target/linux/generic-2.6/patches-2.6.22/510-Yaffs.patch
View File

@ -1,7 +1,8 @@
diff -urN linux-2.6.21.1/fs/Kconfig linux-2.6.21.1.new/fs/Kconfig Index: linux-2.6.22.19/fs/Kconfig
--- linux-2.6.21.1/fs/Kconfig 2007-06-08 14:07:09.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.new/fs/Kconfig 2007-06-08 14:09:26.000000000 +0200 --- 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"
@ -9,10 +10,11 @@ diff -urN linux-2.6.21.1/fs/Kconfig linux-2.6.21.1.new/fs/Kconfig
config OCFS2_FS config OCFS2_FS
tristate "OCFS2 file system support" tristate "OCFS2 file system support"
diff -urN linux-2.6.21.1/fs/Makefile linux-2.6.21.1.new/fs/Makefile Index: linux-2.6.22.19/fs/Makefile
--- linux-2.6.21.1/fs/Makefile 2007-06-08 14:07:09.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.new/fs/Makefile 2007-06-08 14:09:51.000000000 +0200 --- linux-2.6.22.19.orig/fs/Makefile
@@ -116,3 +116,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/

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

@ -12,10 +12,10 @@ 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>
--- ---
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig Index: linux-2.6.22.19/drivers/misc/Kconfig
index 616eee9..bd601ef 100644 ===================================================================
--- a/drivers/misc/Kconfig --- linux-2.6.22.19.orig/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig +++ linux-2.6.22.19/drivers/misc/Kconfig
@@ -34,6 +34,11 @@ config PHANTOM @@ -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.
@ -34,20 +34,19 @@ index 616eee9..bd601ef 100644
- -
endmenu endmenu
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile Index: linux-2.6.22.19/drivers/misc/Makefile
index 8abbf2f..b5ce0e3 100644 ===================================================================
--- a/drivers/misc/Makefile --- linux-2.6.22.19.orig/drivers/misc/Makefile
+++ b/drivers/misc/Makefile +++ linux-2.6.22.19/drivers/misc/Makefile
@@ -14,3 +14,4 @@ obj-$(CONFIG_PHANTOM) += phantom.o @@ -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
diff --git a/drivers/misc/eeprom_93cx6.c b/drivers/misc/eeprom_93cx6.c Index: linux-2.6.22.19/drivers/misc/eeprom_93cx6.c
new file mode 100644 ===================================================================
index 0000000..bfcb434
--- /dev/null --- /dev/null
+++ b/drivers/misc/eeprom_93cx6.c +++ linux-2.6.22.19/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
@ -278,11 +277,10 @@ index 0000000..bfcb434
+} +}
+EXPORT_SYMBOL_GPL(eeprom_93cx6_multiread); +EXPORT_SYMBOL_GPL(eeprom_93cx6_multiread);
+ +
diff --git a/include/linux/eeprom_93cx6.h b/include/linux/eeprom_93cx6.h Index: linux-2.6.22.19/include/linux/eeprom_93cx6.h
new file mode 100644 ===================================================================
index 0000000..d774b77
--- /dev/null --- /dev/null
+++ b/include/linux/eeprom_93cx6.h +++ linux-2.6.22.19/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

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

@ -1,7 +1,7 @@
Index: linux-2.6.22.18/drivers/misc/eeprom_93cx6.c Index: linux-2.6.22.19/drivers/misc/eeprom_93cx6.c
=================================================================== ===================================================================
--- linux-2.6.22.18.orig/drivers/misc/eeprom_93cx6.c --- linux-2.6.22.19.orig/drivers/misc/eeprom_93cx6.c
+++ linux-2.6.22.18/drivers/misc/eeprom_93cx6.c +++ linux-2.6.22.19/drivers/misc/eeprom_93cx6.c
@@ -39,14 +39,26 @@ static inline void eeprom_93cx6_pulse_hi @@ -39,14 +39,26 @@ static inline void eeprom_93cx6_pulse_hi
{ {
eeprom->reg_data_clock = 1; eeprom->reg_data_clock = 1;

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

@ -1,6 +1,8 @@
--- linux-2.6.22.4-old/drivers/usb/serial/usb-serial.c 2007-08-21 06:33:06.000000000 +0200 Index: linux-2.6.22.19/drivers/usb/serial/usb-serial.c
+++ linux-2.6.22.4-new/drivers/usb/serial/usb-serial.c 2007-08-26 15:43:11.000000000 +0200 ===================================================================
@@ -56,6 +56,7 @@ --- linux-2.6.22.19.orig/drivers/usb/serial/usb-serial.c
+++ 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.
*/ */
@ -8,7 +10,7 @@
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 @@ @@ -864,7 +865,7 @@ int usb_serial_probe(struct usb_interfac
dev_err(&interface->dev, "No free urbs available\n"); dev_err(&interface->dev, "No free urbs available\n");
goto probe_error; goto probe_error;
} }
@ -17,7 +19,7 @@
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 @@ @@ -1245,3 +1246,5 @@ MODULE_LICENSE("GPL");
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");

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

@ -1,6 +1,7 @@
diff -urN linux-2.6.21.1.old/include/linux/time.h linux-2.6.21.1.dev/include/linux/time.h Index: linux-2.6.22.19/include/linux/time.h
--- linux-2.6.21.1.old/include/linux/time.h 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/include/linux/time.h 2007-05-26 21:23:19.859617680 +0200 --- 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
@ -12,16 +13,17 @@ diff -urN linux-2.6.21.1.old/include/linux/time.h linux-2.6.21.1.dev/include/lin
#include <linux/types.h> #include <linux/types.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
@@ -225,4 +229,6 @@ @@ -225,4 +229,6 @@ struct itimerval {
*/ */
#define TIMER_ABSTIME 0x01 #define TIMER_ABSTIME 0x01
+#endif /* __KERNEL__ DEBIAN */ +#endif /* __KERNEL__ DEBIAN */
+ +
#endif #endif
diff -urN linux-2.6.21.1.old/include/linux/types.h linux-2.6.21.1.dev/include/linux/types.h Index: linux-2.6.22.19/include/linux/types.h
--- linux-2.6.21.1.old/include/linux/types.h 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/include/linux/types.h 2007-05-26 21:23:19.859617680 +0200 --- 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
@ -37,7 +39,7 @@ diff -urN linux-2.6.21.1.old/include/linux/types.h linux-2.6.21.1.dev/include/li
#ifdef __KERNEL__ #ifdef __KERNEL__
#define BITS_TO_LONGS(bits) \ #define BITS_TO_LONGS(bits) \
@@ -162,6 +170,8 @@ @@ -162,6 +170,8 @@ typedef unsigned long blkcnt_t;
#endif /* __KERNEL_STRICT_NAMES */ #endif /* __KERNEL_STRICT_NAMES */

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

@ -1,6 +1,7 @@
diff -urN linux-2.6.21.1.old/scripts/genksyms/parse.c_shipped linux-2.6.21.1.dev/scripts/genksyms/parse.c_shipped Index: linux-2.6.22.19/scripts/genksyms/parse.c_shipped
--- linux-2.6.21.1.old/scripts/genksyms/parse.c_shipped 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/scripts/genksyms/parse.c_shipped 2007-05-26 21:26:23.565690112 +0200 --- 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 @@
@ -11,9 +12,10 @@ diff -urN linux-2.6.21.1.old/scripts/genksyms/parse.c_shipped linux-2.6.21.1.dev
#include "genksyms.h" #include "genksyms.h"
static int is_typedef; static int is_typedef;
diff -urN linux-2.6.21.1.old/scripts/genksyms/parse.y linux-2.6.21.1.dev/scripts/genksyms/parse.y Index: linux-2.6.22.19/scripts/genksyms/parse.y
--- linux-2.6.21.1.old/scripts/genksyms/parse.y 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/scripts/genksyms/parse.y 2007-05-26 21:26:23.563690416 +0200 --- 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 @@
%{ %{
@ -24,9 +26,10 @@ diff -urN linux-2.6.21.1.old/scripts/genksyms/parse.y linux-2.6.21.1.dev/scripts
#include "genksyms.h" #include "genksyms.h"
static int is_typedef; static int is_typedef;
diff -urN linux-2.6.21.1.old/scripts/kallsyms.c linux-2.6.21.1.dev/scripts/kallsyms.c Index: linux-2.6.22.19/scripts/kallsyms.c
--- linux-2.6.21.1.old/scripts/kallsyms.c 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/scripts/kallsyms.c 2007-05-26 21:26:23.579687984 +0200 --- 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>
@ -63,10 +66,11 @@ diff -urN linux-2.6.21.1.old/scripts/kallsyms.c linux-2.6.21.1.dev/scripts/kalls
#define KSYM_NAME_LEN 127 #define KSYM_NAME_LEN 127
diff -urN linux-2.6.21.1.old/scripts/kconfig/Makefile linux-2.6.21.1.dev/scripts/kconfig/Makefile Index: linux-2.6.22.19/scripts/kconfig/Makefile
--- linux-2.6.21.1.old/scripts/kconfig/Makefile 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/scripts/kconfig/Makefile 2007-05-26 21:26:23.553691936 +0200 --- 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))
@ -76,9 +80,10 @@ diff -urN linux-2.6.21.1.old/scripts/kconfig/Makefile linux-2.6.21.1.dev/scripts
HOST_EXTRACFLAGS += -DLOCALE HOST_EXTRACFLAGS += -DLOCALE
diff -urN linux-2.6.21.1.old/scripts/mod/mk_elfconfig.c linux-2.6.21.1.dev/scripts/mod/mk_elfconfig.c Index: linux-2.6.22.19/scripts/mod/mk_elfconfig.c
--- linux-2.6.21.1.old/scripts/mod/mk_elfconfig.c 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/scripts/mod/mk_elfconfig.c 2007-05-26 21:26:23.553691936 +0200 --- 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>
@ -91,9 +96,10 @@ diff -urN linux-2.6.21.1.old/scripts/mod/mk_elfconfig.c linux-2.6.21.1.dev/scrip
int int
main(int argc, char **argv) main(int argc, char **argv)
diff -urN linux-2.6.21.1.old/scripts/mod/modpost.h linux-2.6.21.1.dev/scripts/mod/modpost.h Index: linux-2.6.22.19/scripts/mod/modpost.h
--- linux-2.6.21.1.old/scripts/mod/modpost.h 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/scripts/mod/modpost.h 2007-05-26 21:26:23.553691936 +0200 --- 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>

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

@ -1,7 +1,8 @@
diff -urN linux-2.6.21.1.old/include/linux/stddef.h linux-2.6.21.1.dev/include/linux/stddef.h Index: linux-2.6.22.19/include/linux/stddef.h
--- linux-2.6.21.1.old/include/linux/stddef.h 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/include/linux/stddef.h 2007-05-26 21:29:46.108898864 +0200 --- 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
}; };
@ -9,7 +10,7 @@ diff -urN linux-2.6.21.1.old/include/linux/stddef.h linux-2.6.21.1.dev/include/l
#undef offsetof #undef offsetof
#ifdef __compiler_offsetof #ifdef __compiler_offsetof
@@ -23,6 +24,5 @@ @@ -23,6 +24,5 @@ enum {
#else #else
#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
#endif #endif

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

@ -1,7 +1,8 @@
diff -urN linux-2.6.21.1.old/scripts/gen_initramfs_list.sh linux-2.6.21.1.dev/scripts/gen_initramfs_list.sh Index: linux-2.6.22.19/scripts/gen_initramfs_list.sh
--- linux-2.6.21.1.old/scripts/gen_initramfs_list.sh 2007-04-27 23:49:26.000000000 +0200 ===================================================================
+++ linux-2.6.21.1.dev/scripts/gen_initramfs_list.sh 2007-05-26 21:32:53.679383816 +0200 --- 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")
@ -10,7 +11,7 @@ diff -urN linux-2.6.21.1.old/scripts/gen_initramfs_list.sh linux-2.6.21.1.dev/sc
local maj=`field 5 ${dev}` local maj=`field 5 ${dev}`
local min=`field 6 ${dev}` local min=`field 6 ${dev}`
maj=${maj%,} maj=${maj%,}
@@ -135,7 +135,7 @@ @@ -135,7 +135,7 @@ parse() {
str="${ftype} ${name} ${str} ${dev} ${maj} ${min}" str="${ftype} ${name} ${str} ${dev} ${maj} ${min}"
;; ;;
"slink") "slink")

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

@ -14,10 +14,10 @@ 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>
--- ---
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig Index: linux-2.6.22.19/drivers/net/phy/Kconfig
index 09b6f25..dd09011 100644 ===================================================================
--- a/drivers/net/phy/Kconfig --- linux-2.6.22.19.orig/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ linux-2.6.22.19/drivers/net/phy/Kconfig
@@ -55,6 +55,11 @@ config BROADCOM_PHY @@ -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,21 +30,20 @@ index 09b6f25..dd09011 100644
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---
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile Index: linux-2.6.22.19/drivers/net/phy/Makefile
index bcd1efb..8885650 100644 ===================================================================
--- a/drivers/net/phy/Makefile --- linux-2.6.22.19.orig/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile +++ linux-2.6.22.19/drivers/net/phy/Makefile
@@ -11,4 +11,5 @@ obj-$(CONFIG_QSEMI_PHY) += qsemi.o @@ -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
diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c Index: linux-2.6.22.19/drivers/net/phy/icplus.c
new file mode 100644 ===================================================================
index 0000000..af3f1f2
--- /dev/null --- /dev/null
+++ b/drivers/net/phy/icplus.c +++ linux-2.6.22.19/drivers/net/phy/icplus.c
@@ -0,0 +1,134 @@ @@ -0,0 +1,134 @@
+/* +/*
+ * Driver for ICPlus PHYs + * Driver for ICPlus PHYs