hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[kernel] refresh generic-2.4 patches 

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11213 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Gabor Juhos 2008-05-19 13:44:11 +00:00
parent 8bba2218b3
commit 7376611dc7
67 changed files with 3767 additions and 3767 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2514
target/linux/generic-2.4/patches/000-linux_mips.patch
View File

File diff suppressed because it is too large Load Diff

72
target/linux/generic-2.4/patches/001-squashfs.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/fs/Config.in Index: linux-2.4.35.4/fs/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/Config.in 2007-12-15 05:19:42.758857728 +0100 --- linux-2.4.35.4.orig/fs/Config.in
+++ linux-2.4.35.4/fs/Config.in 2007-12-15 05:19:48.635192599 +0100 +++ linux-2.4.35.4/fs/Config.in
@@ -51,6 +51,14 @@ @@ -51,6 +51,14 @@ if [ "$CONFIG_JFFS2_FS" = "y" -o "$CONFI
int 'JFFS2 debugging verbosity (0 = quiet, 2 = noisy)' CONFIG_JFFS2_FS_DEBUG 0 int 'JFFS2 debugging verbosity (0 = quiet, 2 = noisy)' CONFIG_JFFS2_FS_DEBUG 0
fi fi
tristate 'Compressed ROM file system support' CONFIG_CRAMFS tristate 'Compressed ROM file system support' CONFIG_CRAMFS
@ -19,9 +19,9 @@ Index: linux-2.4.35.4/fs/Config.in
Index: linux-2.4.35.4/fs/Makefile Index: linux-2.4.35.4/fs/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/Makefile 2007-12-15 05:19:42.766858183 +0100 --- linux-2.4.35.4.orig/fs/Makefile
+++ linux-2.4.35.4/fs/Makefile 2007-12-15 05:19:48.639192828 +0100 +++ linux-2.4.35.4/fs/Makefile
@@ -65,6 +65,7 @@ @@ -65,6 +65,7 @@ subdir-$(CONFIG_REISERFS_FS) += reiserfs
subdir-$(CONFIG_DEVPTS_FS) += devpts subdir-$(CONFIG_DEVPTS_FS) += devpts
subdir-$(CONFIG_SUN_OPENPROMFS) += openpromfs subdir-$(CONFIG_SUN_OPENPROMFS) += openpromfs
subdir-$(CONFIG_BEFS_FS) += befs subdir-$(CONFIG_BEFS_FS) += befs
@ -31,8 +31,8 @@ Index: linux-2.4.35.4/fs/Makefile
Index: linux-2.4.35.4/fs/squashfs/inode.c Index: linux-2.4.35.4/fs/squashfs/inode.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/squashfs/inode.c 2007-12-15 05:19:48.647193283 +0100 +++ linux-2.4.35.4/fs/squashfs/inode.c
@@ -0,0 +1,2028 @@ @@ -0,0 +1,2028 @@
+/* +/*
+ * Squashfs - a compressed read only filesystem for Linux + * Squashfs - a compressed read only filesystem for Linux
@ -2064,8 +2064,8 @@ Index: linux-2.4.35.4/fs/squashfs/inode.c
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
Index: linux-2.4.35.4/fs/squashfs/Makefile Index: linux-2.4.35.4/fs/squashfs/Makefile
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/squashfs/Makefile 2007-12-15 05:19:48.651193513 +0100 +++ linux-2.4.35.4/fs/squashfs/Makefile
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+# +#
+# Makefile for the linux squashfs routines. +# Makefile for the linux squashfs routines.
@ -2080,8 +2080,8 @@ Index: linux-2.4.35.4/fs/squashfs/Makefile
+include $(TOPDIR)/Rules.make +include $(TOPDIR)/Rules.make
Index: linux-2.4.35.4/fs/squashfs/squashfs2_0.c Index: linux-2.4.35.4/fs/squashfs/squashfs2_0.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/squashfs/squashfs2_0.c 2007-12-15 05:19:48.655193739 +0100 +++ linux-2.4.35.4/fs/squashfs/squashfs2_0.c
@@ -0,0 +1,751 @@ @@ -0,0 +1,751 @@
+/* +/*
+ * Squashfs - a compressed read only filesystem for Linux + * Squashfs - a compressed read only filesystem for Linux
@ -2836,8 +2836,8 @@ Index: linux-2.4.35.4/fs/squashfs/squashfs2_0.c
+} +}
Index: linux-2.4.35.4/fs/squashfs/squashfs.h Index: linux-2.4.35.4/fs/squashfs/squashfs.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/squashfs/squashfs.h 2007-12-15 05:19:48.659193968 +0100 +++ linux-2.4.35.4/fs/squashfs/squashfs.h
@@ -0,0 +1,85 @@ @@ -0,0 +1,85 @@
+/* +/*
+ * Squashfs - a compressed read only filesystem for Linux + * Squashfs - a compressed read only filesystem for Linux
@ -2926,9 +2926,9 @@ Index: linux-2.4.35.4/fs/squashfs/squashfs.h
+#endif +#endif
Index: linux-2.4.35.4/include/linux/fs.h Index: linux-2.4.35.4/include/linux/fs.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/linux/fs.h 2007-12-15 05:19:42.794859778 +0100 --- linux-2.4.35.4.orig/include/linux/fs.h
+++ linux-2.4.35.4/include/linux/fs.h 2007-12-15 05:19:48.663194197 +0100 +++ linux-2.4.35.4/include/linux/fs.h
@@ -324,6 +324,7 @@ @@ -324,6 +324,7 @@ extern void set_bh_page(struct buffer_he
#include <linux/usbdev_fs_i.h> #include <linux/usbdev_fs_i.h>
#include <linux/jffs2_fs_i.h> #include <linux/jffs2_fs_i.h>
#include <linux/cramfs_fs_sb.h> #include <linux/cramfs_fs_sb.h>
@ -2936,7 +2936,7 @@ Index: linux-2.4.35.4/include/linux/fs.h
/* /*
* Attribute flags. These should be or-ed together to figure out what * Attribute flags. These should be or-ed together to figure out what
@@ -519,6 +520,7 @@ @@ -519,6 +520,7 @@ struct inode {
struct socket socket_i; struct socket socket_i;
struct usbdev_inode_info usbdev_i; struct usbdev_inode_info usbdev_i;
struct jffs2_inode_info jffs2_i; struct jffs2_inode_info jffs2_i;
@ -2944,7 +2944,7 @@ Index: linux-2.4.35.4/include/linux/fs.h
void *generic_ip; void *generic_ip;
} u; } u;
}; };
@@ -734,6 +736,7 @@ @@ -734,6 +736,7 @@ struct nameidata {
#include <linux/usbdev_fs_sb.h> #include <linux/usbdev_fs_sb.h>
#include <linux/cramfs_fs_sb.h> #include <linux/cramfs_fs_sb.h>
#include <linux/jffs2_fs_sb.h> #include <linux/jffs2_fs_sb.h>
@ -2952,7 +2952,7 @@ Index: linux-2.4.35.4/include/linux/fs.h
extern struct list_head super_blocks; extern struct list_head super_blocks;
extern spinlock_t sb_lock; extern spinlock_t sb_lock;
@@ -793,6 +796,7 @@ @@ -793,6 +796,7 @@ struct super_block {
struct usbdev_sb_info usbdevfs_sb; struct usbdev_sb_info usbdevfs_sb;
struct jffs2_sb_info jffs2_sb; struct jffs2_sb_info jffs2_sb;
struct cramfs_sb_info cramfs_sb; struct cramfs_sb_info cramfs_sb;
@ -2962,8 +2962,8 @@ Index: linux-2.4.35.4/include/linux/fs.h
/* /*
Index: linux-2.4.35.4/include/linux/squashfs_fs.h Index: linux-2.4.35.4/include/linux/squashfs_fs.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/squashfs_fs.h 2007-12-15 05:19:48.663194197 +0100 +++ linux-2.4.35.4/include/linux/squashfs_fs.h
@@ -0,0 +1,915 @@ @@ -0,0 +1,915 @@
+#ifndef SQUASHFS_FS +#ifndef SQUASHFS_FS
+#define SQUASHFS_FS +#define SQUASHFS_FS
@ -3882,8 +3882,8 @@ Index: linux-2.4.35.4/include/linux/squashfs_fs.h
+#endif +#endif
Index: linux-2.4.35.4/include/linux/squashfs_fs_i.h Index: linux-2.4.35.4/include/linux/squashfs_fs_i.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/squashfs_fs_i.h 2007-12-15 05:19:48.663194197 +0100 +++ linux-2.4.35.4/include/linux/squashfs_fs_i.h
@@ -0,0 +1,44 @@ @@ -0,0 +1,44 @@
+#ifndef SQUASHFS_FS_I +#ifndef SQUASHFS_FS_I
+#define SQUASHFS_FS_I +#define SQUASHFS_FS_I
@ -3931,8 +3931,8 @@ Index: linux-2.4.35.4/include/linux/squashfs_fs_i.h
+#endif +#endif
Index: linux-2.4.35.4/include/linux/squashfs_fs_sb.h Index: linux-2.4.35.4/include/linux/squashfs_fs_sb.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/squashfs_fs_sb.h 2007-12-15 05:19:48.667194423 +0100 +++ linux-2.4.35.4/include/linux/squashfs_fs_sb.h
@@ -0,0 +1,74 @@ @@ -0,0 +1,74 @@
+#ifndef SQUASHFS_FS_SB +#ifndef SQUASHFS_FS_SB
+#define SQUASHFS_FS_SB +#define SQUASHFS_FS_SB
@ -4010,8 +4010,8 @@ Index: linux-2.4.35.4/include/linux/squashfs_fs_sb.h
+#endif +#endif
Index: linux-2.4.35.4/init/do_mounts.c Index: linux-2.4.35.4/init/do_mounts.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/init/do_mounts.c 2007-12-15 05:19:42.822861373 +0100 --- linux-2.4.35.4.orig/init/do_mounts.c
+++ linux-2.4.35.4/init/do_mounts.c 2007-12-15 05:19:48.667194423 +0100 +++ linux-2.4.35.4/init/do_mounts.c
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
#include <linux/minix_fs.h> #include <linux/minix_fs.h>
#include <linux/ext2_fs.h> #include <linux/ext2_fs.h>
@ -4020,7 +4020,7 @@ Index: linux-2.4.35.4/init/do_mounts.c
#include <linux/cramfs_fs.h> #include <linux/cramfs_fs.h>
#define BUILD_CRAMDISK #define BUILD_CRAMDISK
@@ -476,6 +477,7 @@ @@ -476,6 +477,7 @@ static int __init crd_load(int in_fd, in
* minix * minix
* ext2 * ext2
* romfs * romfs
@ -4028,7 +4028,7 @@ Index: linux-2.4.35.4/init/do_mounts.c
* cramfs * cramfs
* gzip * gzip
*/ */
@@ -486,6 +488,7 @@ @@ -486,6 +488,7 @@ identify_ramdisk_image(int fd, int start
struct minix_super_block *minixsb; struct minix_super_block *minixsb;
struct ext2_super_block *ext2sb; struct ext2_super_block *ext2sb;
struct romfs_super_block *romfsb; struct romfs_super_block *romfsb;
@ -4036,7 +4036,7 @@ Index: linux-2.4.35.4/init/do_mounts.c
struct cramfs_super *cramfsb; struct cramfs_super *cramfsb;
int nblocks = -1; int nblocks = -1;
unsigned char *buf; unsigned char *buf;
@@ -497,6 +500,7 @@ @@ -497,6 +500,7 @@ identify_ramdisk_image(int fd, int start
minixsb = (struct minix_super_block *) buf; minixsb = (struct minix_super_block *) buf;
ext2sb = (struct ext2_super_block *) buf; ext2sb = (struct ext2_super_block *) buf;
romfsb = (struct romfs_super_block *) buf; romfsb = (struct romfs_super_block *) buf;
@ -4044,7 +4044,7 @@ Index: linux-2.4.35.4/init/do_mounts.c
cramfsb = (struct cramfs_super *) buf; cramfsb = (struct cramfs_super *) buf;
memset(buf, 0xe5, size); memset(buf, 0xe5, size);
@@ -535,6 +539,15 @@ @@ -535,6 +539,15 @@ identify_ramdisk_image(int fd, int start
goto done; goto done;
} }
@ -4062,9 +4062,9 @@ Index: linux-2.4.35.4/init/do_mounts.c
*/ */
Index: linux-2.4.35.4/lib/Config.in Index: linux-2.4.35.4/lib/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/lib/Config.in 2007-12-15 05:19:42.830861829 +0100 --- linux-2.4.35.4.orig/lib/Config.in
+++ linux-2.4.35.4/lib/Config.in 2007-12-15 05:19:48.667194423 +0100 +++ linux-2.4.35.4/lib/Config.in
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@ tristate 'CRC32 functions' CONFIG_CRC32
# Do we need the compression support? # Do we need the compression support?
# #
if [ "$CONFIG_CRAMFS" = "y" -o \ if [ "$CONFIG_CRAMFS" = "y" -o \
@ -4072,7 +4072,7 @@ Index: linux-2.4.35.4/lib/Config.in
"$CONFIG_PPP_DEFLATE" = "y" -o \ "$CONFIG_PPP_DEFLATE" = "y" -o \
"$CONFIG_CRYPTO_DEFLATE" = "y" -o \ "$CONFIG_CRYPTO_DEFLATE" = "y" -o \
"$CONFIG_JFFS2_FS" = "y" -o \ "$CONFIG_JFFS2_FS" = "y" -o \
@@ -17,6 +18,7 @@ @@ -17,6 +18,7 @@ if [ "$CONFIG_CRAMFS" = "y" -o \
define_tristate CONFIG_ZLIB_INFLATE y define_tristate CONFIG_ZLIB_INFLATE y
else else
if [ "$CONFIG_CRAMFS" = "m" -o \ if [ "$CONFIG_CRAMFS" = "m" -o \

24
target/linux/generic-2.4/patches/002-squashfs_lzma.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.4.35.4/fs/squashfs/inode.c Index: linux-2.4.35.4/fs/squashfs/inode.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/squashfs/inode.c 2007-12-15 05:19:48.647193283 +0100 --- linux-2.4.35.4.orig/fs/squashfs/inode.c
+++ linux-2.4.35.4/fs/squashfs/inode.c 2007-12-15 05:19:49.015214255 +0100 +++ linux-2.4.35.4/fs/squashfs/inode.c
@@ -4,6 +4,9 @@ @@ -4,6 +4,9 @@
* Copyright (c) 2002, 2003, 2004, 2005, 2006 * Copyright (c) 2002, 2003, 2004, 2005, 2006
* Phillip Lougher <phillip@lougher.org.uk> * Phillip Lougher <phillip@lougher.org.uk>
@ -41,7 +41,7 @@ Index: linux-2.4.35.4/fs/squashfs/inode.c
static struct super_block *squashfs_read_super(struct super_block *, void *, int); static struct super_block *squashfs_read_super(struct super_block *, void *, int);
static void squashfs_put_super(struct super_block *); static void squashfs_put_super(struct super_block *);
static int squashfs_statfs(struct super_block *, struct statfs *); static int squashfs_statfs(struct super_block *, struct statfs *);
@@ -53,7 +71,11 @@ @@ -53,7 +71,11 @@ static long long read_blocklist(struct i
int readahead_blks, char *block_list, int readahead_blks, char *block_list,
unsigned short **block_p, unsigned int *bsize); unsigned short **block_p, unsigned int *bsize);
@ -53,7 +53,7 @@ Index: linux-2.4.35.4/fs/squashfs/inode.c
static DECLARE_FSTYPE_DEV(squashfs_fs_type, "squashfs", squashfs_read_super); static DECLARE_FSTYPE_DEV(squashfs_fs_type, "squashfs", squashfs_read_super);
@@ -229,6 +251,15 @@ @@ -229,6 +251,15 @@ SQSH_EXTERN unsigned int squashfs_read_d
if (compressed) { if (compressed) {
int zlib_err; int zlib_err;
@ -69,7 +69,7 @@ Index: linux-2.4.35.4/fs/squashfs/inode.c
stream.next_in = c_buffer; stream.next_in = c_buffer;
stream.avail_in = c_byte; stream.avail_in = c_byte;
stream.next_out = buffer; stream.next_out = buffer;
@@ -243,6 +274,7 @@ @@ -243,6 +274,7 @@ SQSH_EXTERN unsigned int squashfs_read_d
bytes = 0; bytes = 0;
} else } else
bytes = stream.total_out; bytes = stream.total_out;
@ -77,7 +77,7 @@ Index: linux-2.4.35.4/fs/squashfs/inode.c
up(&msblk->read_data_mutex); up(&msblk->read_data_mutex);
} }
@@ -2004,17 +2036,21 @@ @@ -2004,17 +2036,21 @@ 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");
@ -101,8 +101,8 @@ Index: linux-2.4.35.4/fs/squashfs/inode.c
Index: linux-2.4.35.4/fs/squashfs/LzmaDecode.c Index: linux-2.4.35.4/fs/squashfs/LzmaDecode.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/squashfs/LzmaDecode.c 2007-12-15 05:19:49.019214484 +0100 +++ linux-2.4.35.4/fs/squashfs/LzmaDecode.c
@@ -0,0 +1,663 @@ @@ -0,0 +1,663 @@
+/* +/*
+ LzmaDecode.c + LzmaDecode.c
@ -769,8 +769,8 @@ Index: linux-2.4.35.4/fs/squashfs/LzmaDecode.c
+} +}
Index: linux-2.4.35.4/fs/squashfs/LzmaDecode.h Index: linux-2.4.35.4/fs/squashfs/LzmaDecode.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/squashfs/LzmaDecode.h 2007-12-15 05:19:49.027214939 +0100 +++ linux-2.4.35.4/fs/squashfs/LzmaDecode.h
@@ -0,0 +1,100 @@ @@ -0,0 +1,100 @@
+/* +/*
+ LzmaDecode.h + LzmaDecode.h
@ -874,8 +874,8 @@ Index: linux-2.4.35.4/fs/squashfs/LzmaDecode.h
+#endif +#endif
Index: linux-2.4.35.4/fs/squashfs/Makefile Index: linux-2.4.35.4/fs/squashfs/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/squashfs/Makefile 2007-12-15 05:19:48.651193513 +0100 --- linux-2.4.35.4.orig/fs/squashfs/Makefile
+++ linux-2.4.35.4/fs/squashfs/Makefile 2007-12-15 05:19:49.031215169 +0100 +++ linux-2.4.35.4/fs/squashfs/Makefile
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
O_TARGET := squashfs.o O_TARGET := squashfs.o

116
target/linux/generic-2.4/patches/003-jffs2_compression.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/Documentation/Configure.help Index: linux-2.4.35.4/Documentation/Configure.help
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:19:42.546845646 +0100 --- linux-2.4.35.4.orig/Documentation/Configure.help
+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:19:49.287229757 +0100 +++ linux-2.4.35.4/Documentation/Configure.help
@@ -17580,6 +17580,32 @@ @@ -17580,6 +17580,32 @@ CONFIG_JFFS2_FS_DEBUG
If reporting bugs, please try to have available a full dump of the If reporting bugs, please try to have available a full dump of the
messages at debug level 1 while the misbehaviour was occurring. messages at debug level 1 while the misbehaviour was occurring.
@ -37,9 +37,9 @@ Index: linux-2.4.35.4/Documentation/Configure.help
Enabling this option will cause statistics from mounted JFFS file systems Enabling this option will cause statistics from mounted JFFS file systems
Index: linux-2.4.35.4/fs/Config.in Index: linux-2.4.35.4/fs/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/Config.in 2007-12-15 05:19:48.635192599 +0100 --- linux-2.4.35.4.orig/fs/Config.in
+++ linux-2.4.35.4/fs/Config.in 2007-12-15 05:19:49.287229757 +0100 +++ linux-2.4.35.4/fs/Config.in
@@ -50,6 +50,12 @@ @@ -50,6 +50,12 @@ dep_tristate 'Journalling Flash File Sys
if [ "$CONFIG_JFFS2_FS" = "y" -o "$CONFIG_JFFS2_FS" = "m" ] ; then if [ "$CONFIG_JFFS2_FS" = "y" -o "$CONFIG_JFFS2_FS" = "m" ] ; then
int 'JFFS2 debugging verbosity (0 = quiet, 2 = noisy)' CONFIG_JFFS2_FS_DEBUG 0 int 'JFFS2 debugging verbosity (0 = quiet, 2 = noisy)' CONFIG_JFFS2_FS_DEBUG 0
fi fi
@ -54,8 +54,8 @@ Index: linux-2.4.35.4/fs/Config.in
if [ "$CONFIG_SQUASHFS" = "y" -o "$CONFIG_SQUASHFS" = "m" ] ; then if [ "$CONFIG_SQUASHFS" = "y" -o "$CONFIG_SQUASHFS" = "m" ] ; then
Index: linux-2.4.35.4/fs/jffs2/Config.in.bbc.inc Index: linux-2.4.35.4/fs/jffs2/Config.in.bbc.inc
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/jffs2/Config.in.bbc.inc 2007-12-15 05:19:49.295230212 +0100 +++ linux-2.4.35.4/fs/jffs2/Config.in.bbc.inc
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
+dep_mbool ' ARMLIB compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_ARMLIB $CONFIG_JFFS2_FS +dep_mbool ' ARMLIB compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_ARMLIB $CONFIG_JFFS2_FS
+dep_mbool ' LZO1X-* compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZO $CONFIG_JFFS2_FS +dep_mbool ' LZO1X-* compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZO $CONFIG_JFFS2_FS
@ -64,8 +64,8 @@ Index: linux-2.4.35.4/fs/jffs2/Config.in.bbc.inc
+dep_mbool ' LZSS compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZSS $CONFIG_JFFS2_FS +dep_mbool ' LZSS compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZSS $CONFIG_JFFS2_FS
Index: linux-2.4.35.4/fs/jffs2/Configure.help.bbc.inc Index: linux-2.4.35.4/fs/jffs2/Configure.help.bbc.inc
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/jffs2/Configure.help.bbc.inc 2007-12-15 05:19:49.299230441 +0100 +++ linux-2.4.35.4/fs/jffs2/Configure.help.bbc.inc
@@ -0,0 +1,25 @@ @@ -0,0 +1,25 @@
+ARMLIB compression support for BBC (EXPERIMENTAL) +ARMLIB compression support for BBC (EXPERIMENTAL)
+CONFIG_JFFS2_BBC_ARMLIB +CONFIG_JFFS2_BBC_ARMLIB
@ -94,8 +94,8 @@ Index: linux-2.4.35.4/fs/jffs2/Configure.help.bbc.inc
+ was included just for testing) + was included just for testing)
Index: linux-2.4.35.4/fs/jffs2/Kconfig.bbc.inc Index: linux-2.4.35.4/fs/jffs2/Kconfig.bbc.inc
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/jffs2/Kconfig.bbc.inc 2007-12-15 05:19:49.303230670 +0100 +++ linux-2.4.35.4/fs/jffs2/Kconfig.bbc.inc
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+config JFFS2_BBC_ARMLIB +config JFFS2_BBC_ARMLIB
+ bool "ARMLIB compression support for BBC (EXPERIMENTAL)" + bool "ARMLIB compression support for BBC (EXPERIMENTAL)"
@ -139,8 +139,8 @@ Index: linux-2.4.35.4/fs/jffs2/Kconfig.bbc.inc
+ was included just for testing) + was included just for testing)
Index: linux-2.4.35.4/fs/jffs2/Makefile Index: linux-2.4.35.4/fs/jffs2/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/jffs2/Makefile 2007-12-15 05:19:42.578847470 +0100 --- linux-2.4.35.4.orig/fs/jffs2/Makefile
+++ linux-2.4.35.4/fs/jffs2/Makefile 2007-12-15 05:19:49.307230896 +0100 +++ linux-2.4.35.4/fs/jffs2/Makefile
@@ -10,9 +10,23 @@ @@ -10,9 +10,23 @@
# Note 2! The CFLAGS definitions are now in the main makefile... # Note 2! The CFLAGS definitions are now in the main makefile...
@ -167,8 +167,8 @@ Index: linux-2.4.35.4/fs/jffs2/Makefile
Index: linux-2.4.35.4/fs/jffs2/Makefile.bbc.inc Index: linux-2.4.35.4/fs/jffs2/Makefile.bbc.inc
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/jffs2/Makefile.bbc.inc 2007-12-15 05:19:49.307230896 +0100 +++ linux-2.4.35.4/fs/jffs2/Makefile.bbc.inc
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
+JFFS2_BBC_KERNEL_OBJS-y = jffs2_bbc_framework.o jffs2_bbc_fs.o +JFFS2_BBC_KERNEL_OBJS-y = jffs2_bbc_framework.o jffs2_bbc_fs.o
+ +
@ -184,9 +184,9 @@ Index: linux-2.4.35.4/fs/jffs2/Makefile.bbc.inc
+ jffs2_bbc_lzss_comp.o jffs2_bbc_lzari_comp.o jffs2_bbc_lzhd_comp.o + jffs2_bbc_lzss_comp.o jffs2_bbc_lzari_comp.o jffs2_bbc_lzhd_comp.o
Index: linux-2.4.35.4/fs/jffs2/compr_zlib.c Index: linux-2.4.35.4/fs/jffs2/compr_zlib.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/jffs2/compr_zlib.c 2007-12-15 05:19:42.590848151 +0100 --- linux-2.4.35.4.orig/fs/jffs2/compr_zlib.c
+++ linux-2.4.35.4/fs/jffs2/compr_zlib.c 2007-12-15 05:19:49.307230896 +0100 +++ linux-2.4.35.4/fs/jffs2/compr_zlib.c
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@ void jffs2_zlib_exit(void)
vfree(inflate_workspace); vfree(inflate_workspace);
} }
@ -195,7 +195,7 @@ Index: linux-2.4.35.4/fs/jffs2/compr_zlib.c
__u32 *sourcelen, __u32 *dstlen) __u32 *sourcelen, __u32 *dstlen)
{ {
z_stream strm; z_stream strm;
@@ -145,7 +145,7 @@ @@ -145,7 +145,7 @@ int zlib_compress(unsigned char *data_in
return 0; return 0;
} }
@ -204,7 +204,7 @@ Index: linux-2.4.35.4/fs/jffs2/compr_zlib.c
__u32 srclen, __u32 destlen) __u32 srclen, __u32 destlen)
{ {
z_stream strm; z_stream strm;
@@ -175,3 +175,19 @@ @@ -175,3 +175,19 @@ void zlib_decompress(unsigned char *data
zlib_inflateEnd(&strm); zlib_inflateEnd(&strm);
up(&inflate_sem); up(&inflate_sem);
} }
@ -226,8 +226,8 @@ Index: linux-2.4.35.4/fs/jffs2/compr_zlib.c
+ +
Index: linux-2.4.35.4/fs/jffs2/file.c Index: linux-2.4.35.4/fs/jffs2/file.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/jffs2/file.c 2007-12-15 05:19:42.594848380 +0100 --- linux-2.4.35.4.orig/fs/jffs2/file.c
+++ linux-2.4.35.4/fs/jffs2/file.c 2007-12-15 05:19:49.307230896 +0100 +++ linux-2.4.35.4/fs/jffs2/file.c
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
* *
*/ */
@ -236,7 +236,7 @@ Index: linux-2.4.35.4/fs/jffs2/file.c
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mtd/compatmac.h> /* for min() */ #include <linux/mtd/compatmac.h> /* for min() */
#include <linux/slab.h> #include <linux/slab.h>
@@ -459,6 +460,7 @@ @@ -459,6 +460,7 @@ int jffs2_commit_write (struct file *fil
comprbuf = kmalloc(cdatalen, GFP_KERNEL); comprbuf = kmalloc(cdatalen, GFP_KERNEL);
if (comprbuf) { if (comprbuf) {
@ -246,8 +246,8 @@ Index: linux-2.4.35.4/fs/jffs2/file.c
if (comprtype == JFFS2_COMPR_NONE) { if (comprtype == JFFS2_COMPR_NONE) {
Index: linux-2.4.35.4/fs/jffs2/gc.c Index: linux-2.4.35.4/fs/jffs2/gc.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/jffs2/gc.c 2007-12-15 05:19:42.602848836 +0100 --- linux-2.4.35.4.orig/fs/jffs2/gc.c
+++ linux-2.4.35.4/fs/jffs2/gc.c 2007-12-15 05:19:49.311231126 +0100 +++ linux-2.4.35.4/fs/jffs2/gc.c
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
* *
*/ */
@ -256,7 +256,7 @@ Index: linux-2.4.35.4/fs/jffs2/gc.c
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/slab.h> #include <linux/slab.h>
@@ -651,6 +652,7 @@ @@ -651,6 +652,7 @@ static int jffs2_garbage_collect_dnode(s
writebuf = pg_ptr + (offset & (PAGE_CACHE_SIZE -1)); writebuf = pg_ptr + (offset & (PAGE_CACHE_SIZE -1));
if (comprbuf) { if (comprbuf) {
@ -266,8 +266,8 @@ Index: linux-2.4.35.4/fs/jffs2/gc.c
if (comprtype) { if (comprtype) {
Index: linux-2.4.35.4/fs/jffs2/hpatch Index: linux-2.4.35.4/fs/jffs2/hpatch
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/jffs2/hpatch 2007-12-15 05:19:49.311231126 +0100 +++ linux-2.4.35.4/fs/jffs2/hpatch
@@ -0,0 +1,191 @@ @@ -0,0 +1,191 @@
+#!/usr/bin/perl +#!/usr/bin/perl
+# A patch-like utility +# A patch-like utility
@ -462,8 +462,8 @@ Index: linux-2.4.35.4/fs/jffs2/hpatch
+close(CMD); +close(CMD);
Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_armlib_comp.c Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_armlib_comp.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_armlib_comp.c 2007-12-15 05:19:49.311231126 +0100 +++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_armlib_comp.c
@@ -0,0 +1,2224 @@ @@ -0,0 +1,2224 @@
+/* +/*
+ * JFFS2-BBC: armlib compressor plugin + * JFFS2-BBC: armlib compressor plugin
@ -2691,8 +2691,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_armlib_comp.c
+/*END OF ARMLIB*/ +/*END OF ARMLIB*/
Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.c Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.c 2007-12-15 05:19:49.315231352 +0100 +++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.c
@@ -0,0 +1,1324 @@ @@ -0,0 +1,1324 @@
+/* +/*
+ * JFFS2-BBC: Compression Framework + * JFFS2-BBC: Compression Framework
@ -4020,8 +4020,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.c
+#endif +#endif
Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.h Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.h 2007-12-15 05:19:49.315231352 +0100 +++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.h
@@ -0,0 +1,202 @@ @@ -0,0 +1,202 @@
+/* +/*
+ * JFFS2-BBC: Compression Framework - headers + * JFFS2-BBC: Compression Framework - headers
@ -4227,8 +4227,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.h
+#endif +#endif
Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.c Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.c 2007-12-15 05:19:49.315231352 +0100 +++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.c
@@ -0,0 +1,331 @@ @@ -0,0 +1,331 @@
+/* +/*
+ * JFFS2-BBC: File System Extension for Linux Kernel + * JFFS2-BBC: File System Extension for Linux Kernel
@ -4563,8 +4563,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.c
+} +}
Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.h Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.h 2007-12-15 05:19:49.315231352 +0100 +++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.h
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
+/* +/*
+ * JFFS2 BBC: File System Extension for Linux Kernel - headers + * JFFS2 BBC: File System Extension for Linux Kernel - headers
@ -4598,8 +4598,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.h
+void jffs2_bbc_proc_deinit(void); +void jffs2_bbc_proc_deinit(void);
Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzari_comp.c Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzari_comp.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzari_comp.c 2007-12-15 05:19:49.319231581 +0100 +++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzari_comp.c
@@ -0,0 +1,788 @@ @@ -0,0 +1,788 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+ +
@ -5391,8 +5391,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzari_comp.c
+} +}
Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzhd_comp.c Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzhd_comp.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzhd_comp.c 2007-12-15 05:19:49.319231581 +0100 +++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzhd_comp.c
@@ -0,0 +1,747 @@ @@ -0,0 +1,747 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+ +
@ -6143,8 +6143,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzhd_comp.c
+} +}
Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzo_comp.c Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzo_comp.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzo_comp.c 2007-12-15 05:19:49.323231810 +0100 +++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzo_comp.c
@@ -0,0 +1,2435 @@ @@ -0,0 +1,2435 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+ +
@ -8583,8 +8583,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzo_comp.c
+} +}
Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzss_comp.c Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzss_comp.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzss_comp.c 2007-12-15 05:19:49.323231810 +0100 +++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzss_comp.c
@@ -0,0 +1,385 @@ @@ -0,0 +1,385 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+ +
@ -8973,8 +8973,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzss_comp.c
+} +}
Index: linux-2.4.35.4/fs/jffs2/linux-2.4.25.hpatch Index: linux-2.4.35.4/fs/jffs2/linux-2.4.25.hpatch
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/jffs2/linux-2.4.25.hpatch 2007-12-15 05:19:49.323231810 +0100 +++ linux-2.4.35.4/fs/jffs2/linux-2.4.25.hpatch
@@ -0,0 +1,97 @@ @@ -0,0 +1,97 @@
+FMakefile +FMakefile
+=BBC insertion +=BBC insertion
@ -9075,8 +9075,8 @@ Index: linux-2.4.35.4/fs/jffs2/linux-2.4.25.hpatch
++ ++
Index: linux-2.4.35.4/fs/jffs2/read.c Index: linux-2.4.35.4/fs/jffs2/read.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/jffs2/read.c 2007-12-15 05:19:42.666852484 +0100 --- linux-2.4.35.4.orig/fs/jffs2/read.c
+++ linux-2.4.35.4/fs/jffs2/read.c 2007-12-15 05:19:49.323231810 +0100 +++ linux-2.4.35.4/fs/jffs2/read.c
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
* *
*/ */
@ -9085,7 +9085,7 @@ Index: linux-2.4.35.4/fs/jffs2/read.c
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/jffs2.h> #include <linux/jffs2.h>
@@ -140,6 +141,7 @@ @@ -140,6 +141,7 @@ int jffs2_read_dnode(struct jffs2_sb_inf
D2(printk(KERN_DEBUG "Data CRC matches calculated CRC %08x\n", crc)); D2(printk(KERN_DEBUG "Data CRC matches calculated CRC %08x\n", crc));
if (ri->compr != JFFS2_COMPR_NONE) { if (ri->compr != JFFS2_COMPR_NONE) {
D2(printk(KERN_DEBUG "Decompress %d bytes from %p to %d bytes at %p\n", ri->csize, readbuf, ri->dsize, decomprbuf)); D2(printk(KERN_DEBUG "Decompress %d bytes from %p to %d bytes at %p\n", ri->csize, readbuf, ri->dsize, decomprbuf));
@ -9095,8 +9095,8 @@ Index: linux-2.4.35.4/fs/jffs2/read.c
printk(KERN_WARNING "Error: jffs2_decompress returned %d\n", ret); printk(KERN_WARNING "Error: jffs2_decompress returned %d\n", ret);
Index: linux-2.4.35.4/fs/jffs2/super.c Index: linux-2.4.35.4/fs/jffs2/super.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/jffs2/super.c 2007-12-15 05:19:42.678853169 +0100 --- linux-2.4.35.4.orig/fs/jffs2/super.c
+++ linux-2.4.35.4/fs/jffs2/super.c 2007-12-15 05:19:49.323231810 +0100 +++ linux-2.4.35.4/fs/jffs2/super.c
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
* *
*/ */
@ -9105,7 +9105,7 @@ Index: linux-2.4.35.4/fs/jffs2/super.c
#include <linux/config.h> #include <linux/config.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
@@ -272,6 +273,7 @@ @@ -272,6 +273,7 @@ static struct super_block *jffs2_read_su
sb->s_magic = JFFS2_SUPER_MAGIC; sb->s_magic = JFFS2_SUPER_MAGIC;
if (!(sb->s_flags & MS_RDONLY)) if (!(sb->s_flags & MS_RDONLY))
jffs2_start_garbage_collect_thread(c); jffs2_start_garbage_collect_thread(c);
@ -9113,7 +9113,7 @@ Index: linux-2.4.35.4/fs/jffs2/super.c
return sb; return sb;
out_root_i: out_root_i:
@@ -288,6 +290,7 @@ @@ -288,6 +290,7 @@ static struct super_block *jffs2_read_su
void jffs2_put_super (struct super_block *sb) void jffs2_put_super (struct super_block *sb)
{ {
struct jffs2_sb_info *c = JFFS2_SB_INFO(sb); struct jffs2_sb_info *c = JFFS2_SB_INFO(sb);
@ -9121,7 +9121,7 @@ Index: linux-2.4.35.4/fs/jffs2/super.c
D2(printk(KERN_DEBUG "jffs2: jffs2_put_super()\n")); D2(printk(KERN_DEBUG "jffs2: jffs2_put_super()\n"));
@@ -344,6 +347,9 @@ @@ -344,6 +347,9 @@ static int __init init_jffs2_fs(void)
{ {
int ret; int ret;
@ -9131,7 +9131,7 @@ Index: linux-2.4.35.4/fs/jffs2/super.c
printk(KERN_NOTICE "JFFS2 version 2.1. (C) 2001 Red Hat, Inc., designed by Axis Communications AB.\n"); printk(KERN_NOTICE "JFFS2 version 2.1. (C) 2001 Red Hat, Inc., designed by Axis Communications AB.\n");
#ifdef JFFS2_OUT_OF_KERNEL #ifdef JFFS2_OUT_OF_KERNEL
@@ -388,6 +394,8 @@ @@ -388,6 +394,8 @@ static int __init init_jffs2_fs(void)
static void __exit exit_jffs2_fs(void) static void __exit exit_jffs2_fs(void)
{ {

4
target/linux/generic-2.4/patches/004-exec_pagesize.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.4.35.4/include/asm-mips/param.h Index: linux-2.4.35.4/include/asm-mips/param.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/asm-mips/param.h 2007-12-15 05:19:42.518844050 +0100 --- linux-2.4.35.4.orig/include/asm-mips/param.h
+++ linux-2.4.35.4/include/asm-mips/param.h 2007-12-15 05:19:49.823260305 +0100 +++ linux-2.4.35.4/include/asm-mips/param.h
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
#endif /* defined(__KERNEL__) */ #endif /* defined(__KERNEL__) */
#endif /* defined(HZ) */ #endif /* defined(HZ) */

28
target/linux/generic-2.4/patches/005-mtd_flashtypes.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/drivers/mtd/chips/Config.in Index: linux-2.4.35.4/drivers/mtd/chips/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/mtd/chips/Config.in 2007-12-15 05:19:42.454840402 +0100 --- linux-2.4.35.4.orig/drivers/mtd/chips/Config.in
+++ linux-2.4.35.4/drivers/mtd/chips/Config.in 2007-12-15 05:19:50.035272385 +0100 +++ linux-2.4.35.4/drivers/mtd/chips/Config.in
@@ -45,6 +45,7 @@ @@ -45,6 +45,7 @@ fi
dep_tristate ' Support for Intel/Sharp flash chips' CONFIG_MTD_CFI_INTELEXT $CONFIG_MTD_GEN_PROBE dep_tristate ' Support for Intel/Sharp flash chips' CONFIG_MTD_CFI_INTELEXT $CONFIG_MTD_GEN_PROBE
dep_tristate ' Support for AMD/Fujitsu flash chips' CONFIG_MTD_CFI_AMDSTD $CONFIG_MTD_GEN_PROBE dep_tristate ' Support for AMD/Fujitsu flash chips' CONFIG_MTD_CFI_AMDSTD $CONFIG_MTD_GEN_PROBE
dep_tristate ' Support for ST (Advanced Architecture) flash chips' CONFIG_MTD_CFI_STAA $CONFIG_MTD_GEN_PROBE dep_tristate ' Support for ST (Advanced Architecture) flash chips' CONFIG_MTD_CFI_STAA $CONFIG_MTD_GEN_PROBE
@ -12,9 +12,9 @@ Index: linux-2.4.35.4/drivers/mtd/chips/Config.in
dep_tristate ' Support for ROM chips in bus mapping' CONFIG_MTD_ROM $CONFIG_MTD dep_tristate ' Support for ROM chips in bus mapping' CONFIG_MTD_ROM $CONFIG_MTD
Index: linux-2.4.35.4/drivers/mtd/chips/Makefile Index: linux-2.4.35.4/drivers/mtd/chips/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/mtd/chips/Makefile 2007-12-15 05:19:42.462840857 +0100 --- linux-2.4.35.4.orig/drivers/mtd/chips/Makefile
+++ linux-2.4.35.4/drivers/mtd/chips/Makefile 2007-12-15 05:19:50.039272613 +0100 +++ linux-2.4.35.4/drivers/mtd/chips/Makefile
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@ obj-$(CONFIG_MTD) += chipreg.o
obj-$(CONFIG_MTD_AMDSTD) += amd_flash.o obj-$(CONFIG_MTD_AMDSTD) += amd_flash.o
obj-$(CONFIG_MTD_CFI) += cfi_probe.o obj-$(CONFIG_MTD_CFI) += cfi_probe.o
obj-$(CONFIG_MTD_CFI_STAA) += cfi_cmdset_0020.o obj-$(CONFIG_MTD_CFI_STAA) += cfi_cmdset_0020.o
@ -24,8 +24,8 @@ Index: linux-2.4.35.4/drivers/mtd/chips/Makefile
obj-$(CONFIG_MTD_GEN_PROBE) += gen_probe.o obj-$(CONFIG_MTD_GEN_PROBE) += gen_probe.o
Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0701.c Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0701.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0701.c 2007-12-15 05:19:50.047273069 +0100 +++ linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0701.c
@@ -0,0 +1,855 @@ @@ -0,0 +1,855 @@
+/* +/*
+ * Common Flash Interface support: + * Common Flash Interface support:
@ -884,9 +884,9 @@ Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0701.c
+ +
Index: linux-2.4.35.4/drivers/mtd/chips/cfi_probe.c Index: linux-2.4.35.4/drivers/mtd/chips/cfi_probe.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/mtd/chips/cfi_probe.c 2007-12-15 05:19:42.474841541 +0100 --- linux-2.4.35.4.orig/drivers/mtd/chips/cfi_probe.c
+++ linux-2.4.35.4/drivers/mtd/chips/cfi_probe.c 2007-12-15 05:19:50.051273298 +0100 +++ linux-2.4.35.4/drivers/mtd/chips/cfi_probe.c
@@ -67,8 +67,15 @@ @@ -67,8 +67,15 @@ static int cfi_probe_chip(struct map_inf
cfi_send_gen_cmd(0xF0, 0, base, map, cfi, cfi->device_type, NULL); cfi_send_gen_cmd(0xF0, 0, base, map, cfi, cfi->device_type, NULL);
cfi_send_gen_cmd(0x98, 0x55, base, map, cfi, cfi->device_type, NULL); cfi_send_gen_cmd(0x98, 0x55, base, map, cfi, cfi->device_type, NULL);
@ -906,9 +906,9 @@ Index: linux-2.4.35.4/drivers/mtd/chips/cfi_probe.c
/* This is the first time we're called. Set up the CFI /* This is the first time we're called. Set up the CFI
Index: linux-2.4.35.4/drivers/mtd/chips/gen_probe.c Index: linux-2.4.35.4/drivers/mtd/chips/gen_probe.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/mtd/chips/gen_probe.c 2007-12-15 05:19:42.482841997 +0100 --- linux-2.4.35.4.orig/drivers/mtd/chips/gen_probe.c
+++ linux-2.4.35.4/drivers/mtd/chips/gen_probe.c 2007-12-15 05:19:50.055273524 +0100 +++ linux-2.4.35.4/drivers/mtd/chips/gen_probe.c
@@ -328,13 +328,18 @@ @@ -328,13 +328,18 @@ static struct mtd_info *check_cmd_set(st
return cfi_cmdset_0001(map, primary); return cfi_cmdset_0001(map, primary);
#endif #endif
#ifdef CONFIG_MTD_CFI_AMDSTD #ifdef CONFIG_MTD_CFI_AMDSTD

16
target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/mtd/chips/cfi_cmdset_0001.c 2007-12-15 05:19:42.414838122 +0100 --- linux-2.4.35.4.orig/drivers/mtd/chips/cfi_cmdset_0001.c
+++ linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c 2007-12-15 05:19:50.315288342 +0100 +++ linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -28,10 +28,18 @@ @@ -28,10 +28,18 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/delay.h> #include <linux/delay.h>
@ -21,7 +21,7 @@ Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c
// debugging, turns off buffer write mode #define FORCE_WORD_WRITE // debugging, turns off buffer write mode #define FORCE_WORD_WRITE
static int cfi_intelext_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *); static int cfi_intelext_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
@@ -45,6 +53,7 @@ @@ -45,6 +53,7 @@ static int cfi_intelext_lock(struct mtd_
static int cfi_intelext_unlock(struct mtd_info *mtd, loff_t ofs, size_t len); static int cfi_intelext_unlock(struct mtd_info *mtd, loff_t ofs, size_t len);
static int cfi_intelext_suspend (struct mtd_info *); static int cfi_intelext_suspend (struct mtd_info *);
static void cfi_intelext_resume (struct mtd_info *); static void cfi_intelext_resume (struct mtd_info *);
@ -29,7 +29,7 @@ Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c
static void cfi_intelext_destroy(struct mtd_info *); static void cfi_intelext_destroy(struct mtd_info *);
@@ -288,6 +297,9 @@ @@ -288,6 +297,9 @@ static struct mtd_info *cfi_intelext_set
map->fldrv = &cfi_intelext_chipdrv; map->fldrv = &cfi_intelext_chipdrv;
MOD_INC_USE_COUNT; MOD_INC_USE_COUNT;
mtd->name = map->name; mtd->name = map->name;
@ -39,7 +39,7 @@ Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c
return mtd; return mtd;
setup_err: setup_err:
@@ -1961,10 +1973,40 @@ @@ -1961,10 +1973,40 @@ static void cfi_intelext_resume(struct m
} }
} }
@ -82,8 +82,8 @@ Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c
kfree(cfi); kfree(cfi);
Index: linux-2.4.35.4/include/linux/mtd/mtd.h Index: linux-2.4.35.4/include/linux/mtd/mtd.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/linux/mtd/mtd.h 2007-12-15 05:19:42.422838578 +0100 --- linux-2.4.35.4.orig/include/linux/mtd/mtd.h
+++ linux-2.4.35.4/include/linux/mtd/mtd.h 2007-12-15 05:19:50.315288342 +0100 +++ linux-2.4.35.4/include/linux/mtd/mtd.h
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
#include <linux/version.h> #include <linux/version.h>
#include <linux/types.h> #include <linux/types.h>
@ -92,7 +92,7 @@ Index: linux-2.4.35.4/include/linux/mtd/mtd.h
#include <linux/module.h> #include <linux/module.h>
#include <linux/uio.h> #include <linux/uio.h>
@@ -217,6 +218,8 @@ @@ -217,6 +218,8 @@ struct mtd_info {
int (*suspend) (struct mtd_info *mtd); int (*suspend) (struct mtd_info *mtd);
void (*resume) (struct mtd_info *mtd); void (*resume) (struct mtd_info *mtd);

12
target/linux/generic-2.4/patches/009-mtd_uaccess.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/drivers/mtd/mtdchar.c Index: linux-2.4.35.4/drivers/mtd/mtdchar.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/mtd/mtdchar.c 2007-12-15 05:19:42.370835614 +0100 --- linux-2.4.35.4.orig/drivers/mtd/mtdchar.c
+++ linux-2.4.35.4/drivers/mtd/mtdchar.c 2007-12-15 05:19:50.539301109 +0100 +++ linux-2.4.35.4/drivers/mtd/mtdchar.c
@@ -558,13 +558,13 @@ @@ -558,13 +558,13 @@ static void mtd_notify_add(struct mtd_in
sprintf(name, "%d", mtd->index); sprintf(name, "%d", mtd->index);
devfs_rw_handle[mtd->index] = devfs_register(devfs_dir_handle, name, devfs_rw_handle[mtd->index] = devfs_register(devfs_dir_handle, name,
DEVFS_FL_DEFAULT, MTD_CHAR_MAJOR, mtd->index*2, DEVFS_FL_DEFAULT, MTD_CHAR_MAJOR, mtd->index*2,
@ -20,9 +20,9 @@ Index: linux-2.4.35.4/drivers/mtd/mtdchar.c
Index: linux-2.4.35.4/drivers/mtd/mtdblock.c Index: linux-2.4.35.4/drivers/mtd/mtdblock.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/mtd/mtdblock.c 2007-12-15 05:19:42.378836072 +0100 --- linux-2.4.35.4.orig/drivers/mtd/mtdblock.c
+++ linux-2.4.35.4/drivers/mtd/mtdblock.c 2007-12-15 05:19:50.539301109 +0100 +++ linux-2.4.35.4/drivers/mtd/mtdblock.c
@@ -601,7 +601,7 @@ @@ -601,7 +601,7 @@ static void mtd_notify_add(struct mtd_in
sprintf(name, "%d", mtd->index); sprintf(name, "%d", mtd->index);
devfs_rw_handle[mtd->index] = devfs_register(devfs_dir_handle, name, devfs_rw_handle[mtd->index] = devfs_register(devfs_dir_handle, name,
DEVFS_FL_DEFAULT, MTD_BLOCK_MAJOR, mtd->index, DEVFS_FL_DEFAULT, MTD_BLOCK_MAJOR, mtd->index,

8
target/linux/generic-2.4/patches/010-disable_old_squashfs_compatibility.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.4.35.4/fs/squashfs/Makefile Index: linux-2.4.35.4/fs/squashfs/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/squashfs/Makefile 2007-12-15 05:19:49.031215169 +0100 --- linux-2.4.35.4.orig/fs/squashfs/Makefile
+++ linux-2.4.35.4/fs/squashfs/Makefile 2007-12-15 05:19:50.759313646 +0100 +++ linux-2.4.35.4/fs/squashfs/Makefile
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
O_TARGET := squashfs.o O_TARGET := squashfs.o
@ -13,8 +13,8 @@ Index: linux-2.4.35.4/fs/squashfs/Makefile
Index: linux-2.4.35.4/fs/squashfs/squashfs.h Index: linux-2.4.35.4/fs/squashfs/squashfs.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/squashfs/squashfs.h 2007-12-15 05:19:48.659193968 +0100 --- linux-2.4.35.4.orig/fs/squashfs/squashfs.h
+++ linux-2.4.35.4/fs/squashfs/squashfs.h 2007-12-15 05:19:50.767314102 +0100 +++ linux-2.4.35.4/fs/squashfs/squashfs.h
@@ -24,6 +24,9 @@ @@ -24,6 +24,9 @@
#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY #ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
#undef CONFIG_SQUASHFS_1_0_COMPATIBILITY #undef CONFIG_SQUASHFS_1_0_COMPATIBILITY

22
target/linux/generic-2.4/patches/050-build_flags.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/arch/mips/Makefile Index: linux-2.4.35.4/arch/mips/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/mips/Makefile 2007-12-15 05:19:44.870978088 +0100 --- linux-2.4.35.4.orig/arch/mips/Makefile
+++ linux-2.4.35.4/arch/mips/Makefile 2007-12-15 05:19:50.987326639 +0100 +++ linux-2.4.35.4/arch/mips/Makefile
@@ -44,10 +44,10 @@ @@ -44,10 +44,10 @@ MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
GCCFLAGS := -I $(TOPDIR)/include/asm/gcc GCCFLAGS := -I $(TOPDIR)/include/asm/gcc
GCCFLAGS += -G 0 -mno-abicalls -fno-pic -pipe GCCFLAGS += -G 0 -mno-abicalls -fno-pic -pipe
GCCFLAGS += $(call check_gcc, -finline-limit=100000,) GCCFLAGS += $(call check_gcc, -finline-limit=100000,)
@ -16,7 +16,7 @@ Index: linux-2.4.35.4/arch/mips/Makefile
GCCFLAGS += -g GCCFLAGS += -g
ifdef CONFIG_SB1XXX_CORELIS ifdef CONFIG_SB1XXX_CORELIS
GCCFLAGS += -mno-sched-prolog -fno-omit-frame-pointer GCCFLAGS += -mno-sched-prolog -fno-omit-frame-pointer
@@ -69,13 +69,13 @@ @@ -69,13 +69,13 @@ endif
set_gccflags = $(shell \ set_gccflags = $(shell \
while :; do \ while :; do \
cpu=$(1); isa=-$(2); \ cpu=$(1); isa=-$(2); \
@ -32,7 +32,7 @@ Index: linux-2.4.35.4/arch/mips/Makefile
$(CC) $$gcc_opt$$cpu $$isa -S -o /dev/null \ $(CC) $$gcc_opt$$cpu $$isa -S -o /dev/null \
-xc /dev/null > /dev/null 2>&1 && \ -xc /dev/null > /dev/null 2>&1 && \
break 2; \ break 2; \
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@ else \
fi; \ fi; \
gas_abi=-Wa,-32; gas_cpu=$$cpu; gas_isa=-Wa,$$isa; \ gas_abi=-Wa,-32; gas_cpu=$$cpu; gas_isa=-Wa,$$isa; \
while :; do \ while :; do \
@ -41,7 +41,7 @@ Index: linux-2.4.35.4/arch/mips/Makefile
$(CC) $$gas_abi $$gas_opt$$cpu $$gas_isa -Wa,-Z -c \ $(CC) $$gas_abi $$gas_opt$$cpu $$gas_isa -Wa,-Z -c \
-o /dev/null -xassembler /dev/null > /dev/null 2>&1 && \ -o /dev/null -xassembler /dev/null > /dev/null 2>&1 && \
break 2; \ break 2; \
@@ -172,6 +172,7 @@ @@ -172,6 +172,7 @@ endif
endif endif
AFLAGS += $(GCCFLAGS) AFLAGS += $(GCCFLAGS)
@ -51,9 +51,9 @@ Index: linux-2.4.35.4/arch/mips/Makefile
LD += -m $(ld-emul) LD += -m $(ld-emul)
Index: linux-2.4.35.4/Makefile Index: linux-2.4.35.4/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/Makefile 2007-12-15 05:19:45.074989715 +0100 --- linux-2.4.35.4.orig/Makefile
+++ linux-2.4.35.4/Makefile 2007-12-15 05:19:50.995327098 +0100 +++ linux-2.4.35.4/Makefile
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@ HPATH = $(TOPDIR)/include
FINDHPATH = $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net $(HPATH)/math-emu FINDHPATH = $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net $(HPATH)/math-emu
HOSTCC = gcc HOSTCC = gcc
@ -62,7 +62,7 @@ Index: linux-2.4.35.4/Makefile
CROSS_COMPILE = CROSS_COMPILE =
@@ -88,10 +88,9 @@ @@ -88,10 +88,9 @@ export MODLIB
# #
# standard CFLAGS # standard CFLAGS
# #
@ -74,7 +74,7 @@ Index: linux-2.4.35.4/Makefile
-fno-strict-aliasing -fno-common -fno-strict-aliasing -fno-common
CFLAGS += -fno-builtin-strpbrk -fno-builtin-sprintf CFLAGS += -fno-builtin-strpbrk -fno-builtin-sprintf
ifndef CONFIG_FRAME_POINTER ifndef CONFIG_FRAME_POINTER
@@ -105,6 +104,8 @@ @@ -105,6 +104,8 @@ if_gcc4 = $(shell if echo __GNUC__ | $(C
# disable pointer signedness warnings in gcc 4.0 # disable pointer signedness warnings in gcc 4.0
CFLAGS += $(call check_gcc,-Wno-pointer-sign,) CFLAGS += $(call check_gcc,-Wno-pointer-sign,)

8
target/linux/generic-2.4/patches/051-parallel_build.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/arch/mips/Makefile Index: linux-2.4.35.4/arch/mips/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/mips/Makefile 2007-12-15 05:19:50.987326639 +0100 --- linux-2.4.35.4.orig/arch/mips/Makefile
+++ linux-2.4.35.4/arch/mips/Makefile 2007-12-15 05:19:51.215339635 +0100 +++ linux-2.4.35.4/arch/mips/Makefile
@@ -739,6 +739,7 @@ @@ -739,6 +739,7 @@ LINKFLAGS += -T arch/$(ARCH)/ld.script
HEAD := arch/mips/kernel/head.o arch/mips/kernel/init_task.o HEAD := arch/mips/kernel/head.o arch/mips/kernel/init_task.o
SUBDIRS := $(addprefix arch/mips/, tools) $(SUBDIRS) $(addprefix arch/mips/, kernel mm lib) SUBDIRS := $(addprefix arch/mips/, tools) $(SUBDIRS) $(addprefix arch/mips/, kernel mm lib)
@ -10,7 +10,7 @@ Index: linux-2.4.35.4/arch/mips/Makefile
CORE_FILES := arch/mips/kernel/kernel.o arch/mips/mm/mm.o $(CORE_FILES) CORE_FILES := arch/mips/kernel/kernel.o arch/mips/mm/mm.o $(CORE_FILES)
LIBS := arch/mips/lib/lib.a $(LIBS) LIBS := arch/mips/lib/lib.a $(LIBS)
@@ -785,7 +786,7 @@ @@ -785,7 +786,7 @@ archmrproper:
$(MAKE) -C arch/$(ARCH)/tools mrproper $(MAKE) -C arch/$(ARCH)/tools mrproper
archdep: archdep:

6
target/linux/generic-2.4/patches/051-remove_pcmcia_modinst_compat.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/Makefile Index: linux-2.4.35.4/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/Makefile 2007-12-15 05:19:50.995327098 +0100 --- linux-2.4.35.4.orig/Makefile
+++ linux-2.4.35.4/Makefile 2007-12-15 05:19:51.427351715 +0100 +++ linux-2.4.35.4/Makefile
@@ -428,18 +428,9 @@ @@ -428,18 +428,9 @@ else
depmod_opts := -b $(INSTALL_MOD_PATH) -r depmod_opts := -b $(INSTALL_MOD_PATH) -r
endif endif
.PHONY: _modinst_post .PHONY: _modinst_post

88
target/linux/generic-2.4/patches/100-wireless-extension.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/include/linux/netdevice.h Index: linux-2.4.35.4/include/linux/netdevice.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/linux/netdevice.h 2007-12-15 05:19:42.162823760 +0100 --- linux-2.4.35.4.orig/include/linux/netdevice.h
+++ linux-2.4.35.4/include/linux/netdevice.h 2007-12-15 05:19:51.635363571 +0100 +++ linux-2.4.35.4/include/linux/netdevice.h
@@ -295,7 +295,9 @@ @@ -295,7 +295,9 @@ struct net_device
/* List of functions to handle Wireless Extensions (instead of ioctl). /* List of functions to handle Wireless Extensions (instead of ioctl).
* See <net/iw_handler.h> for details. Jean II */ * See <net/iw_handler.h> for details. Jean II */
@ -15,8 +15,8 @@ Index: linux-2.4.35.4/include/linux/netdevice.h
Index: linux-2.4.35.4/include/linux/wireless.h Index: linux-2.4.35.4/include/linux/wireless.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/linux/wireless.h 2007-12-15 05:19:42.170824216 +0100 --- linux-2.4.35.4.orig/include/linux/wireless.h
+++ linux-2.4.35.4/include/linux/wireless.h 2007-12-15 05:19:51.643364027 +0100 +++ linux-2.4.35.4/include/linux/wireless.h
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
/* /*
* This file define a set of standard wireless extensions * This file define a set of standard wireless extensions
@ -305,7 +305,7 @@ Index: linux-2.4.35.4/include/linux/wireless.h
/****************************** TYPES ******************************/ /****************************** TYPES ******************************/
/* --------------------------- SUBTYPES --------------------------- */ /* --------------------------- SUBTYPES --------------------------- */
@@ -456,7 +644,7 @@ @@ -456,7 +644,7 @@ struct iw_freq
__s32 m; /* Mantissa */ __s32 m; /* Mantissa */
__s16 e; /* Exponent */ __s16 e; /* Exponent */
__u8 i; /* List index (when in range struct) */ __u8 i; /* List index (when in range struct) */
@ -314,7 +314,7 @@ Index: linux-2.4.35.4/include/linux/wireless.h
}; };
/* /*
@@ -507,6 +695,132 @@ @@ -507,6 +695,132 @@ struct iw_thrspy
struct iw_quality high; /* High threshold */ struct iw_quality high; /* High threshold */
}; };
@ -447,7 +447,7 @@ Index: linux-2.4.35.4/include/linux/wireless.h
/* ------------------------ WIRELESS STATS ------------------------ */ /* ------------------------ WIRELESS STATS ------------------------ */
/* /*
* Wireless statistics (used for /proc/net/wireless) * Wireless statistics (used for /proc/net/wireless)
@@ -610,11 +924,12 @@ @@ -610,11 +924,12 @@ struct iw_range
/* Old Frequency (backward compat - moved lower ) */ /* Old Frequency (backward compat - moved lower ) */
__u16 old_num_channels; __u16 old_num_channels;
__u8 old_num_frequency; __u8 old_num_frequency;
@ -463,7 +463,7 @@ Index: linux-2.4.35.4/include/linux/wireless.h
/* Quality of link & SNR stuff */ /* Quality of link & SNR stuff */
/* Quality range (link, level, noise) /* Quality range (link, level, noise)
@@ -685,6 +1000,8 @@ @@ -685,6 +1000,8 @@ struct iw_range
struct iw_freq freq[IW_MAX_FREQUENCIES]; /* list */ struct iw_freq freq[IW_MAX_FREQUENCIES]; /* list */
/* Note : this frequency list doesn't need to fit channel numbers, /* Note : this frequency list doesn't need to fit channel numbers,
* because each entry contain its channel index */ * because each entry contain its channel index */
@ -474,8 +474,8 @@ Index: linux-2.4.35.4/include/linux/wireless.h
/* /*
Index: linux-2.4.35.4/include/net/iw_handler.h Index: linux-2.4.35.4/include/net/iw_handler.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/net/iw_handler.h 2007-12-15 05:19:42.178824671 +0100 --- linux-2.4.35.4.orig/include/net/iw_handler.h
+++ linux-2.4.35.4/include/net/iw_handler.h 2007-12-15 05:19:51.647364253 +0100 +++ linux-2.4.35.4/include/net/iw_handler.h
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
/* /*
* This file define the new driver API for Wireless Extensions * This file define the new driver API for Wireless Extensions
@ -526,7 +526,7 @@ Index: linux-2.4.35.4/include/net/iw_handler.h
/* Driver level flags */ /* Driver level flags */
#define IW_DESCR_FLAG_WAIT 0x0100 /* Wait for driver event */ #define IW_DESCR_FLAG_WAIT 0x0100 /* Wait for driver event */
@@ -311,23 +319,25 @@ @@ -311,23 +319,25 @@ struct iw_handler_def
/* Array of handlers for standard ioctls /* Array of handlers for standard ioctls
* We will call dev->wireless_handlers->standard[ioctl - SIOCSIWNAME] * We will call dev->wireless_handlers->standard[ioctl - SIOCSIWNAME]
*/ */
@ -559,7 +559,7 @@ Index: linux-2.4.35.4/include/net/iw_handler.h
}; };
/* ---------------------- IOCTL DESCRIPTION ---------------------- */ /* ---------------------- IOCTL DESCRIPTION ---------------------- */
@@ -374,18 +384,29 @@ @@ -374,18 +384,29 @@ struct iw_ioctl_description
*/ */
struct iw_spy_data struct iw_spy_data
{ {
@ -595,9 +595,9 @@ Index: linux-2.4.35.4/include/net/iw_handler.h
/**************************** PROTOTYPES ****************************/ /**************************** PROTOTYPES ****************************/
Index: linux-2.4.35.4/net/core/dev.c Index: linux-2.4.35.4/net/core/dev.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/core/dev.c 2007-12-15 05:19:42.186825129 +0100 --- linux-2.4.35.4.orig/net/core/dev.c
+++ linux-2.4.35.4/net/core/dev.c 2007-12-15 05:19:51.651364482 +0100 +++ linux-2.4.35.4/net/core/dev.c
@@ -2426,7 +2426,7 @@ @@ -2426,7 +2426,7 @@ int dev_ioctl(unsigned int cmd, void *ar
/* Follow me in net/core/wireless.c */ /* Follow me in net/core/wireless.c */
ret = wireless_process_ioctl(&ifr, cmd); ret = wireless_process_ioctl(&ifr, cmd);
rtnl_unlock(); rtnl_unlock();
@ -608,8 +608,8 @@ Index: linux-2.4.35.4/net/core/dev.c
return ret; return ret;
Index: linux-2.4.35.4/net/core/wireless.c Index: linux-2.4.35.4/net/core/wireless.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/core/wireless.c 2007-12-15 05:19:42.194825585 +0100 --- linux-2.4.35.4.orig/net/core/wireless.c
+++ linux-2.4.35.4/net/core/wireless.c 2007-12-15 05:19:51.655364711 +0100 +++ linux-2.4.35.4/net/core/wireless.c
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
* This file implement the Wireless Extensions APIs. * This file implement the Wireless Extensions APIs.
* *
@ -649,7 +649,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
#undef WE_IOCTL_DEBUG /* Debug IOCTL API */ #undef WE_IOCTL_DEBUG /* Debug IOCTL API */
#undef WE_EVENT_DEBUG /* Debug Event dispatcher */ #undef WE_EVENT_DEBUG /* Debug Event dispatcher */
#undef WE_SPY_DEBUG /* Debug enhanced spy support */ #undef WE_SPY_DEBUG /* Debug enhanced spy support */
@@ -131,14 +137,14 @@ @@ -131,14 +137,14 @@ static const struct iw_ioctl_description
{ IW_HEADER_TYPE_ADDR, 0, 0, 0, 0, 0}, { IW_HEADER_TYPE_ADDR, 0, 0, 0, 0, 0},
/* SIOCGIWAP */ /* SIOCGIWAP */
{ IW_HEADER_TYPE_ADDR, 0, 0, 0, 0, IW_DESCR_FLAG_DUMP}, { IW_HEADER_TYPE_ADDR, 0, 0, 0, 0, IW_DESCR_FLAG_DUMP},
@ -669,7 +669,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
/* SIOCSIWESSID */ /* SIOCSIWESSID */
{ IW_HEADER_TYPE_POINT, 0, 1, 0, IW_ESSID_MAX_SIZE + 1, IW_DESCR_FLAG_EVENT}, { IW_HEADER_TYPE_POINT, 0, 1, 0, IW_ESSID_MAX_SIZE + 1, IW_DESCR_FLAG_EVENT},
/* SIOCGIWESSID */ /* SIOCGIWESSID */
@@ -179,6 +185,25 @@ @@ -179,6 +185,25 @@ static const struct iw_ioctl_description
{ IW_HEADER_TYPE_PARAM, 0, 0, 0, 0, 0}, { IW_HEADER_TYPE_PARAM, 0, 0, 0, 0, 0},
/* SIOCGIWPOWER */ /* SIOCGIWPOWER */
{ IW_HEADER_TYPE_PARAM, 0, 0, 0, 0, 0}, { IW_HEADER_TYPE_PARAM, 0, 0, 0, 0, 0},
@ -695,7 +695,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
}; };
static const int standard_ioctl_num = (sizeof(standard_ioctl) / static const int standard_ioctl_num = (sizeof(standard_ioctl) /
sizeof(struct iw_ioctl_description)); sizeof(struct iw_ioctl_description));
@@ -198,12 +223,22 @@ @@ -198,12 +223,22 @@ static const struct iw_ioctl_description
{ IW_HEADER_TYPE_ADDR, 0, 0, 0, 0, 0}, { IW_HEADER_TYPE_ADDR, 0, 0, 0, 0, 0},
/* IWEVEXPIRED */ /* IWEVEXPIRED */
{ IW_HEADER_TYPE_ADDR, 0, 0, 0, 0, 0}, { IW_HEADER_TYPE_ADDR, 0, 0, 0, 0, 0},
@ -719,7 +719,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
0, /* IW_PRIV_TYPE_NONE */ 0, /* IW_PRIV_TYPE_NONE */
1, /* IW_PRIV_TYPE_BYTE */ 1, /* IW_PRIV_TYPE_BYTE */
1, /* IW_PRIV_TYPE_CHAR */ 1, /* IW_PRIV_TYPE_CHAR */
@@ -270,12 +305,15 @@ @@ -270,12 +305,15 @@ static inline iw_handler get_handler(str
*/ */
static inline struct iw_statistics *get_wireless_stats(struct net_device *dev) static inline struct iw_statistics *get_wireless_stats(struct net_device *dev)
{ {
@ -738,7 +738,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
} }
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
@@ -310,14 +348,32 @@ @@ -310,14 +348,32 @@ static inline int call_commit_handler(st
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
/* /*
@ -773,7 +773,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
} }
@@ -350,11 +406,14 @@ @@ -350,11 +406,14 @@ static inline int sprintf_wireless_stats
dev->name, dev->name,
stats->status, stats->status,
stats->qual.qual, stats->qual.qual,
@ -791,7 +791,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
stats->discard.nwid, stats->discard.nwid,
stats->discard.code, stats->discard.code,
stats->discard.fragment, stats->discard.fragment,
@@ -470,13 +529,15 @@ @@ -470,13 +529,15 @@ static inline int ioctl_export_private(s
/* Check NULL pointer */ /* Check NULL pointer */
if(iwr->u.data.pointer == NULL) if(iwr->u.data.pointer == NULL)
return -EFAULT; return -EFAULT;
@ -810,7 +810,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
/* Set the number of available ioctls. */ /* Set the number of available ioctls. */
iwr->u.data.length = dev->wireless_handlers->num_private_args; iwr->u.data.length = dev->wireless_handlers->num_private_args;
@@ -505,7 +566,6 @@ @@ -505,7 +566,6 @@ static inline int ioctl_standard_call(st
const struct iw_ioctl_description * descr; const struct iw_ioctl_description * descr;
struct iw_request_info info; struct iw_request_info info;
int ret = -EINVAL; int ret = -EINVAL;
@ -818,7 +818,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
/* Get the description of the IOCTL */ /* Get the description of the IOCTL */
if((cmd - SIOCIWFIRST) >= standard_ioctl_num) if((cmd - SIOCIWFIRST) >= standard_ioctl_num)
@@ -536,8 +596,14 @@ @@ -536,8 +596,14 @@ static inline int ioctl_standard_call(st
#endif /* WE_SET_EVENT */ #endif /* WE_SET_EVENT */
} else { } else {
char * extra; char * extra;
@ -833,7 +833,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
/* Check what user space is giving us */ /* Check what user space is giving us */
if(IW_IS_SET(cmd)) { if(IW_IS_SET(cmd)) {
/* Check NULL pointer */ /* Check NULL pointer */
@@ -554,18 +620,33 @@ @@ -554,18 +620,33 @@ static inline int ioctl_standard_call(st
if(iwr->u.data.pointer == NULL) if(iwr->u.data.pointer == NULL)
return -EFAULT; return -EFAULT;
/* Save user space buffer size for checking */ /* Save user space buffer size for checking */
@ -873,7 +873,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
if (extra == NULL) { if (extra == NULL) {
return -ENOMEM; return -ENOMEM;
} }
@@ -591,14 +672,11 @@ @@ -591,14 +672,11 @@ static inline int ioctl_standard_call(st
/* If we have something to return to the user */ /* If we have something to return to the user */
if (!ret && IW_IS_GET(cmd)) { if (!ret && IW_IS_GET(cmd)) {
@ -889,7 +889,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
err = copy_to_user(iwr->u.data.pointer, extra, err = copy_to_user(iwr->u.data.pointer, extra,
iwr->u.data.length * iwr->u.data.length *
@@ -661,7 +739,7 @@ @@ -661,7 +739,7 @@ static inline int ioctl_private_call(str
iw_handler handler) iw_handler handler)
{ {
struct iwreq * iwr = (struct iwreq *) ifr; struct iwreq * iwr = (struct iwreq *) ifr;
@ -898,7 +898,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
struct iw_request_info info; struct iw_request_info info;
int extra_size = 0; int extra_size = 0;
int i; int i;
@@ -701,7 +779,7 @@ @@ -701,7 +779,7 @@ static inline int ioctl_private_call(str
((extra_size + offset) <= IFNAMSIZ)) ((extra_size + offset) <= IFNAMSIZ))
extra_size = 0; extra_size = 0;
} else { } else {
@ -907,7 +907,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
extra_size = get_priv_size(descr->get_args); extra_size = get_priv_size(descr->get_args);
/* Does it fits in iwr ? */ /* Does it fits in iwr ? */
@@ -771,6 +849,14 @@ @@ -771,6 +849,14 @@ static inline int ioctl_private_call(str
/* If we have something to return to the user */ /* If we have something to return to the user */
if (!ret && IW_IS_GET(cmd)) { if (!ret && IW_IS_GET(cmd)) {
@ -922,7 +922,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
err = copy_to_user(iwr->u.data.pointer, extra, err = copy_to_user(iwr->u.data.pointer, extra,
extra_size); extra_size);
if (err) if (err)
@@ -1042,9 +1128,25 @@ @@ -1042,9 +1128,25 @@ void wireless_send_event(struct net_devi
* One of the main advantage of centralising spy support here is that * One of the main advantage of centralising spy support here is that
* it becomes much easier to improve and extend it without having to touch * it becomes much easier to improve and extend it without having to touch
* the drivers. One example is the addition of the Spy-Threshold events. * the drivers. One example is the addition of the Spy-Threshold events.
@ -949,7 +949,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
/* /*
* Standard Wireless Handler : set Spy List * Standard Wireless Handler : set Spy List
@@ -1054,16 +1156,26 @@ @@ -1054,16 +1156,26 @@ int iw_handler_set_spy(struct net_device
union iwreq_data * wrqu, union iwreq_data * wrqu,
char * extra) char * extra)
{ {
@ -981,7 +981,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
/* Are there are addresses to copy? */ /* Are there are addresses to copy? */
if(wrqu->data.length > 0) { if(wrqu->data.length > 0) {
int i; int i;
@@ -1089,13 +1201,14 @@ @@ -1089,13 +1201,14 @@ int iw_handler_set_spy(struct net_device
spydata->spy_address[i][5]); spydata->spy_address[i][5]);
#endif /* WE_SPY_DEBUG */ #endif /* WE_SPY_DEBUG */
} }
@ -999,7 +999,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
} }
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
@@ -1107,12 +1220,14 @@ @@ -1107,12 +1220,14 @@ int iw_handler_get_spy(struct net_device
union iwreq_data * wrqu, union iwreq_data * wrqu,
char * extra) char * extra)
{ {
@ -1017,7 +1017,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
wrqu->data.length = spydata->spy_number; wrqu->data.length = spydata->spy_number;
/* Copy addresses. */ /* Copy addresses. */
@@ -1129,9 +1244,6 @@ @@ -1129,9 +1244,6 @@ int iw_handler_get_spy(struct net_device
for(i = 0; i < spydata->spy_number; i++) for(i = 0; i < spydata->spy_number; i++)
spydata->spy_stat[i].updated = 0; spydata->spy_stat[i].updated = 0;
return 0; return 0;
@ -1027,7 +1027,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
} }
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
@@ -1143,11 +1255,13 @@ @@ -1143,11 +1255,13 @@ int iw_handler_set_thrspy(struct net_dev
union iwreq_data * wrqu, union iwreq_data * wrqu,
char * extra) char * extra)
{ {
@ -1044,7 +1044,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
/* Just do it */ /* Just do it */
memcpy(&(spydata->spy_thr_low), &(threshold->low), memcpy(&(spydata->spy_thr_low), &(threshold->low),
2 * sizeof(struct iw_quality)); 2 * sizeof(struct iw_quality));
@@ -1160,9 +1274,6 @@ @@ -1160,9 +1274,6 @@ int iw_handler_set_thrspy(struct net_dev
#endif /* WE_SPY_DEBUG */ #endif /* WE_SPY_DEBUG */
return 0; return 0;
@ -1054,7 +1054,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
} }
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
@@ -1174,22 +1285,20 @@ @@ -1174,22 +1285,20 @@ int iw_handler_get_thrspy(struct net_dev
union iwreq_data * wrqu, union iwreq_data * wrqu,
char * extra) char * extra)
{ {
@ -1082,7 +1082,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
/* /*
* Prepare and send a Spy Threshold event * Prepare and send a Spy Threshold event
@@ -1227,7 +1336,6 @@ @@ -1227,7 +1336,6 @@ static void iw_send_thrspy_event(struct
/* Send event to user space */ /* Send event to user space */
wireless_send_event(dev, SIOCGIWTHRSPY, &wrqu, (char *) &threshold); wireless_send_event(dev, SIOCGIWTHRSPY, &wrqu, (char *) &threshold);
} }
@ -1090,7 +1090,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
/* /*
@@ -1240,12 +1348,14 @@ @@ -1240,12 +1348,14 @@ void wireless_spy_update(struct net_devi
unsigned char * address, unsigned char * address,
struct iw_quality * wstats) struct iw_quality * wstats)
{ {
@ -1108,7 +1108,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
#ifdef WE_SPY_DEBUG #ifdef WE_SPY_DEBUG
printk(KERN_DEBUG "wireless_spy_update() : offset %ld, spydata %p, address %02X:%02X:%02X:%02X:%02X:%02X\n", dev->wireless_handlers->spy_offset, spydata, address[0], address[1], address[2], address[3], address[4], address[5]); printk(KERN_DEBUG "wireless_spy_update() : offset %ld, spydata %p, address %02X:%02X:%02X:%02X:%02X:%02X\n", dev->wireless_handlers->spy_offset, spydata, address[0], address[1], address[2], address[3], address[4], address[5]);
#endif /* WE_SPY_DEBUG */ #endif /* WE_SPY_DEBUG */
@@ -1257,7 +1367,7 @@ @@ -1257,7 +1367,7 @@ void wireless_spy_update(struct net_devi
sizeof(struct iw_quality)); sizeof(struct iw_quality));
match = i; match = i;
} }
@ -1117,7 +1117,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
/* Generate an event if we cross the spy threshold. /* Generate an event if we cross the spy threshold.
* To avoid event storms, we have a simple hysteresis : we generate * To avoid event storms, we have a simple hysteresis : we generate
* event only when we go under the low threshold or above the * event only when we go under the low threshold or above the
@@ -1277,6 +1387,4 @@ @@ -1277,6 +1387,4 @@ void wireless_spy_update(struct net_devi
} }
} }
} }

60
target/linux/generic-2.4/patches/106-mppe_mppc.patch
View File

@ -6,9 +6,9 @@ Microsoft Point-to-Point Encryption / Compression support
Index: linux-2.4.35.4/Documentation/Configure.help Index: linux-2.4.35.4/Documentation/Configure.help
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:19:49.287229757 +0100 --- linux-2.4.35.4.orig/Documentation/Configure.help
+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:19:51.927380210 +0100 +++ linux-2.4.35.4/Documentation/Configure.help
@@ -9974,6 +9974,28 @@ @@ -9974,6 +9974,28 @@ CONFIG_PPP_BSDCOMP
module; it is called bsd_comp.o and will show up in the directory module; it is called bsd_comp.o and will show up in the directory
modules once you have said "make modules". If unsure, say N. modules once you have said "make modules". If unsure, say N.
@ -39,9 +39,9 @@ Index: linux-2.4.35.4/Documentation/Configure.help
Support for PPP over Ethernet. Support for PPP over Ethernet.
Index: linux-2.4.35.4/crypto/Config.in Index: linux-2.4.35.4/crypto/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/crypto/Config.in 2007-12-15 05:19:42.094819886 +0100 --- linux-2.4.35.4.orig/crypto/Config.in
+++ linux-2.4.35.4/crypto/Config.in 2007-12-15 05:19:51.927380210 +0100 +++ linux-2.4.35.4/crypto/Config.in
@@ -11,7 +11,9 @@ @@ -11,7 +11,9 @@ if [ "$CONFIG_INET_AH" = "y" -o \
"$CONFIG_INET6_AH" = "y" -o \ "$CONFIG_INET6_AH" = "y" -o \
"$CONFIG_INET6_AH" = "m" -o \ "$CONFIG_INET6_AH" = "m" -o \
"$CONFIG_INET6_ESP" = "y" -o \ "$CONFIG_INET6_ESP" = "y" -o \
@ -52,7 +52,7 @@ Index: linux-2.4.35.4/crypto/Config.in
define_bool CONFIG_CRYPTO y define_bool CONFIG_CRYPTO y
else else
bool 'Cryptographic API' CONFIG_CRYPTO bool 'Cryptographic API' CONFIG_CRYPTO
@@ -51,11 +53,24 @@ @@ -51,11 +53,24 @@ if [ "$CONFIG_CRYPTO" = "y" ]; then
"$CONFIG_INET6_AH" = "y" -o \ "$CONFIG_INET6_AH" = "y" -o \
"$CONFIG_INET6_AH" = "m" -o \ "$CONFIG_INET6_AH" = "m" -o \
"$CONFIG_INET6_ESP" = "y" -o \ "$CONFIG_INET6_ESP" = "y" -o \
@ -81,7 +81,7 @@ Index: linux-2.4.35.4/crypto/Config.in
tristate ' SHA256 digest algorithm' CONFIG_CRYPTO_SHA256 tristate ' SHA256 digest algorithm' CONFIG_CRYPTO_SHA256
tristate ' SHA384 and SHA512 digest algorithms' CONFIG_CRYPTO_SHA512 tristate ' SHA384 and SHA512 digest algorithms' CONFIG_CRYPTO_SHA512
tristate ' Whirlpool digest algorithms' CONFIG_CRYPTO_WP512 tristate ' Whirlpool digest algorithms' CONFIG_CRYPTO_WP512
@@ -76,7 +91,20 @@ @@ -76,7 +91,20 @@ if [ "$CONFIG_CRYPTO" = "y" ]; then
tristate ' TEA and XTEA cipher algorithms' CONFIG_CRYPTO_TEA tristate ' TEA and XTEA cipher algorithms' CONFIG_CRYPTO_TEA
tristate ' Khazad cipher algorithm' CONFIG_CRYPTO_KHAZAD tristate ' Khazad cipher algorithm' CONFIG_CRYPTO_KHAZAD
tristate ' Anubis cipher algorithm' CONFIG_CRYPTO_ANUBIS tristate ' Anubis cipher algorithm' CONFIG_CRYPTO_ANUBIS
@ -104,9 +104,9 @@ Index: linux-2.4.35.4/crypto/Config.in
"$CONFIG_INET6_IPCOMP" = "y" -o \ "$CONFIG_INET6_IPCOMP" = "y" -o \
Index: linux-2.4.35.4/drivers/net/Config.in Index: linux-2.4.35.4/drivers/net/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/net/Config.in 2007-12-15 05:19:42.102820341 +0100 --- linux-2.4.35.4.orig/drivers/net/Config.in
+++ linux-2.4.35.4/drivers/net/Config.in 2007-12-15 05:19:51.931380439 +0100 +++ linux-2.4.35.4/drivers/net/Config.in
@@ -336,6 +336,7 @@ @@ -336,6 +336,7 @@ if [ ! "$CONFIG_PPP" = "n" ]; then
dep_tristate ' PPP support for sync tty ports' CONFIG_PPP_SYNC_TTY $CONFIG_PPP dep_tristate ' PPP support for sync tty ports' CONFIG_PPP_SYNC_TTY $CONFIG_PPP
dep_tristate ' PPP Deflate compression' CONFIG_PPP_DEFLATE $CONFIG_PPP dep_tristate ' PPP Deflate compression' CONFIG_PPP_DEFLATE $CONFIG_PPP
dep_tristate ' PPP BSD-Compress compression' CONFIG_PPP_BSDCOMP $CONFIG_PPP dep_tristate ' PPP BSD-Compress compression' CONFIG_PPP_BSDCOMP $CONFIG_PPP
@ -116,9 +116,9 @@ Index: linux-2.4.35.4/drivers/net/Config.in
fi fi
Index: linux-2.4.35.4/drivers/net/Makefile Index: linux-2.4.35.4/drivers/net/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/net/Makefile 2007-12-15 05:19:42.110820796 +0100 --- linux-2.4.35.4.orig/drivers/net/Makefile
+++ linux-2.4.35.4/drivers/net/Makefile 2007-12-15 05:19:51.931380439 +0100 +++ linux-2.4.35.4/drivers/net/Makefile
@@ -166,6 +166,7 @@ @@ -166,6 +166,7 @@ obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o
obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o
@ -128,8 +128,8 @@ Index: linux-2.4.35.4/drivers/net/Makefile
obj-$(CONFIG_SLIP) += slip.o obj-$(CONFIG_SLIP) += slip.o
Index: linux-2.4.35.4/drivers/net/ppp_generic.c Index: linux-2.4.35.4/drivers/net/ppp_generic.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/net/ppp_generic.c 2007-12-15 05:19:42.114821025 +0100 --- linux-2.4.35.4.orig/drivers/net/ppp_generic.c
+++ linux-2.4.35.4/drivers/net/ppp_generic.c 2007-12-15 05:19:51.931380439 +0100 +++ linux-2.4.35.4/drivers/net/ppp_generic.c
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
* PPP driver, written by Michael Callahan and Al Longyear, and * PPP driver, written by Michael Callahan and Al Longyear, and
* subsequently hacked by Paul Mackerras. * subsequently hacked by Paul Mackerras.
@ -139,7 +139,7 @@ Index: linux-2.4.35.4/drivers/net/ppp_generic.c
*/ */
#include <linux/config.h> #include <linux/config.h>
@@ -102,6 +102,7 @@ @@ -102,6 +102,7 @@ struct ppp {
spinlock_t rlock; /* lock for receive side 58 */ spinlock_t rlock; /* lock for receive side 58 */
spinlock_t wlock; /* lock for transmit side 5c */ spinlock_t wlock; /* lock for transmit side 5c */
int mru; /* max receive unit 60 */ int mru; /* max receive unit 60 */
@ -147,7 +147,7 @@ Index: linux-2.4.35.4/drivers/net/ppp_generic.c
unsigned int flags; /* control bits 64 */ unsigned int flags; /* control bits 64 */
unsigned int xstate; /* transmit state bits 68 */ unsigned int xstate; /* transmit state bits 68 */
unsigned int rstate; /* receive state bits 6c */ unsigned int rstate; /* receive state bits 6c */
@@ -552,7 +553,9 @@ @@ -552,7 +553,9 @@ static int ppp_ioctl(struct inode *inode
case PPPIOCSMRU: case PPPIOCSMRU:
if (get_user(val, (int *) arg)) if (get_user(val, (int *) arg))
break; break;
@ -158,7 +158,7 @@ Index: linux-2.4.35.4/drivers/net/ppp_generic.c
err = 0; err = 0;
break; break;
@@ -1025,14 +1028,37 @@ @@ -1025,14 +1028,37 @@ ppp_send_frame(struct ppp *ppp, struct s
case PPP_CCP: case PPP_CCP:
/* peek at outbound CCP frames */ /* peek at outbound CCP frames */
ppp_ccp_peek(ppp, skb, 0); ppp_ccp_peek(ppp, skb, 0);
@ -198,7 +198,7 @@ Index: linux-2.4.35.4/drivers/net/ppp_generic.c
if (new_skb == 0) { if (new_skb == 0) {
printk(KERN_ERR "PPP: no memory (comp pkt)\n"); printk(KERN_ERR "PPP: no memory (comp pkt)\n");
goto drop; goto drop;
@@ -1050,9 +1076,21 @@ @@ -1050,9 +1076,21 @@ ppp_send_frame(struct ppp *ppp, struct s
skb = new_skb; skb = new_skb;
skb_put(skb, len); skb_put(skb, len);
skb_pull(skb, 2); /* pull off A/C bytes */ skb_pull(skb, 2); /* pull off A/C bytes */
@ -221,7 +221,7 @@ Index: linux-2.4.35.4/drivers/net/ppp_generic.c
} }
} }
@@ -1540,14 +1578,15 @@ @@ -1540,14 +1578,15 @@ ppp_decompress_frame(struct ppp *ppp, st
int len; int len;
if (proto == PPP_COMP) { if (proto == PPP_COMP) {
@ -239,7 +239,7 @@ Index: linux-2.4.35.4/drivers/net/ppp_generic.c
if (len < 0) { if (len < 0) {
/* Pass the compressed frame to pppd as an /* Pass the compressed frame to pppd as an
error indication. */ error indication. */
@@ -1573,7 +1612,14 @@ @@ -1573,7 +1612,14 @@ ppp_decompress_frame(struct ppp *ppp, st
return skb; return skb;
err: err:
@ -255,7 +255,7 @@ Index: linux-2.4.35.4/drivers/net/ppp_generic.c
ppp_receive_error(ppp); ppp_receive_error(ppp);
return skb; return skb;
} }
@@ -2253,6 +2299,7 @@ @@ -2253,6 +2299,7 @@ ppp_create_interface(int unit, int *retp
/* Initialize the new ppp unit */ /* Initialize the new ppp unit */
ppp->file.index = unit; ppp->file.index = unit;
ppp->mru = PPP_MRU; ppp->mru = PPP_MRU;
@ -265,8 +265,8 @@ Index: linux-2.4.35.4/drivers/net/ppp_generic.c
for (i = 0; i < NUM_NP; ++i) for (i = 0; i < NUM_NP; ++i)
Index: linux-2.4.35.4/drivers/net/ppp_mppe_mppc.c Index: linux-2.4.35.4/drivers/net/ppp_mppe_mppc.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/drivers/net/ppp_mppe_mppc.c 2007-12-15 05:19:51.935380668 +0100 +++ linux-2.4.35.4/drivers/net/ppp_mppe_mppc.c
@@ -0,0 +1,1312 @@ @@ -0,0 +1,1312 @@
+/* +/*
+ * ppp_mppe_mppc.c - MPPC/MPPE "compressor/decompressor" module. + * ppp_mppe_mppc.c - MPPC/MPPE "compressor/decompressor" module.
@ -1582,8 +1582,8 @@ Index: linux-2.4.35.4/drivers/net/ppp_mppe_mppc.c
+MODULE_LICENSE("Dual BSD/GPL"); +MODULE_LICENSE("Dual BSD/GPL");
Index: linux-2.4.35.4/include/linux/ppp-comp.h Index: linux-2.4.35.4/include/linux/ppp-comp.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/linux/ppp-comp.h 2007-12-15 05:19:42.134822165 +0100 --- linux-2.4.35.4.orig/include/linux/ppp-comp.h
+++ linux-2.4.35.4/include/linux/ppp-comp.h 2007-12-15 05:19:51.935380668 +0100 +++ linux-2.4.35.4/include/linux/ppp-comp.h
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
*/ */
@ -1593,7 +1593,7 @@ Index: linux-2.4.35.4/include/linux/ppp-comp.h
* *
* NOTE TO MAINTAINERS: * NOTE TO MAINTAINERS:
* If you modify this file at all, please set the above date. * If you modify this file at all, please set the above date.
@@ -78,7 +78,7 @@ @@ -78,7 +78,7 @@ struct compressor {
/* Compress a packet */ /* Compress a packet */
int (*compress) (void *state, unsigned char *rptr, int (*compress) (void *state, unsigned char *rptr,
@ -1602,7 +1602,7 @@ Index: linux-2.4.35.4/include/linux/ppp-comp.h
/* Return compression statistics */ /* Return compression statistics */
void (*comp_stat) (void *state, struct compstat *stats); void (*comp_stat) (void *state, struct compstat *stats);
@@ -99,7 +99,7 @@ @@ -99,7 +99,7 @@ struct compressor {
/* Decompress a packet. */ /* Decompress a packet. */
int (*decompress) (void *state, unsigned char *ibuf, int isize, int (*decompress) (void *state, unsigned char *ibuf, int isize,
@ -1611,7 +1611,7 @@ Index: linux-2.4.35.4/include/linux/ppp-comp.h
/* Update state for an incompressible packet received */ /* Update state for an incompressible packet received */
void (*incomp) (void *state, unsigned char *ibuf, int icnt); void (*incomp) (void *state, unsigned char *ibuf, int icnt);
@@ -187,6 +187,42 @@ @@ -187,6 +187,42 @@ struct compressor {
#define DEFLATE_CHK_SEQUENCE 0 #define DEFLATE_CHK_SEQUENCE 0
/* /*

190
target/linux/generic-2.4/patches/107-cifs.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/Documentation/Configure.help Index: linux-2.4.35.4/Documentation/Configure.help
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:19:51.927380210 +0100 --- linux-2.4.35.4.orig/Documentation/Configure.help
+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:19:52.251398675 +0100 +++ linux-2.4.35.4/Documentation/Configure.help
@@ -17995,6 +17995,34 @@ @@ -17995,6 +17995,34 @@ CONFIG_UNIXWARE_DISKLABEL
If you don't know what all this is about, say N. If you don't know what all this is about, say N.
@ -39,9 +39,9 @@ Index: linux-2.4.35.4/Documentation/Configure.help
SMB (Server Message Block) is the protocol Windows for Workgroups SMB (Server Message Block) is the protocol Windows for Workgroups
Index: linux-2.4.35.4/Documentation/filesystems/00-INDEX Index: linux-2.4.35.4/Documentation/filesystems/00-INDEX
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/Documentation/filesystems/00-INDEX 2007-12-15 05:19:41.822804384 +0100 --- linux-2.4.35.4.orig/Documentation/filesystems/00-INDEX
+++ linux-2.4.35.4/Documentation/filesystems/00-INDEX 2007-12-15 05:19:52.255398905 +0100 +++ linux-2.4.35.4/Documentation/filesystems/00-INDEX
@@ -10,6 +10,8 @@ @@ -10,6 +10,8 @@ befs.txt
- info for the BeOS file system (BFS) - info for the BeOS file system (BFS)
bfs.txt bfs.txt
- info for the SCO UnixWare Boot Filesystem (BFS). - info for the SCO UnixWare Boot Filesystem (BFS).
@ -52,8 +52,8 @@ Index: linux-2.4.35.4/Documentation/filesystems/00-INDEX
cramfs.txt cramfs.txt
Index: linux-2.4.35.4/Documentation/filesystems/cifs.txt Index: linux-2.4.35.4/Documentation/filesystems/cifs.txt
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/Documentation/filesystems/cifs.txt 2007-12-15 05:19:52.259399131 +0100 +++ linux-2.4.35.4/Documentation/filesystems/cifs.txt
@@ -0,0 +1,51 @@ @@ -0,0 +1,51 @@
+ This is the client VFS module for the Common Internet File System + This is the client VFS module for the Common Internet File System
+ (CIFS) protocol which is the successor to the Server Message Block + (CIFS) protocol which is the successor to the Server Message Block
@ -108,8 +108,8 @@ Index: linux-2.4.35.4/Documentation/filesystems/cifs.txt
+ http://www.samba.org + http://www.samba.org
Index: linux-2.4.35.4/fs/cifs/asn1.c Index: linux-2.4.35.4/fs/cifs/asn1.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/asn1.c 2007-12-15 05:19:52.263399360 +0100 +++ linux-2.4.35.4/fs/cifs/asn1.c
@@ -0,0 +1,614 @@ @@ -0,0 +1,614 @@
+/* +/*
+ * The ASB.1/BER parsing code is derived from ip_nat_snmp_basic.c which was in + * The ASB.1/BER parsing code is derived from ip_nat_snmp_basic.c which was in
@ -727,8 +727,8 @@ Index: linux-2.4.35.4/fs/cifs/asn1.c
+} +}
Index: linux-2.4.35.4/fs/cifs/AUTHORS Index: linux-2.4.35.4/fs/cifs/AUTHORS
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/AUTHORS 2007-12-15 05:19:52.267399586 +0100 +++ linux-2.4.35.4/fs/cifs/AUTHORS
@@ -0,0 +1,37 @@ @@ -0,0 +1,37 @@
+Original Author +Original Author
+=============== +===============
@ -769,8 +769,8 @@ Index: linux-2.4.35.4/fs/cifs/AUTHORS
+finding multiple bugs during excellent stress test runs. +finding multiple bugs during excellent stress test runs.
Index: linux-2.4.35.4/fs/cifs/CHANGES Index: linux-2.4.35.4/fs/cifs/CHANGES
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/CHANGES 2007-12-15 05:19:52.271399815 +0100 +++ linux-2.4.35.4/fs/cifs/CHANGES
@@ -0,0 +1,572 @@ @@ -0,0 +1,572 @@
+Version 1.20 +Version 1.20
+------------ +------------
@ -1346,8 +1346,8 @@ Index: linux-2.4.35.4/fs/cifs/CHANGES
+ +
Index: linux-2.4.35.4/fs/cifs/cifs_debug.c Index: linux-2.4.35.4/fs/cifs/cifs_debug.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/cifs_debug.c 2007-12-15 05:19:52.275400045 +0100 +++ linux-2.4.35.4/fs/cifs/cifs_debug.c
@@ -0,0 +1,797 @@ @@ -0,0 +1,797 @@
+/* +/*
+ * fs/cifs_debug.c + * fs/cifs_debug.c
@ -2148,8 +2148,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_debug.c
+#endif +#endif
Index: linux-2.4.35.4/fs/cifs/cifs_debug.h Index: linux-2.4.35.4/fs/cifs/cifs_debug.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/cifs_debug.h 2007-12-15 05:19:52.279400271 +0100 +++ linux-2.4.35.4/fs/cifs/cifs_debug.h
@@ -0,0 +1,66 @@ @@ -0,0 +1,66 @@
+/* +/*
+ * + *
@ -2219,8 +2219,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_debug.h
+#endif /* _H_CIFS_DEBUG */ +#endif /* _H_CIFS_DEBUG */
Index: linux-2.4.35.4/fs/cifs/cifsencrypt.c Index: linux-2.4.35.4/fs/cifs/cifsencrypt.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/cifsencrypt.c 2007-12-15 05:19:52.279400271 +0100 +++ linux-2.4.35.4/fs/cifs/cifsencrypt.c
@@ -0,0 +1,204 @@ @@ -0,0 +1,204 @@
+/* +/*
+ * fs/cifs/cifsencrypt.c + * fs/cifs/cifsencrypt.c
@ -2428,8 +2428,8 @@ Index: linux-2.4.35.4/fs/cifs/cifsencrypt.c
+} +}
Index: linux-2.4.35.4/fs/cifs/cifserr.c Index: linux-2.4.35.4/fs/cifs/cifserr.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/cifserr.c 2007-12-15 05:19:52.279400271 +0100 +++ linux-2.4.35.4/fs/cifs/cifserr.c
@@ -0,0 +1,70 @@ @@ -0,0 +1,70 @@
+/* +/*
+ * fs/cifserr.c + * fs/cifserr.c
@ -2503,8 +2503,8 @@ Index: linux-2.4.35.4/fs/cifs/cifserr.c
+} +}
Index: linux-2.4.35.4/fs/cifs/cifsfs.c Index: linux-2.4.35.4/fs/cifs/cifsfs.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/cifsfs.c 2007-12-15 05:19:52.279400271 +0100 +++ linux-2.4.35.4/fs/cifs/cifsfs.c
@@ -0,0 +1,769 @@ @@ -0,0 +1,769 @@
+/* +/*
+ * fs/cifs/cifsfs.c + * fs/cifs/cifsfs.c
@ -3277,8 +3277,8 @@ Index: linux-2.4.35.4/fs/cifs/cifsfs.c
+module_exit(exit_cifs) +module_exit(exit_cifs)
Index: linux-2.4.35.4/fs/cifs/cifsfs.h Index: linux-2.4.35.4/fs/cifs/cifsfs.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/cifsfs.h 2007-12-15 05:19:52.279400271 +0100 +++ linux-2.4.35.4/fs/cifs/cifsfs.h
@@ -0,0 +1,97 @@ @@ -0,0 +1,97 @@
+/* +/*
+ * fs/cifs/cifsfs.h + * fs/cifs/cifsfs.h
@ -3379,8 +3379,8 @@ Index: linux-2.4.35.4/fs/cifs/cifsfs.h
+#endif /* _CIFSFS_H */ +#endif /* _CIFSFS_H */
Index: linux-2.4.35.4/fs/cifs/cifs_fs_sb.h Index: linux-2.4.35.4/fs/cifs/cifs_fs_sb.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/cifs_fs_sb.h 2007-12-15 05:19:52.283400500 +0100 +++ linux-2.4.35.4/fs/cifs/cifs_fs_sb.h
@@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
+/* +/*
+ * fs/cifs/cifs_fs_sb.h + * fs/cifs/cifs_fs_sb.h
@ -3416,8 +3416,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_fs_sb.h
+#endif /* _CIFS_FS_SB_H */ +#endif /* _CIFS_FS_SB_H */
Index: linux-2.4.35.4/fs/cifs/cifsglob.h Index: linux-2.4.35.4/fs/cifs/cifsglob.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/cifsglob.h 2007-12-15 05:19:52.283400500 +0100 +++ linux-2.4.35.4/fs/cifs/cifsglob.h
@@ -0,0 +1,413 @@ @@ -0,0 +1,413 @@
+/* +/*
+ * fs/cifs/cifsglob.h + * fs/cifs/cifsglob.h
@ -3834,8 +3834,8 @@ Index: linux-2.4.35.4/fs/cifs/cifsglob.h
+ +
Index: linux-2.4.35.4/fs/cifs/cifspdu.h Index: linux-2.4.35.4/fs/cifs/cifspdu.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/cifspdu.h 2007-12-15 05:19:52.283400500 +0100 +++ linux-2.4.35.4/fs/cifs/cifspdu.h
@@ -0,0 +1,1793 @@ @@ -0,0 +1,1793 @@
+/* +/*
+ * fs/cifs/cifspdu.h + * fs/cifs/cifspdu.h
@ -5632,8 +5632,8 @@ Index: linux-2.4.35.4/fs/cifs/cifspdu.h
+#endif /* _CIFSPDU_H */ +#endif /* _CIFSPDU_H */
Index: linux-2.4.35.4/fs/cifs/cifsproto.h Index: linux-2.4.35.4/fs/cifs/cifsproto.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/cifsproto.h 2007-12-15 05:19:52.287400726 +0100 +++ linux-2.4.35.4/fs/cifs/cifsproto.h
@@ -0,0 +1,254 @@ @@ -0,0 +1,254 @@
+/* +/*
+ * fs/cifs/cifsproto.h + * fs/cifs/cifsproto.h
@ -5891,8 +5891,8 @@ Index: linux-2.4.35.4/fs/cifs/cifsproto.h
+#endif /* _CIFSPROTO_H */ +#endif /* _CIFSPROTO_H */
Index: linux-2.4.35.4/fs/cifs/cifssmb.c Index: linux-2.4.35.4/fs/cifs/cifssmb.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/cifssmb.c 2007-12-15 05:19:52.287400726 +0100 +++ linux-2.4.35.4/fs/cifs/cifssmb.c
@@ -0,0 +1,3016 @@ @@ -0,0 +1,3016 @@
+/* +/*
+ * fs/cifs/cifssmb.c + * fs/cifs/cifssmb.c
@ -8912,8 +8912,8 @@ Index: linux-2.4.35.4/fs/cifs/cifssmb.c
+#endif +#endif
Index: linux-2.4.35.4/fs/cifs/cifs_unicode.c Index: linux-2.4.35.4/fs/cifs/cifs_unicode.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/cifs_unicode.c 2007-12-15 05:19:52.291400955 +0100 +++ linux-2.4.35.4/fs/cifs/cifs_unicode.c
@@ -0,0 +1,87 @@ @@ -0,0 +1,87 @@
+/* +/*
+ * fs/cifs/cifs_unicode.c + * fs/cifs/cifs_unicode.c
@ -9004,8 +9004,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_unicode.c
+ +
Index: linux-2.4.35.4/fs/cifs/cifs_unicode.h Index: linux-2.4.35.4/fs/cifs/cifs_unicode.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/cifs_unicode.h 2007-12-15 05:19:52.291400955 +0100 +++ linux-2.4.35.4/fs/cifs/cifs_unicode.h
@@ -0,0 +1,353 @@ @@ -0,0 +1,353 @@
+/* +/*
+ * cifs_unicode: Unicode kernel case support + * cifs_unicode: Unicode kernel case support
@ -9362,8 +9362,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_unicode.h
+#endif +#endif
Index: linux-2.4.35.4/fs/cifs/cifs_uniupr.h Index: linux-2.4.35.4/fs/cifs/cifs_uniupr.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/cifs_uniupr.h 2007-12-15 05:19:52.291400955 +0100 +++ linux-2.4.35.4/fs/cifs/cifs_uniupr.h
@@ -0,0 +1,253 @@ @@ -0,0 +1,253 @@
+/* +/*
+ * Copyright (c) International Business Machines Corp., 2000,2002 + * Copyright (c) International Business Machines Corp., 2000,2002
@ -9620,8 +9620,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_uniupr.h
+#endif +#endif
Index: linux-2.4.35.4/fs/cifs/connect.c Index: linux-2.4.35.4/fs/cifs/connect.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/connect.c 2007-12-15 05:19:52.295401184 +0100 +++ linux-2.4.35.4/fs/cifs/connect.c
@@ -0,0 +1,2924 @@ @@ -0,0 +1,2924 @@
+/* +/*
+ * fs/cifs/connect.c + * fs/cifs/connect.c
@ -12549,8 +12549,8 @@ Index: linux-2.4.35.4/fs/cifs/connect.c
+ +
Index: linux-2.4.35.4/fs/cifs/dir.c Index: linux-2.4.35.4/fs/cifs/dir.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/dir.c 2007-12-15 05:19:52.295401184 +0100 +++ linux-2.4.35.4/fs/cifs/dir.c
@@ -0,0 +1,425 @@ @@ -0,0 +1,425 @@
+/* +/*
+ * fs/cifs/dir.c + * fs/cifs/dir.c
@ -12979,8 +12979,8 @@ Index: linux-2.4.35.4/fs/cifs/dir.c
+}; +};
Index: linux-2.4.35.4/fs/cifs/file.c Index: linux-2.4.35.4/fs/cifs/file.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/file.c 2007-12-15 05:19:52.299401411 +0100 +++ linux-2.4.35.4/fs/cifs/file.c
@@ -0,0 +1,2185 @@ @@ -0,0 +1,2185 @@
+/* +/*
+ * fs/cifs/file.c + * fs/cifs/file.c
@ -15169,8 +15169,8 @@ Index: linux-2.4.35.4/fs/cifs/file.c
+}; +};
Index: linux-2.4.35.4/fs/cifs/inode.c Index: linux-2.4.35.4/fs/cifs/inode.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/inode.c 2007-12-15 05:19:52.299401411 +0100 +++ linux-2.4.35.4/fs/cifs/inode.c
@@ -0,0 +1,1079 @@ @@ -0,0 +1,1079 @@
+/* +/*
+ * fs/cifs/inode.c + * fs/cifs/inode.c
@ -16253,8 +16253,8 @@ Index: linux-2.4.35.4/fs/cifs/inode.c
+} +}
Index: linux-2.4.35.4/fs/cifs/link.c Index: linux-2.4.35.4/fs/cifs/link.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/link.c 2007-12-15 05:19:52.299401411 +0100 +++ linux-2.4.35.4/fs/cifs/link.c
@@ -0,0 +1,328 @@ @@ -0,0 +1,328 @@
+/* +/*
+ * fs/cifs/link.c + * fs/cifs/link.c
@ -16586,8 +16586,8 @@ Index: linux-2.4.35.4/fs/cifs/link.c
+} +}
Index: linux-2.4.35.4/fs/cifs/Makefile Index: linux-2.4.35.4/fs/cifs/Makefile
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/Makefile 2007-12-15 05:19:52.303401640 +0100 +++ linux-2.4.35.4/fs/cifs/Makefile
@@ -0,0 +1,10 @@ @@ -0,0 +1,10 @@
+# +#
+# Makefile for Linux CIFS VFS client +# Makefile for Linux CIFS VFS client
@ -16601,8 +16601,8 @@ Index: linux-2.4.35.4/fs/cifs/Makefile
+include $(TOPDIR)/Rules.make +include $(TOPDIR)/Rules.make
Index: linux-2.4.35.4/fs/cifs/md4.c Index: linux-2.4.35.4/fs/cifs/md4.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/md4.c 2007-12-15 05:19:52.303401640 +0100 +++ linux-2.4.35.4/fs/cifs/md4.c
@@ -0,0 +1,203 @@ @@ -0,0 +1,203 @@
+/* +/*
+ Unix SMB/Netbios implementation. + Unix SMB/Netbios implementation.
@ -16809,8 +16809,8 @@ Index: linux-2.4.35.4/fs/cifs/md4.c
+} +}
Index: linux-2.4.35.4/fs/cifs/md5.c Index: linux-2.4.35.4/fs/cifs/md5.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/md5.c 2007-12-15 05:19:52.303401640 +0100 +++ linux-2.4.35.4/fs/cifs/md5.c
@@ -0,0 +1,363 @@ @@ -0,0 +1,363 @@
+/* +/*
+ * This code implements the MD5 message-digest algorithm. + * This code implements the MD5 message-digest algorithm.
@ -17177,8 +17177,8 @@ Index: linux-2.4.35.4/fs/cifs/md5.c
+} +}
Index: linux-2.4.35.4/fs/cifs/md5.h Index: linux-2.4.35.4/fs/cifs/md5.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/md5.h 2007-12-15 05:19:52.303401640 +0100 +++ linux-2.4.35.4/fs/cifs/md5.h
@@ -0,0 +1,38 @@ @@ -0,0 +1,38 @@
+#ifndef MD5_H +#ifndef MD5_H
+#define MD5_H +#define MD5_H
@ -17220,8 +17220,8 @@ Index: linux-2.4.35.4/fs/cifs/md5.h
+ unsigned char *digest); + unsigned char *digest);
Index: linux-2.4.35.4/fs/cifs/misc.c Index: linux-2.4.35.4/fs/cifs/misc.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/misc.c 2007-12-15 05:19:52.307401866 +0100 +++ linux-2.4.35.4/fs/cifs/misc.c
@@ -0,0 +1,463 @@ @@ -0,0 +1,463 @@
+/* +/*
+ * fs/cifs/misc.c + * fs/cifs/misc.c
@ -17688,8 +17688,8 @@ Index: linux-2.4.35.4/fs/cifs/misc.c
+} +}
Index: linux-2.4.35.4/fs/cifs/netmisc.c Index: linux-2.4.35.4/fs/cifs/netmisc.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/netmisc.c 2007-12-15 05:19:52.307401866 +0100 +++ linux-2.4.35.4/fs/cifs/netmisc.c
@@ -0,0 +1,905 @@ @@ -0,0 +1,905 @@
+/* +/*
+ * fs/cifs/netmisc.c + * fs/cifs/netmisc.c
@ -18598,8 +18598,8 @@ Index: linux-2.4.35.4/fs/cifs/netmisc.c
+} +}
Index: linux-2.4.35.4/fs/cifs/nterr.c Index: linux-2.4.35.4/fs/cifs/nterr.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/nterr.c 2007-12-15 05:19:52.307401866 +0100 +++ linux-2.4.35.4/fs/cifs/nterr.c
@@ -0,0 +1,687 @@ @@ -0,0 +1,687 @@
+/* +/*
+ * Unix SMB/Netbios implementation. + * Unix SMB/Netbios implementation.
@ -19290,8 +19290,8 @@ Index: linux-2.4.35.4/fs/cifs/nterr.c
+}; +};
Index: linux-2.4.35.4/fs/cifs/nterr.h Index: linux-2.4.35.4/fs/cifs/nterr.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/nterr.h 2007-12-15 05:19:52.311402095 +0100 +++ linux-2.4.35.4/fs/cifs/nterr.h
@@ -0,0 +1,556 @@ @@ -0,0 +1,556 @@
+/* +/*
+ Unix SMB/Netbios implementation. + Unix SMB/Netbios implementation.
@ -19851,8 +19851,8 @@ Index: linux-2.4.35.4/fs/cifs/nterr.h
+#endif /* _NTERR_H */ +#endif /* _NTERR_H */
Index: linux-2.4.35.4/fs/cifs/ntlmssp.h Index: linux-2.4.35.4/fs/cifs/ntlmssp.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/ntlmssp.h 2007-12-15 05:19:52.311402095 +0100 +++ linux-2.4.35.4/fs/cifs/ntlmssp.h
@@ -0,0 +1,101 @@ @@ -0,0 +1,101 @@
+/* +/*
+ * fs/cifs/ntlmssp.h + * fs/cifs/ntlmssp.h
@ -19957,8 +19957,8 @@ Index: linux-2.4.35.4/fs/cifs/ntlmssp.h
+#pragma pack() /* resume default structure packing */ +#pragma pack() /* resume default structure packing */
Index: linux-2.4.35.4/fs/cifs/README Index: linux-2.4.35.4/fs/cifs/README
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/README 2007-12-15 05:19:52.311402095 +0100 +++ linux-2.4.35.4/fs/cifs/README
@@ -0,0 +1,356 @@ @@ -0,0 +1,356 @@
+The CIFS VFS support for Linux supports many advanced network filesystem +The CIFS VFS support for Linux supports many advanced network filesystem
+features such as heirarchical dfs like namespace, hardlinks, locking and more. +features such as heirarchical dfs like namespace, hardlinks, locking and more.
@ -20318,8 +20318,8 @@ Index: linux-2.4.35.4/fs/cifs/README
+complete in the CIFS VFS yet). +complete in the CIFS VFS yet).
Index: linux-2.4.35.4/fs/cifs/rfc1002pdu.h Index: linux-2.4.35.4/fs/cifs/rfc1002pdu.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/rfc1002pdu.h 2007-12-15 05:19:52.311402095 +0100 +++ linux-2.4.35.4/fs/cifs/rfc1002pdu.h
@@ -0,0 +1,79 @@ @@ -0,0 +1,79 @@
+/* +/*
+ * fs/cifs/rfc1002pdu.h + * fs/cifs/rfc1002pdu.h
@ -20402,8 +20402,8 @@ Index: linux-2.4.35.4/fs/cifs/rfc1002pdu.h
+ +
Index: linux-2.4.35.4/fs/cifs/smbdes.c Index: linux-2.4.35.4/fs/cifs/smbdes.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/smbdes.c 2007-12-15 05:19:52.315402324 +0100 +++ linux-2.4.35.4/fs/cifs/smbdes.c
@@ -0,0 +1,408 @@ @@ -0,0 +1,408 @@
+/* +/*
+ Unix SMB/Netbios implementation. + Unix SMB/Netbios implementation.
@ -20815,8 +20815,8 @@ Index: linux-2.4.35.4/fs/cifs/smbdes.c
+} +}
Index: linux-2.4.35.4/fs/cifs/smbencrypt.c Index: linux-2.4.35.4/fs/cifs/smbencrypt.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/smbencrypt.c 2007-12-15 05:19:52.315402324 +0100 +++ linux-2.4.35.4/fs/cifs/smbencrypt.c
@@ -0,0 +1,295 @@ @@ -0,0 +1,295 @@
+/* +/*
+ Unix SMB/Netbios implementation. + Unix SMB/Netbios implementation.
@ -21115,8 +21115,8 @@ Index: linux-2.4.35.4/fs/cifs/smbencrypt.c
+} +}
Index: linux-2.4.35.4/fs/cifs/smberr.c Index: linux-2.4.35.4/fs/cifs/smberr.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/smberr.c 2007-12-15 05:19:52.315402324 +0100 +++ linux-2.4.35.4/fs/cifs/smberr.c
@@ -0,0 +1,240 @@ @@ -0,0 +1,240 @@
+/* +/*
+ Unix SMB/Netbios implementation. + Unix SMB/Netbios implementation.
@ -21360,8 +21360,8 @@ Index: linux-2.4.35.4/fs/cifs/smberr.c
+} +}
Index: linux-2.4.35.4/fs/cifs/smberr.h Index: linux-2.4.35.4/fs/cifs/smberr.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/smberr.h 2007-12-15 05:19:52.315402324 +0100 +++ linux-2.4.35.4/fs/cifs/smberr.h
@@ -0,0 +1,113 @@ @@ -0,0 +1,113 @@
+/* +/*
+ * fs/cifs/smberr.h + * fs/cifs/smberr.h
@ -21478,8 +21478,8 @@ Index: linux-2.4.35.4/fs/cifs/smberr.h
+#define ERRnosupport 0xFFFF +#define ERRnosupport 0xFFFF
Index: linux-2.4.35.4/fs/cifs/TODO Index: linux-2.4.35.4/fs/cifs/TODO
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/TODO 2007-12-15 05:19:52.315402324 +0100 +++ linux-2.4.35.4/fs/cifs/TODO
@@ -0,0 +1,106 @@ @@ -0,0 +1,106 @@
+version 1.16 May 27, 2004 +version 1.16 May 27, 2004
+ +
@ -21589,8 +21589,8 @@ Index: linux-2.4.35.4/fs/cifs/TODO
+ +
Index: linux-2.4.35.4/fs/cifs/transport.c Index: linux-2.4.35.4/fs/cifs/transport.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/cifs/transport.c 2007-12-15 05:19:52.319402550 +0100 +++ linux-2.4.35.4/fs/cifs/transport.c
@@ -0,0 +1,434 @@ @@ -0,0 +1,434 @@
+/* +/*
+ * fs/cifs/transport.c + * fs/cifs/transport.c
@ -22028,9 +22028,9 @@ Index: linux-2.4.35.4/fs/cifs/transport.c
+} +}
Index: linux-2.4.35.4/fs/Config.in Index: linux-2.4.35.4/fs/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/Config.in 2007-12-15 05:19:49.287229757 +0100 --- linux-2.4.35.4.orig/fs/Config.in
+++ linux-2.4.35.4/fs/Config.in 2007-12-15 05:19:52.319402550 +0100 +++ linux-2.4.35.4/fs/Config.in
@@ -153,6 +153,10 @@ @@ -153,6 +153,10 @@ if [ "$CONFIG_NET" = "y" ]; then
define_bool CONFIG_LOCKD_V4 y define_bool CONFIG_LOCKD_V4 y
fi fi
@ -22043,9 +22043,9 @@ Index: linux-2.4.35.4/fs/Config.in
bool ' Use a default NLS' CONFIG_SMB_NLS_DEFAULT bool ' Use a default NLS' CONFIG_SMB_NLS_DEFAULT
Index: linux-2.4.35.4/fs/Makefile Index: linux-2.4.35.4/fs/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/Makefile 2007-12-15 05:19:48.639192828 +0100 --- linux-2.4.35.4.orig/fs/Makefile
+++ linux-2.4.35.4/fs/Makefile 2007-12-15 05:19:52.319402550 +0100 +++ linux-2.4.35.4/fs/Makefile
@@ -37,6 +37,7 @@ @@ -37,6 +37,7 @@ subdir-$(CONFIG_MSDOS_FS) += msdos
subdir-$(CONFIG_VFAT_FS) += vfat subdir-$(CONFIG_VFAT_FS) += vfat
subdir-$(CONFIG_BFS_FS) += bfs subdir-$(CONFIG_BFS_FS) += bfs
subdir-$(CONFIG_ISO9660_FS) += isofs subdir-$(CONFIG_ISO9660_FS) += isofs
@ -22055,9 +22055,9 @@ Index: linux-2.4.35.4/fs/Makefile
subdir-$(CONFIG_HFS_FS) += hfs subdir-$(CONFIG_HFS_FS) += hfs
Index: linux-2.4.35.4/fs/nls/Config.in Index: linux-2.4.35.4/fs/nls/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/nls/Config.in 2007-12-15 05:19:42.058817832 +0100 --- linux-2.4.35.4.orig/fs/nls/Config.in
+++ linux-2.4.35.4/fs/nls/Config.in 2007-12-15 05:19:52.319402550 +0100 +++ linux-2.4.35.4/fs/nls/Config.in
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@ fi
# msdos and Joliet want NLS # msdos and Joliet want NLS
if [ "$CONFIG_JOLIET" = "y" -o "$CONFIG_FAT_FS" != "n" \ if [ "$CONFIG_JOLIET" = "y" -o "$CONFIG_FAT_FS" != "n" \

260
target/linux/generic-2.4/patches/108-optional_aout_support.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/Documentation/Configure.help Index: linux-2.4.35.4/Documentation/Configure.help
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:19:52.251398675 +0100 --- linux-2.4.35.4.orig/Documentation/Configure.help
+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:19:53.139449282 +0100 +++ linux-2.4.35.4/Documentation/Configure.help
@@ -4690,6 +4690,12 @@ @@ -4690,6 +4690,12 @@ CONFIG_BINFMT_ELF
ld.so (check the file <file:Documentation/Changes> for location and ld.so (check the file <file:Documentation/Changes> for location and
latest version). latest version).
@ -15,7 +15,7 @@ Index: linux-2.4.35.4/Documentation/Configure.help
Kernel support for a.out binaries Kernel support for a.out binaries
CONFIG_BINFMT_AOUT CONFIG_BINFMT_AOUT
A.out (Assembler.OUTput) is a set of formats for libraries and A.out (Assembler.OUTput) is a set of formats for libraries and
@@ -4703,13 +4709,11 @@ @@ -4703,13 +4709,11 @@ CONFIG_BINFMT_AOUT
warrant removing support. However its removal is a good idea if you warrant removing support. However its removal is a good idea if you
wish to ensure that absolutely none of your programs will use this wish to ensure that absolutely none of your programs will use this
older executable format. If you don't know what to answer at this older executable format. If you don't know what to answer at this
@ -33,9 +33,9 @@ Index: linux-2.4.35.4/Documentation/Configure.help
CONFIG_OSF4_COMPAT CONFIG_OSF4_COMPAT
Index: linux-2.4.35.4/arch/alpha/config.in Index: linux-2.4.35.4/arch/alpha/config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/alpha/config.in 2007-12-15 05:19:41.518787058 +0100 --- linux-2.4.35.4.orig/arch/alpha/config.in
+++ linux-2.4.35.4/arch/alpha/config.in 2007-12-15 05:19:53.143449511 +0100 +++ linux-2.4.35.4/arch/alpha/config.in
@@ -315,6 +315,9 @@ @@ -315,6 +315,9 @@ if [ "$CONFIG_BINFMT_AOUT" != "n" ]; the
fi fi
bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
@ -47,9 +47,9 @@ Index: linux-2.4.35.4/arch/alpha/config.in
source drivers/parport/Config.in source drivers/parport/Config.in
Index: linux-2.4.35.4/arch/alpha/defconfig Index: linux-2.4.35.4/arch/alpha/defconfig
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/alpha/defconfig 2007-12-15 05:19:41.526787516 +0100 --- linux-2.4.35.4.orig/arch/alpha/defconfig
+++ linux-2.4.35.4/arch/alpha/defconfig 2007-12-15 05:19:53.143449511 +0100 +++ linux-2.4.35.4/arch/alpha/defconfig
@@ -72,6 +72,7 @@ @@ -72,6 +72,7 @@ CONFIG_KCORE_ELF=y
# CONFIG_KCORE_AOUT is not set # CONFIG_KCORE_AOUT is not set
# CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_AOUT is not set
CONFIG_BINFMT_ELF=y CONFIG_BINFMT_ELF=y
@ -59,9 +59,9 @@ Index: linux-2.4.35.4/arch/alpha/defconfig
Index: linux-2.4.35.4/arch/arm/config.in Index: linux-2.4.35.4/arch/arm/config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/arm/config.in 2007-12-15 05:19:41.534787971 +0100 --- linux-2.4.35.4.orig/arch/arm/config.in
+++ linux-2.4.35.4/arch/arm/config.in 2007-12-15 05:19:53.143449511 +0100 +++ linux-2.4.35.4/arch/arm/config.in
@@ -499,6 +499,9 @@ @@ -499,6 +499,9 @@ choice 'Kernel core (/proc/kcore) format
A.OUT CONFIG_KCORE_AOUT" ELF A.OUT CONFIG_KCORE_AOUT" ELF
tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
@ -73,9 +73,9 @@ Index: linux-2.4.35.4/arch/arm/config.in
dep_tristate 'RISC OS personality' CONFIG_ARTHUR $CONFIG_CPU_32 dep_tristate 'RISC OS personality' CONFIG_ARTHUR $CONFIG_CPU_32
Index: linux-2.4.35.4/arch/arm/defconfig Index: linux-2.4.35.4/arch/arm/defconfig
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/arm/defconfig 2007-12-15 05:19:41.542788427 +0100 --- linux-2.4.35.4.orig/arch/arm/defconfig
+++ linux-2.4.35.4/arch/arm/defconfig 2007-12-15 05:19:53.143449511 +0100 +++ linux-2.4.35.4/arch/arm/defconfig
@@ -83,8 +83,9 @@ @@ -83,8 +83,9 @@ CONFIG_SYSCTL=y
CONFIG_NWFPE=y CONFIG_NWFPE=y
CONFIG_KCORE_ELF=y CONFIG_KCORE_ELF=y
# CONFIG_KCORE_AOUT is not set # CONFIG_KCORE_AOUT is not set
@ -88,9 +88,9 @@ Index: linux-2.4.35.4/arch/arm/defconfig
# CONFIG_ARTHUR is not set # CONFIG_ARTHUR is not set
Index: linux-2.4.35.4/arch/cris/config.in Index: linux-2.4.35.4/arch/cris/config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/cris/config.in 2007-12-15 05:19:41.550788882 +0100 --- linux-2.4.35.4.orig/arch/cris/config.in
+++ linux-2.4.35.4/arch/cris/config.in 2007-12-15 05:19:53.143449511 +0100 +++ linux-2.4.35.4/arch/cris/config.in
@@ -31,6 +31,9 @@ @@ -31,6 +31,9 @@ bool 'BSD Process Accounting' CONFIG_BSD
bool 'Sysctl support' CONFIG_SYSCTL bool 'Sysctl support' CONFIG_SYSCTL
bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
@ -102,9 +102,9 @@ Index: linux-2.4.35.4/arch/cris/config.in
Index: linux-2.4.35.4/arch/cris/defconfig Index: linux-2.4.35.4/arch/cris/defconfig
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/cris/defconfig 2007-12-15 05:19:41.554789111 +0100 --- linux-2.4.35.4.orig/arch/cris/defconfig
+++ linux-2.4.35.4/arch/cris/defconfig 2007-12-15 05:19:53.147449737 +0100 +++ linux-2.4.35.4/arch/cris/defconfig
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@ CONFIG_SYSVIPC=y
# CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_SYSCTL is not set # CONFIG_SYSCTL is not set
CONFIG_BINFMT_ELF=y CONFIG_BINFMT_ELF=y
@ -114,9 +114,9 @@ Index: linux-2.4.35.4/arch/cris/defconfig
Index: linux-2.4.35.4/arch/i386/config.in Index: linux-2.4.35.4/arch/i386/config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/i386/config.in 2007-12-15 05:19:41.562789566 +0100 --- linux-2.4.35.4.orig/arch/i386/config.in
+++ linux-2.4.35.4/arch/i386/config.in 2007-12-15 05:19:53.147449737 +0100 +++ linux-2.4.35.4/arch/i386/config.in
@@ -329,6 +329,9 @@ @@ -329,6 +329,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then
fi fi
tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
@ -128,9 +128,9 @@ Index: linux-2.4.35.4/arch/i386/config.in
Index: linux-2.4.35.4/arch/i386/defconfig Index: linux-2.4.35.4/arch/i386/defconfig
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/i386/defconfig 2007-12-15 05:19:41.570790022 +0100 --- linux-2.4.35.4.orig/arch/i386/defconfig
+++ linux-2.4.35.4/arch/i386/defconfig 2007-12-15 05:19:53.147449737 +0100 +++ linux-2.4.35.4/arch/i386/defconfig
@@ -115,9 +115,10 @@ @@ -115,9 +115,10 @@ CONFIG_SYSVIPC=y
CONFIG_SYSCTL=y CONFIG_SYSCTL=y
CONFIG_KCORE_ELF=y CONFIG_KCORE_ELF=y
# CONFIG_KCORE_AOUT is not set # CONFIG_KCORE_AOUT is not set
@ -145,9 +145,9 @@ Index: linux-2.4.35.4/arch/i386/defconfig
# CONFIG_APM is not set # CONFIG_APM is not set
Index: linux-2.4.35.4/arch/ia64/config.in Index: linux-2.4.35.4/arch/ia64/config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/ia64/config.in 2007-12-15 05:19:41.578790477 +0100 --- linux-2.4.35.4.orig/arch/ia64/config.in
+++ linux-2.4.35.4/arch/ia64/config.in 2007-12-15 05:19:53.147449737 +0100 +++ linux-2.4.35.4/arch/ia64/config.in
@@ -124,6 +124,9 @@ @@ -124,6 +124,9 @@ bool 'System V IPC' CONFIG_SYSVIPC
bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
bool 'Sysctl support' CONFIG_SYSCTL bool 'Sysctl support' CONFIG_SYSCTL
bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
@ -159,9 +159,9 @@ Index: linux-2.4.35.4/arch/ia64/config.in
if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then
Index: linux-2.4.35.4/arch/ia64/defconfig Index: linux-2.4.35.4/arch/ia64/defconfig
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/ia64/defconfig 2007-12-15 05:19:41.586790935 +0100 --- linux-2.4.35.4.orig/arch/ia64/defconfig
+++ linux-2.4.35.4/arch/ia64/defconfig 2007-12-15 05:19:53.151449966 +0100 +++ linux-2.4.35.4/arch/ia64/defconfig
@@ -60,6 +60,7 @@ @@ -60,6 +60,7 @@ CONFIG_SYSVIPC=y
# CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_SYSCTL=y CONFIG_SYSCTL=y
CONFIG_BINFMT_ELF=y CONFIG_BINFMT_ELF=y
@ -171,9 +171,9 @@ Index: linux-2.4.35.4/arch/ia64/defconfig
CONFIG_ACPI_EFI=y CONFIG_ACPI_EFI=y
Index: linux-2.4.35.4/arch/m68k/config.in Index: linux-2.4.35.4/arch/m68k/config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/m68k/config.in 2007-12-15 05:19:41.594791391 +0100 --- linux-2.4.35.4.orig/arch/m68k/config.in
+++ linux-2.4.35.4/arch/m68k/config.in 2007-12-15 05:19:53.151449966 +0100 +++ linux-2.4.35.4/arch/m68k/config.in
@@ -99,6 +99,9 @@ @@ -99,6 +99,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then
fi fi
tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
@ -185,9 +185,9 @@ Index: linux-2.4.35.4/arch/m68k/config.in
if [ "$CONFIG_AMIGA" = "y" ]; then if [ "$CONFIG_AMIGA" = "y" ]; then
Index: linux-2.4.35.4/arch/m68k/defconfig Index: linux-2.4.35.4/arch/m68k/defconfig
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/m68k/defconfig 2007-12-15 05:19:41.602791846 +0100 --- linux-2.4.35.4.orig/arch/m68k/defconfig
+++ linux-2.4.35.4/arch/m68k/defconfig 2007-12-15 05:19:53.151449966 +0100 +++ linux-2.4.35.4/arch/m68k/defconfig
@@ -44,8 +44,9 @@ @@ -44,8 +44,9 @@ CONFIG_SYSVIPC=y
CONFIG_SYSCTL=y CONFIG_SYSCTL=y
CONFIG_KCORE_ELF=y CONFIG_KCORE_ELF=y
# CONFIG_KCORE_AOUT is not set # CONFIG_KCORE_AOUT is not set
@ -200,9 +200,9 @@ Index: linux-2.4.35.4/arch/m68k/defconfig
# CONFIG_AMIGA_PCMCIA is not set # CONFIG_AMIGA_PCMCIA is not set
Index: linux-2.4.35.4/arch/mips/config-shared.in Index: linux-2.4.35.4/arch/mips/config-shared.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/mips/config-shared.in 2007-12-15 05:19:44.814974898 +0100 --- linux-2.4.35.4.orig/arch/mips/config-shared.in
+++ linux-2.4.35.4/arch/mips/config-shared.in 2007-12-15 05:19:53.151449966 +0100 +++ linux-2.4.35.4/arch/mips/config-shared.in
@@ -873,6 +873,9 @@ @@ -873,6 +873,9 @@ define_bool CONFIG_KCORE_ELF y
define_bool CONFIG_KCORE_AOUT n define_bool CONFIG_KCORE_AOUT n
define_bool CONFIG_BINFMT_AOUT n define_bool CONFIG_BINFMT_AOUT n
bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
@ -214,9 +214,9 @@ Index: linux-2.4.35.4/arch/mips/config-shared.in
dep_bool 'Kernel support for n32 binaries' CONFIG_MIPS32_N32 $CONFIG_MIPS32_COMPAT dep_bool 'Kernel support for n32 binaries' CONFIG_MIPS32_N32 $CONFIG_MIPS32_COMPAT
Index: linux-2.4.35.4/arch/mips/defconfig Index: linux-2.4.35.4/arch/mips/defconfig
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/mips/defconfig 2007-12-15 05:19:44.814974898 +0100 --- linux-2.4.35.4.orig/arch/mips/defconfig
+++ linux-2.4.35.4/arch/mips/defconfig 2007-12-15 05:19:53.155450196 +0100 +++ linux-2.4.35.4/arch/mips/defconfig
@@ -143,6 +143,7 @@ @@ -143,6 +143,7 @@ CONFIG_KCORE_ELF=y
# CONFIG_KCORE_AOUT is not set # CONFIG_KCORE_AOUT is not set
# CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_AOUT is not set
CONFIG_BINFMT_ELF=y CONFIG_BINFMT_ELF=y
@ -226,8 +226,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig
# CONFIG_MIPS32_N32 is not set # CONFIG_MIPS32_N32 is not set
Index: linux-2.4.35.4/arch/mips/kernel/irixelf.c Index: linux-2.4.35.4/arch/mips/kernel/irixelf.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/mips/kernel/irixelf.c 2007-12-15 05:19:41.626793215 +0100 --- linux-2.4.35.4.orig/arch/mips/kernel/irixelf.c
+++ linux-2.4.35.4/arch/mips/kernel/irixelf.c 2007-12-15 05:19:53.155450196 +0100 +++ linux-2.4.35.4/arch/mips/kernel/irixelf.c
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
* Copyright 1993, 1994: Eric Youngdale (ericy@cais.com). * Copyright 1993, 1994: Eric Youngdale (ericy@cais.com).
*/ */
@ -236,7 +236,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/irixelf.c
#include <linux/module.h> #include <linux/module.h>
#include <linux/fs.h> #include <linux/fs.h>
@@ -48,7 +49,12 @@ @@ -48,7 +49,12 @@ static int irix_core_dump(long signr, st
extern int dump_fpu (elf_fpregset_t *); extern int dump_fpu (elf_fpregset_t *);
static struct linux_binfmt irix_format = { static struct linux_binfmt irix_format = {
@ -250,7 +250,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/irixelf.c
irix_core_dump, PAGE_SIZE irix_core_dump, PAGE_SIZE
}; };
@@ -794,6 +800,7 @@ @@ -794,6 +800,7 @@ out_free_ph:
goto out; goto out;
} }
@ -258,7 +258,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/irixelf.c
/* This is really simpleminded and specialized - we are loading an /* This is really simpleminded and specialized - we are loading an
* a.out library that is given an ELF header. * a.out library that is given an ELF header.
*/ */
@@ -873,6 +880,7 @@ @@ -873,6 +880,7 @@ static int load_irix_library(struct file
kfree(elf_phdata); kfree(elf_phdata);
return 0; return 0;
} }
@ -268,9 +268,9 @@ Index: linux-2.4.35.4/arch/mips/kernel/irixelf.c
* a phdr ptr USER_PHDRP in userspace, and a count CNT telling how many * a phdr ptr USER_PHDRP in userspace, and a count CNT telling how many
Index: linux-2.4.35.4/arch/mips64/defconfig Index: linux-2.4.35.4/arch/mips64/defconfig
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/mips64/defconfig 2007-12-15 05:19:44.874978317 +0100 --- linux-2.4.35.4.orig/arch/mips64/defconfig
+++ linux-2.4.35.4/arch/mips64/defconfig 2007-12-15 05:19:53.155450196 +0100 +++ linux-2.4.35.4/arch/mips64/defconfig
@@ -147,6 +147,7 @@ @@ -147,6 +147,7 @@ CONFIG_KCORE_ELF=y
# CONFIG_KCORE_AOUT is not set # CONFIG_KCORE_AOUT is not set
# CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_AOUT is not set
CONFIG_BINFMT_ELF=y CONFIG_BINFMT_ELF=y
@ -280,9 +280,9 @@ Index: linux-2.4.35.4/arch/mips64/defconfig
# CONFIG_MIPS32_N32 is not set # CONFIG_MIPS32_N32 is not set
Index: linux-2.4.35.4/arch/parisc/config.in Index: linux-2.4.35.4/arch/parisc/config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/parisc/config.in 2007-12-15 05:19:41.638793897 +0100 --- linux-2.4.35.4.orig/arch/parisc/config.in
+++ linux-2.4.35.4/arch/parisc/config.in 2007-12-15 05:19:53.155450196 +0100 +++ linux-2.4.35.4/arch/parisc/config.in
@@ -89,6 +89,9 @@ @@ -89,6 +89,9 @@ bool 'BSD Process Accounting' CONFIG_BSD
bool 'Sysctl support' CONFIG_SYSCTL bool 'Sysctl support' CONFIG_SYSCTL
define_bool CONFIG_KCORE_ELF y define_bool CONFIG_KCORE_ELF y
bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
@ -294,9 +294,9 @@ Index: linux-2.4.35.4/arch/parisc/config.in
Index: linux-2.4.35.4/arch/parisc/defconfig Index: linux-2.4.35.4/arch/parisc/defconfig
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/parisc/defconfig 2007-12-15 05:19:41.646794355 +0100 --- linux-2.4.35.4.orig/arch/parisc/defconfig
+++ linux-2.4.35.4/arch/parisc/defconfig 2007-12-15 05:19:53.159450422 +0100 +++ linux-2.4.35.4/arch/parisc/defconfig
@@ -56,6 +56,7 @@ @@ -56,6 +56,7 @@ CONFIG_SYSVIPC=y
CONFIG_SYSCTL=y CONFIG_SYSCTL=y
CONFIG_KCORE_ELF=y CONFIG_KCORE_ELF=y
CONFIG_BINFMT_ELF=y CONFIG_BINFMT_ELF=y
@ -306,9 +306,9 @@ Index: linux-2.4.35.4/arch/parisc/defconfig
# CONFIG_PM is not set # CONFIG_PM is not set
Index: linux-2.4.35.4/arch/ppc/config.in Index: linux-2.4.35.4/arch/ppc/config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/ppc/config.in 2007-12-15 05:19:41.654794810 +0100 --- linux-2.4.35.4.orig/arch/ppc/config.in
+++ linux-2.4.35.4/arch/ppc/config.in 2007-12-15 05:19:53.159450422 +0100 +++ linux-2.4.35.4/arch/ppc/config.in
@@ -384,6 +384,7 @@ @@ -384,6 +384,7 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then
fi fi
define_bool CONFIG_BINFMT_ELF y define_bool CONFIG_BINFMT_ELF y
define_bool CONFIG_KERNEL_ELF y define_bool CONFIG_KERNEL_ELF y
@ -318,9 +318,9 @@ Index: linux-2.4.35.4/arch/ppc/config.in
Index: linux-2.4.35.4/arch/ppc/defconfig Index: linux-2.4.35.4/arch/ppc/defconfig
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/ppc/defconfig 2007-12-15 05:19:41.662795265 +0100 --- linux-2.4.35.4.orig/arch/ppc/defconfig
+++ linux-2.4.35.4/arch/ppc/defconfig 2007-12-15 05:19:53.159450422 +0100 +++ linux-2.4.35.4/arch/ppc/defconfig
@@ -59,7 +59,8 @@ @@ -59,7 +59,8 @@ CONFIG_SYSVIPC=y
CONFIG_KCORE_ELF=y CONFIG_KCORE_ELF=y
CONFIG_BINFMT_ELF=y CONFIG_BINFMT_ELF=y
CONFIG_KERNEL_ELF=y CONFIG_KERNEL_ELF=y
@ -332,9 +332,9 @@ Index: linux-2.4.35.4/arch/ppc/defconfig
CONFIG_HOTPLUG=y CONFIG_HOTPLUG=y
Index: linux-2.4.35.4/arch/ppc64/config.in Index: linux-2.4.35.4/arch/ppc64/config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/ppc64/config.in 2007-12-15 05:19:41.670795721 +0100 --- linux-2.4.35.4.orig/arch/ppc64/config.in
+++ linux-2.4.35.4/arch/ppc64/config.in 2007-12-15 05:19:53.159450422 +0100 +++ linux-2.4.35.4/arch/ppc64/config.in
@@ -82,6 +82,9 @@ @@ -82,6 +82,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then
fi fi
bool 'Kernel support for 64 bit ELF binaries' CONFIG_BINFMT_ELF bool 'Kernel support for 64 bit ELF binaries' CONFIG_BINFMT_ELF
@ -346,9 +346,9 @@ Index: linux-2.4.35.4/arch/ppc64/config.in
Index: linux-2.4.35.4/arch/ppc64/defconfig Index: linux-2.4.35.4/arch/ppc64/defconfig
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/ppc64/defconfig 2007-12-15 05:19:41.678796176 +0100 --- linux-2.4.35.4.orig/arch/ppc64/defconfig
+++ linux-2.4.35.4/arch/ppc64/defconfig 2007-12-15 05:19:53.163450651 +0100 +++ linux-2.4.35.4/arch/ppc64/defconfig
@@ -56,6 +56,7 @@ @@ -56,6 +56,7 @@ CONFIG_SYSVIPC=y
# CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_KCORE_ELF=y CONFIG_KCORE_ELF=y
CONFIG_BINFMT_ELF=y CONFIG_BINFMT_ELF=y
@ -358,9 +358,9 @@ Index: linux-2.4.35.4/arch/ppc64/defconfig
CONFIG_PCI_NAMES=y CONFIG_PCI_NAMES=y
Index: linux-2.4.35.4/arch/s390/config.in Index: linux-2.4.35.4/arch/s390/config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/s390/config.in 2007-12-15 05:19:41.686796634 +0100 --- linux-2.4.35.4.orig/arch/s390/config.in
+++ linux-2.4.35.4/arch/s390/config.in 2007-12-15 05:19:53.163450651 +0100 +++ linux-2.4.35.4/arch/s390/config.in
@@ -58,6 +58,9 @@ @@ -58,6 +58,9 @@ bool 'BSD Process Accounting' CONFIG_BSD
bool 'Sysctl support' CONFIG_SYSCTL bool 'Sysctl support' CONFIG_SYSCTL
define_bool CONFIG_KCORE_ELF y define_bool CONFIG_KCORE_ELF y
bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
@ -372,9 +372,9 @@ Index: linux-2.4.35.4/arch/s390/config.in
bool 'Pseudo page fault support' CONFIG_PFAULT bool 'Pseudo page fault support' CONFIG_PFAULT
Index: linux-2.4.35.4/arch/s390/defconfig Index: linux-2.4.35.4/arch/s390/defconfig
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/s390/defconfig 2007-12-15 05:19:41.694797090 +0100 --- linux-2.4.35.4.orig/arch/s390/defconfig
+++ linux-2.4.35.4/arch/s390/defconfig 2007-12-15 05:19:53.163450651 +0100 +++ linux-2.4.35.4/arch/s390/defconfig
@@ -46,6 +46,7 @@ @@ -46,6 +46,7 @@ CONFIG_SYSVIPC=y
CONFIG_SYSCTL=y CONFIG_SYSCTL=y
CONFIG_KCORE_ELF=y CONFIG_KCORE_ELF=y
CONFIG_BINFMT_ELF=y CONFIG_BINFMT_ELF=y
@ -384,9 +384,9 @@ Index: linux-2.4.35.4/arch/s390/defconfig
CONFIG_PFAULT=y CONFIG_PFAULT=y
Index: linux-2.4.35.4/arch/s390x/config.in Index: linux-2.4.35.4/arch/s390x/config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/s390x/config.in 2007-12-15 05:19:41.698797316 +0100 --- linux-2.4.35.4.orig/arch/s390x/config.in
+++ linux-2.4.35.4/arch/s390x/config.in 2007-12-15 05:19:53.163450651 +0100 +++ linux-2.4.35.4/arch/s390x/config.in
@@ -61,6 +61,9 @@ @@ -61,6 +61,9 @@ bool 'BSD Process Accounting' CONFIG_BSD
bool 'Sysctl support' CONFIG_SYSCTL bool 'Sysctl support' CONFIG_SYSCTL
define_bool CONFIG_KCORE_ELF y define_bool CONFIG_KCORE_ELF y
bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
@ -398,9 +398,9 @@ Index: linux-2.4.35.4/arch/s390x/config.in
bool 'Pseudo page fault support' CONFIG_PFAULT bool 'Pseudo page fault support' CONFIG_PFAULT
Index: linux-2.4.35.4/arch/s390x/defconfig Index: linux-2.4.35.4/arch/s390x/defconfig
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/s390x/defconfig 2007-12-15 05:19:41.706797774 +0100 --- linux-2.4.35.4.orig/arch/s390x/defconfig
+++ linux-2.4.35.4/arch/s390x/defconfig 2007-12-15 05:19:53.163450651 +0100 +++ linux-2.4.35.4/arch/s390x/defconfig
@@ -47,6 +47,7 @@ @@ -47,6 +47,7 @@ CONFIG_SYSVIPC=y
CONFIG_SYSCTL=y CONFIG_SYSCTL=y
CONFIG_KCORE_ELF=y CONFIG_KCORE_ELF=y
CONFIG_BINFMT_ELF=y CONFIG_BINFMT_ELF=y
@ -410,9 +410,9 @@ Index: linux-2.4.35.4/arch/s390x/defconfig
CONFIG_PFAULT=y CONFIG_PFAULT=y
Index: linux-2.4.35.4/arch/sh/config.in Index: linux-2.4.35.4/arch/sh/config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/sh/config.in 2007-12-15 05:19:41.714798229 +0100 --- linux-2.4.35.4.orig/arch/sh/config.in
+++ linux-2.4.35.4/arch/sh/config.in 2007-12-15 05:19:53.163450651 +0100 +++ linux-2.4.35.4/arch/sh/config.in
@@ -283,6 +283,9 @@ @@ -283,6 +283,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then
A.OUT CONFIG_KCORE_AOUT" ELF A.OUT CONFIG_KCORE_AOUT" ELF
fi fi
bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
@ -424,9 +424,9 @@ Index: linux-2.4.35.4/arch/sh/config.in
bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER
Index: linux-2.4.35.4/arch/sh/defconfig Index: linux-2.4.35.4/arch/sh/defconfig
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/sh/defconfig 2007-12-15 05:19:41.722798685 +0100 --- linux-2.4.35.4.orig/arch/sh/defconfig
+++ linux-2.4.35.4/arch/sh/defconfig 2007-12-15 05:19:53.167450880 +0100 +++ linux-2.4.35.4/arch/sh/defconfig
@@ -48,6 +48,7 @@ @@ -48,6 +48,7 @@ CONFIG_CF_ENABLER=y
CONFIG_KCORE_ELF=y CONFIG_KCORE_ELF=y
# CONFIG_KCORE_AOUT is not set # CONFIG_KCORE_AOUT is not set
CONFIG_BINFMT_ELF=y CONFIG_BINFMT_ELF=y
@ -436,9 +436,9 @@ Index: linux-2.4.35.4/arch/sh/defconfig
# #
Index: linux-2.4.35.4/arch/sparc/config.in Index: linux-2.4.35.4/arch/sparc/config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/sparc/config.in 2007-12-15 05:19:41.730799140 +0100 --- linux-2.4.35.4.orig/arch/sparc/config.in
+++ linux-2.4.35.4/arch/sparc/config.in 2007-12-15 05:19:53.167450880 +0100 +++ linux-2.4.35.4/arch/sparc/config.in
@@ -74,6 +74,9 @@ @@ -74,6 +74,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then
fi fi
tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
@ -450,9 +450,9 @@ Index: linux-2.4.35.4/arch/sparc/config.in
bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER
Index: linux-2.4.35.4/arch/sparc/defconfig Index: linux-2.4.35.4/arch/sparc/defconfig
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/sparc/defconfig 2007-12-15 05:19:41.738799596 +0100 --- linux-2.4.35.4.orig/arch/sparc/defconfig
+++ linux-2.4.35.4/arch/sparc/defconfig 2007-12-15 05:19:53.167450880 +0100 +++ linux-2.4.35.4/arch/sparc/defconfig
@@ -49,9 +49,10 @@ @@ -49,9 +49,10 @@ CONFIG_SYSVIPC=y
# CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_SYSCTL=y CONFIG_SYSCTL=y
CONFIG_KCORE_ELF=y CONFIG_KCORE_ELF=y
@ -467,9 +467,9 @@ Index: linux-2.4.35.4/arch/sparc/defconfig
Index: linux-2.4.35.4/arch/sparc64/config.in Index: linux-2.4.35.4/arch/sparc64/config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/sparc64/config.in 2007-12-15 05:19:41.742799824 +0100 --- linux-2.4.35.4.orig/arch/sparc64/config.in
+++ linux-2.4.35.4/arch/sparc64/config.in 2007-12-15 05:19:53.167450880 +0100 +++ linux-2.4.35.4/arch/sparc64/config.in
@@ -79,6 +79,9 @@ @@ -79,6 +79,9 @@ if [ "$CONFIG_SPARC32_COMPAT" != "n" ];
bool ' Kernel support for 32-bit (ie. SunOS) a.out binaries' CONFIG_BINFMT_AOUT32 bool ' Kernel support for 32-bit (ie. SunOS) a.out binaries' CONFIG_BINFMT_AOUT32
fi fi
bool 'Kernel support for 64-bit ELF binaries' CONFIG_BINFMT_ELF bool 'Kernel support for 64-bit ELF binaries' CONFIG_BINFMT_ELF
@ -481,9 +481,9 @@ Index: linux-2.4.35.4/arch/sparc64/config.in
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
Index: linux-2.4.35.4/arch/sparc64/defconfig Index: linux-2.4.35.4/arch/sparc64/defconfig
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/sparc64/defconfig 2007-12-15 05:19:41.750800280 +0100 --- linux-2.4.35.4.orig/arch/sparc64/defconfig
+++ linux-2.4.35.4/arch/sparc64/defconfig 2007-12-15 05:19:53.167450880 +0100 +++ linux-2.4.35.4/arch/sparc64/defconfig
@@ -70,7 +70,8 @@ @@ -70,7 +70,8 @@ CONFIG_SPARC32_COMPAT=y
CONFIG_BINFMT_ELF32=y CONFIG_BINFMT_ELF32=y
# CONFIG_BINFMT_AOUT32 is not set # CONFIG_BINFMT_AOUT32 is not set
CONFIG_BINFMT_ELF=y CONFIG_BINFMT_ELF=y
@ -495,9 +495,9 @@ Index: linux-2.4.35.4/arch/sparc64/defconfig
# CONFIG_OOM_KILLER is not set # CONFIG_OOM_KILLER is not set
Index: linux-2.4.35.4/arch/x86_64/config.in Index: linux-2.4.35.4/arch/x86_64/config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/x86_64/config.in 2007-12-15 05:19:41.758800735 +0100 --- linux-2.4.35.4.orig/arch/x86_64/config.in
+++ linux-2.4.35.4/arch/x86_64/config.in 2007-12-15 05:19:53.171451107 +0100 +++ linux-2.4.35.4/arch/x86_64/config.in
@@ -118,6 +118,9 @@ @@ -118,6 +118,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then
fi fi
#tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT #tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
@ -509,9 +509,9 @@ Index: linux-2.4.35.4/arch/x86_64/config.in
bool 'Power Management support' CONFIG_PM bool 'Power Management support' CONFIG_PM
Index: linux-2.4.35.4/arch/x86_64/defconfig Index: linux-2.4.35.4/arch/x86_64/defconfig
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/x86_64/defconfig 2007-12-15 05:19:41.766801193 +0100 --- linux-2.4.35.4.orig/arch/x86_64/defconfig
+++ linux-2.4.35.4/arch/x86_64/defconfig 2007-12-15 05:19:53.171451107 +0100 +++ linux-2.4.35.4/arch/x86_64/defconfig
@@ -67,6 +67,7 @@ @@ -67,6 +67,7 @@ CONFIG_SYSVIPC=y
CONFIG_SYSCTL=y CONFIG_SYSCTL=y
CONFIG_KCORE_ELF=y CONFIG_KCORE_ELF=y
CONFIG_BINFMT_ELF=y CONFIG_BINFMT_ELF=y
@ -521,8 +521,8 @@ Index: linux-2.4.35.4/arch/x86_64/defconfig
CONFIG_IA32_EMULATION=y CONFIG_IA32_EMULATION=y
Index: linux-2.4.35.4/fs/binfmt_elf.c Index: linux-2.4.35.4/fs/binfmt_elf.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/binfmt_elf.c 2007-12-15 05:19:45.006985841 +0100 --- linux-2.4.35.4.orig/fs/binfmt_elf.c
+++ linux-2.4.35.4/fs/binfmt_elf.c 2007-12-15 05:19:53.171451107 +0100 +++ linux-2.4.35.4/fs/binfmt_elf.c
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
* Copyright 1993, 1994: Eric Youngdale (ericy@cais.com). * Copyright 1993, 1994: Eric Youngdale (ericy@cais.com).
*/ */
@ -541,7 +541,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c
static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int); static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int);
extern int dump_fpu (struct pt_regs *, elf_fpregset_t *); extern int dump_fpu (struct pt_regs *, elf_fpregset_t *);
extern void dump_thread(struct pt_regs *, struct user *); extern void dump_thread(struct pt_regs *, struct user *);
@@ -74,7 +77,13 @@ @@ -74,7 +77,13 @@ static int elf_core_dump(long signr, str
#define ELF_PAGEALIGN(_v) (((_v) + ELF_MIN_ALIGN - 1) & ~(ELF_MIN_ALIGN - 1)) #define ELF_PAGEALIGN(_v) (((_v) + ELF_MIN_ALIGN - 1) & ~(ELF_MIN_ALIGN - 1))
static struct linux_binfmt elf_format = { static struct linux_binfmt elf_format = {
@ -556,7 +556,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c
}; };
#define BAD_ADDR(x) ((unsigned long)(x) >= TASK_SIZE) #define BAD_ADDR(x) ((unsigned long)(x) >= TASK_SIZE)
@@ -404,6 +413,7 @@ @@ -404,6 +413,7 @@ out:
return error; return error;
} }
@ -564,7 +564,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c
static unsigned long load_aout_interp(struct exec * interp_ex, static unsigned long load_aout_interp(struct exec * interp_ex,
struct file * interpreter) struct file * interpreter)
{ {
@@ -451,6 +461,7 @@ @@ -451,6 +461,7 @@ static unsigned long load_aout_interp(st
out: out:
return elf_entry; return elf_entry;
} }
@ -572,7 +572,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c
/* /*
* These are the functions used to load ELF style executables and shared * These are the functions used to load ELF style executables and shared
@@ -458,7 +469,9 @@ @@ -458,7 +469,9 @@ out:
*/ */
#define INTERPRETER_NONE 0 #define INTERPRETER_NONE 0
@ -582,7 +582,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c
#define INTERPRETER_ELF 2 #define INTERPRETER_ELF 2
@@ -482,7 +495,9 @@ @@ -482,7 +495,9 @@ static int load_elf_binary(struct linux_
struct elfhdr elf_ex; struct elfhdr elf_ex;
struct elfhdr interp_elf_ex; struct elfhdr interp_elf_ex;
struct exec interp_ex; struct exec interp_ex;
@ -592,7 +592,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c
struct files_struct *files; struct files_struct *files;
/* Get the exec-header */ /* Get the exec-header */
@@ -612,6 +627,7 @@ @@ -612,6 +627,7 @@ static int load_elf_binary(struct linux_
/* Some simple consistency checks for the interpreter */ /* Some simple consistency checks for the interpreter */
if (elf_interpreter) { if (elf_interpreter) {
@ -600,7 +600,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c
interpreter_type = INTERPRETER_ELF | INTERPRETER_AOUT; interpreter_type = INTERPRETER_ELF | INTERPRETER_AOUT;
/* Now figure out which format our binary is */ /* Now figure out which format our binary is */
@@ -619,6 +635,9 @@ @@ -619,6 +635,9 @@ static int load_elf_binary(struct linux_
(N_MAGIC(interp_ex) != ZMAGIC) && (N_MAGIC(interp_ex) != ZMAGIC) &&
(N_MAGIC(interp_ex) != QMAGIC)) (N_MAGIC(interp_ex) != QMAGIC))
interpreter_type = INTERPRETER_ELF; interpreter_type = INTERPRETER_ELF;
@ -610,7 +610,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c
if (memcmp(interp_elf_ex.e_ident, ELFMAG, SELFMAG) != 0) if (memcmp(interp_elf_ex.e_ident, ELFMAG, SELFMAG) != 0)
interpreter_type &= ~INTERPRETER_ELF; interpreter_type &= ~INTERPRETER_ELF;
@@ -627,6 +646,7 @@ @@ -627,6 +646,7 @@ static int load_elf_binary(struct linux_
if (!interpreter_type) if (!interpreter_type)
goto out_free_dentry; goto out_free_dentry;
@ -618,7 +618,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c
/* Make sure only one type was selected */ /* Make sure only one type was selected */
if ((interpreter_type & INTERPRETER_ELF) && if ((interpreter_type & INTERPRETER_ELF) &&
interpreter_type != INTERPRETER_ELF) { interpreter_type != INTERPRETER_ELF) {
@@ -634,6 +654,7 @@ @@ -634,6 +654,7 @@ static int load_elf_binary(struct linux_
// printk(KERN_WARNING "ELF: Ambiguous type, using ELF\n"); // printk(KERN_WARNING "ELF: Ambiguous type, using ELF\n");
interpreter_type = INTERPRETER_ELF; interpreter_type = INTERPRETER_ELF;
} }
@ -626,7 +626,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c
/* Verify the interpreter has a valid arch */ /* Verify the interpreter has a valid arch */
if ((interpreter_type == INTERPRETER_ELF) && if ((interpreter_type == INTERPRETER_ELF) &&
!elf_check_arch(&interp_elf_ex)) !elf_check_arch(&interp_elf_ex))
@@ -651,6 +672,7 @@ @@ -651,6 +672,7 @@ static int load_elf_binary(struct linux_
/* OK, we are done with that, now set up the arg stuff, /* OK, we are done with that, now set up the arg stuff,
and then start this sucker up */ and then start this sucker up */
@ -634,7 +634,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c
if (!bprm->sh_bang) { if (!bprm->sh_bang) {
char * passed_p; char * passed_p;
@@ -669,6 +691,7 @@ @@ -669,6 +691,7 @@ static int load_elf_binary(struct linux_
/* Executables without an interpreter also need a personality */ /* Executables without an interpreter also need a personality */
SET_PERSONALITY(elf_ex, ibcs2_interpreter); SET_PERSONALITY(elf_ex, ibcs2_interpreter);
} }
@ -642,7 +642,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c
/* Flush all traces of the currently running executable */ /* Flush all traces of the currently running executable */
retval = flush_old_exec(bprm); retval = flush_old_exec(bprm);
@@ -817,10 +840,12 @@ @@ -817,10 +840,12 @@ static int load_elf_binary(struct linux_
padzero(elf_bss); padzero(elf_bss);
if (elf_interpreter) { if (elf_interpreter) {
@ -655,7 +655,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c
elf_entry = load_elf_interp(&interp_elf_ex, elf_entry = load_elf_interp(&interp_elf_ex,
interpreter, interpreter,
&interp_load_addr); &interp_load_addr);
@@ -849,7 +874,9 @@ @@ -849,7 +874,9 @@ static int load_elf_binary(struct linux_
kfree(elf_phdata); kfree(elf_phdata);
@ -665,7 +665,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c
sys_close(elf_exec_fileno); sys_close(elf_exec_fileno);
set_binfmt(&elf_format); set_binfmt(&elf_format);
@@ -863,10 +890,14 @@ @@ -863,10 +890,14 @@ static int load_elf_binary(struct linux_
&elf_ex, &elf_ex,
load_addr, load_bias, load_addr, load_bias,
interp_load_addr, interp_load_addr,
@ -680,7 +680,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c
current->mm->start_brk = current->mm->brk = elf_brk; current->mm->start_brk = current->mm->brk = elf_brk;
current->mm->end_code = end_code; current->mm->end_code = end_code;
current->mm->start_code = start_code; current->mm->start_code = start_code;
@@ -937,9 +968,9 @@ @@ -937,9 +968,9 @@ out_free_ph:
goto out; goto out;
} }
@ -691,7 +691,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c
static int load_elf_library(struct file *file) static int load_elf_library(struct file *file)
{ {
struct elf_phdr *elf_phdata; struct elf_phdr *elf_phdata;
@@ -1016,6 +1047,7 @@ @@ -1016,6 +1047,7 @@ out_free_ph:
out: out:
return error; return error;
} }
@ -701,9 +701,9 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c
* Note that some platforms still use traditional core dumps and not * Note that some platforms still use traditional core dumps and not
Index: linux-2.4.35.4/fs/exec.c Index: linux-2.4.35.4/fs/exec.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/exec.c 2007-12-15 05:19:41.786802333 +0100 --- linux-2.4.35.4.orig/fs/exec.c
+++ linux-2.4.35.4/fs/exec.c 2007-12-15 05:19:53.175451333 +0100 +++ linux-2.4.35.4/fs/exec.c
@@ -109,6 +109,7 @@ @@ -109,6 +109,7 @@ static inline void put_binfmt(struct lin
*/ */
asmlinkage long sys_uselib(const char * library) asmlinkage long sys_uselib(const char * library)
{ {
@ -711,7 +711,7 @@ Index: linux-2.4.35.4/fs/exec.c
struct file * file; struct file * file;
struct nameidata nd; struct nameidata nd;
int error; int error;
@@ -155,6 +156,9 @@ @@ -155,6 +156,9 @@ out:
exit: exit:
path_release(&nd); path_release(&nd);
goto out; goto out;

24
target/linux/generic-2.4/patches/109-ipsec_nat_traversal.patch
View File

@ -1,9 +1,9 @@
packaging/utils/nattpatch 2.4 packaging/utils/nattpatch 2.4
Index: linux-2.4.35.4/include/net/sock.h Index: linux-2.4.35.4/include/net/sock.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/net/sock.h 2007-12-15 05:19:41.462783867 +0100 --- linux-2.4.35.4.orig/include/net/sock.h
+++ linux-2.4.35.4/include/net/sock.h 2007-12-15 05:19:53.815487806 +0100 +++ linux-2.4.35.4/include/net/sock.h
@@ -488,7 +488,13 @@ @@ -488,7 +488,13 @@ struct tcp_opt {
} bictcp; } bictcp;
}; };
@ -18,7 +18,7 @@ Index: linux-2.4.35.4/include/net/sock.h
/* /*
* This structure really needs to be cleaned up. * This structure really needs to be cleaned up.
* Most of it is for TCP, and not used by any of * Most of it is for TCP, and not used by any of
@@ -655,6 +661,9 @@ @@ -655,6 +661,9 @@ struct sock {
#if defined(CONFIG_SPX) || defined (CONFIG_SPX_MODULE) #if defined(CONFIG_SPX) || defined (CONFIG_SPX_MODULE)
struct spx_opt af_spx; struct spx_opt af_spx;
#endif /* CONFIG_SPX */ #endif /* CONFIG_SPX */
@ -30,9 +30,9 @@ Index: linux-2.4.35.4/include/net/sock.h
Index: linux-2.4.35.4/net/Config.in Index: linux-2.4.35.4/net/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/Config.in 2007-12-15 05:19:41.470784323 +0100 --- linux-2.4.35.4.orig/net/Config.in
+++ linux-2.4.35.4/net/Config.in 2007-12-15 05:19:53.819488035 +0100 +++ linux-2.4.35.4/net/Config.in
@@ -104,4 +104,6 @@ @@ -104,4 +104,6 @@ comment 'Network testing'
dep_tristate 'Packet Generator (USE WITH CAUTION)' CONFIG_NET_PKTGEN $CONFIG_PROC_FS dep_tristate 'Packet Generator (USE WITH CAUTION)' CONFIG_NET_PKTGEN $CONFIG_PROC_FS
endmenu endmenu
@ -41,9 +41,9 @@ Index: linux-2.4.35.4/net/Config.in
endmenu endmenu
Index: linux-2.4.35.4/net/ipv4/udp.c Index: linux-2.4.35.4/net/ipv4/udp.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/udp.c 2007-12-15 05:19:41.482785007 +0100 --- linux-2.4.35.4.orig/net/ipv4/udp.c
+++ linux-2.4.35.4/net/ipv4/udp.c 2007-12-15 05:19:53.823488264 +0100 +++ linux-2.4.35.4/net/ipv4/udp.c
@@ -860,6 +860,9 @@ @@ -860,6 +860,9 @@ static void udp_close(struct sock *sk, l
static int udp_queue_rcv_skb(struct sock * sk, struct sk_buff *skb) static int udp_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)
{ {
@ -53,7 +53,7 @@ Index: linux-2.4.35.4/net/ipv4/udp.c
/* /*
* Charge it to the socket, dropping if the queue is full. * Charge it to the socket, dropping if the queue is full.
*/ */
@@ -877,6 +880,40 @@ @@ -877,6 +880,40 @@ static int udp_queue_rcv_skb(struct sock
} }
#endif #endif
@ -94,7 +94,7 @@ Index: linux-2.4.35.4/net/ipv4/udp.c
if (sock_queue_rcv_skb(sk,skb)<0) { if (sock_queue_rcv_skb(sk,skb)<0) {
UDP_INC_STATS_BH(UdpInErrors); UDP_INC_STATS_BH(UdpInErrors);
IP_INC_STATS_BH(IpInDiscards); IP_INC_STATS_BH(IpInDiscards);
@@ -1100,13 +1137,49 @@ @@ -1100,13 +1137,49 @@ out:
return len; return len;
} }

98
target/linux/generic-2.4/patches/110-netdev_random_core.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/Documentation/Configure.help Index: linux-2.4.35.4/Documentation/Configure.help
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:19:53.139449282 +0100 --- linux-2.4.35.4.orig/Documentation/Configure.help
+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:19:54.063501941 +0100 +++ linux-2.4.35.4/Documentation/Configure.help
@@ -10675,6 +10675,20 @@ @@ -10675,6 +10675,20 @@ CONFIG_TUN
If you don't know what to use this for, you don't need it. If you don't know what to use this for, you don't need it.
@ -25,9 +25,9 @@ Index: linux-2.4.35.4/Documentation/Configure.help
If you say Y here (and have said Y to "Kernel/User network link If you say Y here (and have said Y to "Kernel/User network link
Index: linux-2.4.35.4/drivers/net/Config.in Index: linux-2.4.35.4/drivers/net/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/net/Config.in 2007-12-15 05:19:51.931380439 +0100 --- linux-2.4.35.4.orig/drivers/net/Config.in
+++ linux-2.4.35.4/drivers/net/Config.in 2007-12-15 05:19:54.067502171 +0100 +++ linux-2.4.35.4/drivers/net/Config.in
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@ tristate 'Dummy net driver support' CONF
tristate 'Bonding driver support' CONFIG_BONDING tristate 'Bonding driver support' CONFIG_BONDING
tristate 'EQL (serial line load balancing) support' CONFIG_EQUALIZER tristate 'EQL (serial line load balancing) support' CONFIG_EQUALIZER
tristate 'Universal TUN/TAP device driver support' CONFIG_TUN tristate 'Universal TUN/TAP device driver support' CONFIG_TUN
@ -37,9 +37,9 @@ Index: linux-2.4.35.4/drivers/net/Config.in
fi fi
Index: linux-2.4.35.4/include/asm-alpha/signal.h Index: linux-2.4.35.4/include/asm-alpha/signal.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/asm-alpha/signal.h 2007-12-15 05:19:41.318775660 +0100 --- linux-2.4.35.4.orig/include/asm-alpha/signal.h
+++ linux-2.4.35.4/include/asm-alpha/signal.h 2007-12-15 05:19:54.067502171 +0100 +++ linux-2.4.35.4/include/asm-alpha/signal.h
@@ -121,8 +121,15 @@ @@ -121,8 +121,15 @@ typedef unsigned long sigset_t;
#define SA_PROBE SA_ONESHOT #define SA_PROBE SA_ONESHOT
#define SA_SAMPLE_RANDOM SA_RESTART #define SA_SAMPLE_RANDOM SA_RESTART
#define SA_SHIRQ 0x40000000 #define SA_SHIRQ 0x40000000
@ -57,9 +57,9 @@ Index: linux-2.4.35.4/include/asm-alpha/signal.h
#define SIG_SETMASK 3 /* for setting the signal mask */ #define SIG_SETMASK 3 /* for setting the signal mask */
Index: linux-2.4.35.4/include/asm-arm/signal.h Index: linux-2.4.35.4/include/asm-arm/signal.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/asm-arm/signal.h 2007-12-15 05:19:41.326776118 +0100 --- linux-2.4.35.4.orig/include/asm-arm/signal.h
+++ linux-2.4.35.4/include/asm-arm/signal.h 2007-12-15 05:19:54.067502171 +0100 +++ linux-2.4.35.4/include/asm-arm/signal.h
@@ -125,8 +125,15 @@ @@ -125,8 +125,15 @@ typedef unsigned long sigset_t;
#define SA_PROBE 0x80000000 #define SA_PROBE 0x80000000
#define SA_SAMPLE_RANDOM 0x10000000 #define SA_SAMPLE_RANDOM 0x10000000
#define SA_SHIRQ 0x04000000 #define SA_SHIRQ 0x04000000
@ -77,9 +77,9 @@ Index: linux-2.4.35.4/include/asm-arm/signal.h
#define SIG_SETMASK 2 /* for setting the signal mask */ #define SIG_SETMASK 2 /* for setting the signal mask */
Index: linux-2.4.35.4/include/asm-cris/signal.h Index: linux-2.4.35.4/include/asm-cris/signal.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/asm-cris/signal.h 2007-12-15 05:19:41.334776573 +0100 --- linux-2.4.35.4.orig/include/asm-cris/signal.h
+++ linux-2.4.35.4/include/asm-cris/signal.h 2007-12-15 05:19:54.071502397 +0100 +++ linux-2.4.35.4/include/asm-cris/signal.h
@@ -120,8 +120,15 @@ @@ -120,8 +120,15 @@ typedef unsigned long sigset_t;
#define SA_PROBE SA_ONESHOT #define SA_PROBE SA_ONESHOT
#define SA_SAMPLE_RANDOM SA_RESTART #define SA_SAMPLE_RANDOM SA_RESTART
#define SA_SHIRQ 0x04000000 #define SA_SHIRQ 0x04000000
@ -97,9 +97,9 @@ Index: linux-2.4.35.4/include/asm-cris/signal.h
#define SIG_SETMASK 2 /* for setting the signal mask */ #define SIG_SETMASK 2 /* for setting the signal mask */
Index: linux-2.4.35.4/include/asm-i386/signal.h Index: linux-2.4.35.4/include/asm-i386/signal.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/asm-i386/signal.h 2007-12-15 05:19:41.338776800 +0100 --- linux-2.4.35.4.orig/include/asm-i386/signal.h
+++ linux-2.4.35.4/include/asm-i386/signal.h 2007-12-15 05:19:54.071502397 +0100 +++ linux-2.4.35.4/include/asm-i386/signal.h
@@ -119,8 +119,15 @@ @@ -119,8 +119,15 @@ typedef unsigned long sigset_t;
#define SA_PROBE SA_ONESHOT #define SA_PROBE SA_ONESHOT
#define SA_SAMPLE_RANDOM SA_RESTART #define SA_SAMPLE_RANDOM SA_RESTART
#define SA_SHIRQ 0x04000000 #define SA_SHIRQ 0x04000000
@ -117,8 +117,8 @@ Index: linux-2.4.35.4/include/asm-i386/signal.h
#define SIG_SETMASK 2 /* for setting the signal mask */ #define SIG_SETMASK 2 /* for setting the signal mask */
Index: linux-2.4.35.4/include/asm-ia64/signal.h Index: linux-2.4.35.4/include/asm-ia64/signal.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/asm-ia64/signal.h 2007-12-15 05:19:41.350777484 +0100 --- linux-2.4.35.4.orig/include/asm-ia64/signal.h
+++ linux-2.4.35.4/include/asm-ia64/signal.h 2007-12-15 05:19:54.071502397 +0100 +++ linux-2.4.35.4/include/asm-ia64/signal.h
@@ -117,6 +117,12 @@ @@ -117,6 +117,12 @@
#define SA_SHIRQ 0x04000000 #define SA_SHIRQ 0x04000000
#define SA_PERCPU_IRQ 0x02000000 #define SA_PERCPU_IRQ 0x02000000
@ -134,9 +134,9 @@ Index: linux-2.4.35.4/include/asm-ia64/signal.h
#define SIG_BLOCK 0 /* for blocking signals */ #define SIG_BLOCK 0 /* for blocking signals */
Index: linux-2.4.35.4/include/asm-m68k/signal.h Index: linux-2.4.35.4/include/asm-m68k/signal.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/asm-m68k/signal.h 2007-12-15 05:19:41.358777939 +0100 --- linux-2.4.35.4.orig/include/asm-m68k/signal.h
+++ linux-2.4.35.4/include/asm-m68k/signal.h 2007-12-15 05:19:54.071502397 +0100 +++ linux-2.4.35.4/include/asm-m68k/signal.h
@@ -116,8 +116,15 @@ @@ -116,8 +116,15 @@ typedef unsigned long sigset_t;
#define SA_PROBE SA_ONESHOT #define SA_PROBE SA_ONESHOT
#define SA_SAMPLE_RANDOM SA_RESTART #define SA_SAMPLE_RANDOM SA_RESTART
#define SA_SHIRQ 0x04000000 #define SA_SHIRQ 0x04000000
@ -154,9 +154,9 @@ Index: linux-2.4.35.4/include/asm-m68k/signal.h
#define SIG_SETMASK 2 /* for setting the signal mask */ #define SIG_SETMASK 2 /* for setting the signal mask */
Index: linux-2.4.35.4/include/asm-mips/signal.h Index: linux-2.4.35.4/include/asm-mips/signal.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/asm-mips/signal.h 2007-12-15 05:19:41.366778397 +0100 --- linux-2.4.35.4.orig/include/asm-mips/signal.h
+++ linux-2.4.35.4/include/asm-mips/signal.h 2007-12-15 05:19:54.075502626 +0100 +++ linux-2.4.35.4/include/asm-mips/signal.h
@@ -111,6 +111,12 @@ @@ -111,6 +111,12 @@ typedef unsigned long old_sigset_t; /*
#define SA_SAMPLE_RANDOM SA_RESTART #define SA_SAMPLE_RANDOM SA_RESTART
#define SA_SHIRQ 0x02000000 #define SA_SHIRQ 0x02000000
@ -171,9 +171,9 @@ Index: linux-2.4.35.4/include/asm-mips/signal.h
#define SIG_BLOCK 1 /* for blocking signals */ #define SIG_BLOCK 1 /* for blocking signals */
Index: linux-2.4.35.4/include/asm-mips64/signal.h Index: linux-2.4.35.4/include/asm-mips64/signal.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/asm-mips64/signal.h 2007-12-15 05:19:41.374778853 +0100 --- linux-2.4.35.4.orig/include/asm-mips64/signal.h
+++ linux-2.4.35.4/include/asm-mips64/signal.h 2007-12-15 05:19:54.075502626 +0100 +++ linux-2.4.35.4/include/asm-mips64/signal.h
@@ -119,6 +119,12 @@ @@ -119,6 +119,12 @@ typedef unsigned int old_sigset_t32;
#define SA_SAMPLE_RANDOM SA_RESTART #define SA_SAMPLE_RANDOM SA_RESTART
#define SA_SHIRQ 0x02000000 #define SA_SHIRQ 0x02000000
@ -188,8 +188,8 @@ Index: linux-2.4.35.4/include/asm-mips64/signal.h
#define SIG_BLOCK 1 /* for blocking signals */ #define SIG_BLOCK 1 /* for blocking signals */
Index: linux-2.4.35.4/include/asm-parisc/signal.h Index: linux-2.4.35.4/include/asm-parisc/signal.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/asm-parisc/signal.h 2007-12-15 05:19:41.382779308 +0100 --- linux-2.4.35.4.orig/include/asm-parisc/signal.h
+++ linux-2.4.35.4/include/asm-parisc/signal.h 2007-12-15 05:19:54.075502626 +0100 +++ linux-2.4.35.4/include/asm-parisc/signal.h
@@ -100,6 +100,12 @@ @@ -100,6 +100,12 @@
#define SA_SAMPLE_RANDOM SA_RESTART #define SA_SAMPLE_RANDOM SA_RESTART
#define SA_SHIRQ 0x04000000 #define SA_SHIRQ 0x04000000
@ -205,9 +205,9 @@ Index: linux-2.4.35.4/include/asm-parisc/signal.h
#define SIG_BLOCK 0 /* for blocking signals */ #define SIG_BLOCK 0 /* for blocking signals */
Index: linux-2.4.35.4/include/asm-ppc/signal.h Index: linux-2.4.35.4/include/asm-ppc/signal.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/asm-ppc/signal.h 2007-12-15 05:19:41.390779764 +0100 --- linux-2.4.35.4.orig/include/asm-ppc/signal.h
+++ linux-2.4.35.4/include/asm-ppc/signal.h 2007-12-15 05:19:54.075502626 +0100 +++ linux-2.4.35.4/include/asm-ppc/signal.h
@@ -111,6 +111,13 @@ @@ -111,6 +111,13 @@ typedef struct {
#define SA_PROBE SA_ONESHOT #define SA_PROBE SA_ONESHOT
#define SA_SAMPLE_RANDOM SA_RESTART #define SA_SAMPLE_RANDOM SA_RESTART
#define SA_SHIRQ 0x04000000 #define SA_SHIRQ 0x04000000
@ -223,9 +223,9 @@ Index: linux-2.4.35.4/include/asm-ppc/signal.h
#define SIG_BLOCK 0 /* for blocking signals */ #define SIG_BLOCK 0 /* for blocking signals */
Index: linux-2.4.35.4/include/asm-s390/signal.h Index: linux-2.4.35.4/include/asm-s390/signal.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/asm-s390/signal.h 2007-12-15 05:19:41.398780219 +0100 --- linux-2.4.35.4.orig/include/asm-s390/signal.h
+++ linux-2.4.35.4/include/asm-s390/signal.h 2007-12-15 05:19:54.075502626 +0100 +++ linux-2.4.35.4/include/asm-s390/signal.h
@@ -129,8 +129,15 @@ @@ -129,8 +129,15 @@ typedef unsigned long sigset_t;
#define SA_SHIRQ 0x04000000 #define SA_SHIRQ 0x04000000
#define SA_DOPATHGROUP 0x00100000 #define SA_DOPATHGROUP 0x00100000
#define SA_FORCE 0x00200000 #define SA_FORCE 0x00200000
@ -243,9 +243,9 @@ Index: linux-2.4.35.4/include/asm-s390/signal.h
#define SIG_SETMASK 2 /* for setting the signal mask */ #define SIG_SETMASK 2 /* for setting the signal mask */
Index: linux-2.4.35.4/include/asm-s390x/signal.h Index: linux-2.4.35.4/include/asm-s390x/signal.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/asm-s390x/signal.h 2007-12-15 05:19:41.406780677 +0100 --- linux-2.4.35.4.orig/include/asm-s390x/signal.h
+++ linux-2.4.35.4/include/asm-s390x/signal.h 2007-12-15 05:19:54.079502852 +0100 +++ linux-2.4.35.4/include/asm-s390x/signal.h
@@ -129,8 +129,15 @@ @@ -129,8 +129,15 @@ typedef unsigned long sigset_t;
#define SA_SHIRQ 0x04000000 #define SA_SHIRQ 0x04000000
#define SA_DOPATHGROUP 0x00100000 #define SA_DOPATHGROUP 0x00100000
#define SA_FORCE 0x00200000 #define SA_FORCE 0x00200000
@ -263,9 +263,9 @@ Index: linux-2.4.35.4/include/asm-s390x/signal.h
#define SIG_SETMASK 2 /* for setting the signal mask */ #define SIG_SETMASK 2 /* for setting the signal mask */
Index: linux-2.4.35.4/include/asm-sh/signal.h Index: linux-2.4.35.4/include/asm-sh/signal.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/asm-sh/signal.h 2007-12-15 05:19:41.414781133 +0100 --- linux-2.4.35.4.orig/include/asm-sh/signal.h
+++ linux-2.4.35.4/include/asm-sh/signal.h 2007-12-15 05:19:54.079502852 +0100 +++ linux-2.4.35.4/include/asm-sh/signal.h
@@ -107,8 +107,15 @@ @@ -107,8 +107,15 @@ typedef struct {
#define SA_PROBE SA_ONESHOT #define SA_PROBE SA_ONESHOT
#define SA_SAMPLE_RANDOM SA_RESTART #define SA_SAMPLE_RANDOM SA_RESTART
#define SA_SHIRQ 0x04000000 #define SA_SHIRQ 0x04000000
@ -283,9 +283,9 @@ Index: linux-2.4.35.4/include/asm-sh/signal.h
#define SIG_SETMASK 2 /* for setting the signal mask */ #define SIG_SETMASK 2 /* for setting the signal mask */
Index: linux-2.4.35.4/include/asm-sparc/signal.h Index: linux-2.4.35.4/include/asm-sparc/signal.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/asm-sparc/signal.h 2007-12-15 05:19:41.422781588 +0100 --- linux-2.4.35.4.orig/include/asm-sparc/signal.h
+++ linux-2.4.35.4/include/asm-sparc/signal.h 2007-12-15 05:19:54.079502852 +0100 +++ linux-2.4.35.4/include/asm-sparc/signal.h
@@ -176,8 +176,15 @@ @@ -176,8 +176,15 @@ struct sigstack {
#define SA_PROBE SA_ONESHOT #define SA_PROBE SA_ONESHOT
#define SA_SAMPLE_RANDOM SA_RESTART #define SA_SAMPLE_RANDOM SA_RESTART
#define SA_STATIC_ALLOC 0x80 #define SA_STATIC_ALLOC 0x80
@ -303,9 +303,9 @@ Index: linux-2.4.35.4/include/asm-sparc/signal.h
typedef void (*__sighandler_t)(int, int, struct sigcontext *, char *); typedef void (*__sighandler_t)(int, int, struct sigcontext *, char *);
Index: linux-2.4.35.4/include/asm-sparc64/signal.h Index: linux-2.4.35.4/include/asm-sparc64/signal.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/asm-sparc64/signal.h 2007-12-15 05:19:41.430782043 +0100 --- linux-2.4.35.4.orig/include/asm-sparc64/signal.h
+++ linux-2.4.35.4/include/asm-sparc64/signal.h 2007-12-15 05:19:54.079502852 +0100 +++ linux-2.4.35.4/include/asm-sparc64/signal.h
@@ -192,8 +192,15 @@ @@ -192,8 +192,15 @@ struct sigstack {
#define SA_PROBE SA_ONESHOT #define SA_PROBE SA_ONESHOT
#define SA_SAMPLE_RANDOM SA_RESTART #define SA_SAMPLE_RANDOM SA_RESTART
#define SA_STATIC_ALLOC 0x80 #define SA_STATIC_ALLOC 0x80

6
target/linux/generic-2.4/patches/112-bridging_performance.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/net/core/dev.c Index: linux-2.4.35.4/net/core/dev.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/core/dev.c 2007-12-15 05:19:51.651364482 +0100 --- linux-2.4.35.4.orig/net/core/dev.c
+++ linux-2.4.35.4/net/core/dev.c 2007-12-15 05:19:54.483525877 +0100 +++ linux-2.4.35.4/net/core/dev.c
@@ -1289,6 +1289,19 @@ @@ -1289,6 +1289,19 @@ int netif_rx(struct sk_buff *skb)
local_irq_save(flags); local_irq_save(flags);
netdev_rx_stat[this_cpu].total++; netdev_rx_stat[this_cpu].total++;

46
target/linux/generic-2.4/patches/113-even_more_gcc4_stuff.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/mips/kernel/mips_ksyms.c 2007-12-15 05:19:41.186768139 +0100 --- linux-2.4.35.4.orig/arch/mips/kernel/mips_ksyms.c
+++ linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c 2007-12-15 05:19:54.695537960 +0100 +++ linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c
@@ -30,6 +30,10 @@ @@ -30,6 +30,10 @@
#include <asm/floppy.h> #include <asm/floppy.h>
#endif #endif
@ -13,7 +13,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c
extern void *__bzero(void *__s, size_t __count); extern void *__bzero(void *__s, size_t __count);
extern long __strncpy_from_user_nocheck_asm(char *__to, extern long __strncpy_from_user_nocheck_asm(char *__to,
const char *__from, long __len); const char *__from, long __len);
@@ -78,6 +82,13 @@ @@ -78,6 +82,13 @@ EXPORT_SYMBOL_NOVERS(__strnlen_user_noch
EXPORT_SYMBOL_NOVERS(__strnlen_user_asm); EXPORT_SYMBOL_NOVERS(__strnlen_user_asm);
@ -29,9 +29,9 @@ Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c
Index: linux-2.4.35.4/arch/mips/lib/Makefile Index: linux-2.4.35.4/arch/mips/lib/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/mips/lib/Makefile 2007-12-15 05:19:41.194768595 +0100 --- linux-2.4.35.4.orig/arch/mips/lib/Makefile
+++ linux-2.4.35.4/arch/mips/lib/Makefile 2007-12-15 05:19:54.699538186 +0100 +++ linux-2.4.35.4/arch/mips/lib/Makefile
@@ -9,7 +9,8 @@ @@ -9,7 +9,8 @@ L_TARGET = lib.a
obj-y += csum_partial.o csum_partial_copy.o \ obj-y += csum_partial.o csum_partial_copy.o \
promlib.o rtc-std.o rtc-no.o memcpy.o \ promlib.o rtc-std.o rtc-no.o memcpy.o \
memset.o watch.o strlen_user.o \ memset.o watch.o strlen_user.o \
@ -43,8 +43,8 @@ Index: linux-2.4.35.4/arch/mips/lib/Makefile
Index: linux-2.4.35.4/arch/mips/lib/ashldi3.c Index: linux-2.4.35.4/arch/mips/lib/ashldi3.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/arch/mips/lib/ashldi3.c 2007-12-15 05:19:54.707538644 +0100 +++ linux-2.4.35.4/arch/mips/lib/ashldi3.c
@@ -0,0 +1,62 @@ @@ -0,0 +1,62 @@
+/* ashrdi3.c extracted from gcc-2.95.2/libgcc2.c which is: */ +/* ashrdi3.c extracted from gcc-2.95.2/libgcc2.c which is: */
+/* Copyright (C) 1989, 92-98, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1989, 92-98, 1999 Free Software Foundation, Inc.
@ -110,8 +110,8 @@ Index: linux-2.4.35.4/arch/mips/lib/ashldi3.c
+} +}
Index: linux-2.4.35.4/arch/mips/lib/ashrdi3.c Index: linux-2.4.35.4/arch/mips/lib/ashrdi3.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/arch/mips/lib/ashrdi3.c 2007-12-15 05:19:54.711538870 +0100 +++ linux-2.4.35.4/arch/mips/lib/ashrdi3.c
@@ -0,0 +1,63 @@ @@ -0,0 +1,63 @@
+/* ashrdi3.c extracted from gcc-2.7.2/libgcc2.c which is: */ +/* ashrdi3.c extracted from gcc-2.7.2/libgcc2.c which is: */
+/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
@ -178,8 +178,8 @@ Index: linux-2.4.35.4/arch/mips/lib/ashrdi3.c
+} +}
Index: linux-2.4.35.4/arch/mips/lib/lshrdi3.c Index: linux-2.4.35.4/arch/mips/lib/lshrdi3.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/arch/mips/lib/lshrdi3.c 2007-12-15 05:19:54.715539100 +0100 +++ linux-2.4.35.4/arch/mips/lib/lshrdi3.c
@@ -0,0 +1,62 @@ @@ -0,0 +1,62 @@
+/* lshrdi3.c extracted from gcc-2.7.2/libgcc2.c which is: */ +/* lshrdi3.c extracted from gcc-2.7.2/libgcc2.c which is: */
+/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
@ -245,8 +245,8 @@ Index: linux-2.4.35.4/arch/mips/lib/lshrdi3.c
+} +}
Index: linux-2.4.35.4/arch/mips/lib/muldi3.c Index: linux-2.4.35.4/arch/mips/lib/muldi3.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/arch/mips/lib/muldi3.c 2007-12-15 05:19:54.715539100 +0100 +++ linux-2.4.35.4/arch/mips/lib/muldi3.c
@@ -0,0 +1,63 @@ @@ -0,0 +1,63 @@
+/* muldi3.c extracted from gcc-2.7.2.3/libgcc2.c and +/* muldi3.c extracted from gcc-2.7.2.3/libgcc2.c and
+ gcc-2.7.2.3/longlong.h which is: */ + gcc-2.7.2.3/longlong.h which is: */
@ -313,8 +313,8 @@ Index: linux-2.4.35.4/arch/mips/lib/muldi3.c
+} +}
Index: linux-2.4.35.4/fs/cifs/cifsfs.c Index: linux-2.4.35.4/fs/cifs/cifsfs.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/cifs/cifsfs.c 2007-12-15 05:19:52.279400271 +0100 --- linux-2.4.35.4.orig/fs/cifs/cifsfs.c
+++ linux-2.4.35.4/fs/cifs/cifsfs.c 2007-12-15 05:19:54.715539100 +0100 +++ linux-2.4.35.4/fs/cifs/cifsfs.c
@@ -50,8 +50,6 @@ @@ -50,8 +50,6 @@
static struct quotactl_ops cifs_quotactl_ops; static struct quotactl_ops cifs_quotactl_ops;
#endif #endif
@ -326,9 +326,9 @@ Index: linux-2.4.35.4/fs/cifs/cifsfs.c
int traceSMB = 0; int traceSMB = 0;
Index: linux-2.4.35.4/include/asm-mips/uaccess.h Index: linux-2.4.35.4/include/asm-mips/uaccess.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/asm-mips/uaccess.h 2007-12-15 05:19:41.238771101 +0100 --- linux-2.4.35.4.orig/include/asm-mips/uaccess.h
+++ linux-2.4.35.4/include/asm-mips/uaccess.h 2007-12-15 05:19:54.715539100 +0100 +++ linux-2.4.35.4/include/asm-mips/uaccess.h
@@ -149,7 +149,7 @@ @@ -149,7 +149,7 @@ static inline int verify_area(int type,
* Returns zero on success, or -EFAULT on error. * Returns zero on success, or -EFAULT on error.
*/ */
#define put_user(x,ptr) \ #define put_user(x,ptr) \
@ -337,7 +337,7 @@ Index: linux-2.4.35.4/include/asm-mips/uaccess.h
/* /*
* get_user: - Get a simple variable from user space. * get_user: - Get a simple variable from user space.
@@ -169,7 +169,7 @@ @@ -169,7 +169,7 @@ static inline int verify_area(int type,
* On error, the variable @x is set to zero. * On error, the variable @x is set to zero.
*/ */
#define get_user(x,ptr) \ #define get_user(x,ptr) \
@ -346,7 +346,7 @@ Index: linux-2.4.35.4/include/asm-mips/uaccess.h
/* /*
* __put_user: - Write a simple value into user space, with less checking. * __put_user: - Write a simple value into user space, with less checking.
@@ -191,7 +191,7 @@ @@ -191,7 +191,7 @@ static inline int verify_area(int type,
* Returns zero on success, or -EFAULT on error. * Returns zero on success, or -EFAULT on error.
*/ */
#define __put_user(x,ptr) \ #define __put_user(x,ptr) \
@ -355,7 +355,7 @@ Index: linux-2.4.35.4/include/asm-mips/uaccess.h
/* /*
* __get_user: - Get a simple variable from user space, with less checking. * __get_user: - Get a simple variable from user space, with less checking.
@@ -214,7 +214,7 @@ @@ -214,7 +214,7 @@ static inline int verify_area(int type,
* On error, the variable @x is set to zero. * On error, the variable @x is set to zero.
*/ */
#define __get_user(x,ptr) \ #define __get_user(x,ptr) \
@ -364,7 +364,7 @@ Index: linux-2.4.35.4/include/asm-mips/uaccess.h
struct __large_struct { unsigned long buf[100]; }; struct __large_struct { unsigned long buf[100]; };
#define __m(x) (*(struct __large_struct *)(x)) #define __m(x) (*(struct __large_struct *)(x))
@@ -232,7 +232,7 @@ @@ -232,7 +232,7 @@ struct __large_struct { unsigned long bu
#define __get_user_nocheck(x,ptr,size) \ #define __get_user_nocheck(x,ptr,size) \
({ \ ({ \
long __gu_err = 0; \ long __gu_err = 0; \

20
target/linux/generic-2.4/patches/114-sched_use_tsc.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/arch/mips/kernel/time.c Index: linux-2.4.35.4/arch/mips/kernel/time.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/mips/kernel/time.c 2007-12-15 05:19:41.138765402 +0100 --- linux-2.4.35.4.orig/arch/mips/kernel/time.c
+++ linux-2.4.35.4/arch/mips/kernel/time.c 2007-12-15 05:19:55.011555967 +0100 +++ linux-2.4.35.4/arch/mips/kernel/time.c
@@ -151,6 +151,27 @@ @@ -151,6 +151,27 @@ void (*mips_timer_ack)(void);
unsigned int (*mips_hpt_read)(void); unsigned int (*mips_hpt_read)(void);
void (*mips_hpt_init)(unsigned int); void (*mips_hpt_init)(unsigned int);
@ -30,7 +30,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/time.c
/* /*
* timeofday services, for syscalls. * timeofday services, for syscalls.
@@ -761,3 +782,5 @@ @@ -761,3 +782,5 @@ EXPORT_SYMBOL(rtc_lock);
EXPORT_SYMBOL(to_tm); EXPORT_SYMBOL(to_tm);
EXPORT_SYMBOL(rtc_set_time); EXPORT_SYMBOL(rtc_set_time);
EXPORT_SYMBOL(rtc_get_time); EXPORT_SYMBOL(rtc_get_time);
@ -38,9 +38,9 @@ Index: linux-2.4.35.4/arch/mips/kernel/time.c
+EXPORT_SYMBOL(get_tscll); +EXPORT_SYMBOL(get_tscll);
Index: linux-2.4.35.4/include/asm-mips/timex.h Index: linux-2.4.35.4/include/asm-mips/timex.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/asm-mips/timex.h 2007-12-15 05:19:41.146765860 +0100 --- linux-2.4.35.4.orig/include/asm-mips/timex.h
+++ linux-2.4.35.4/include/asm-mips/timex.h 2007-12-15 05:19:55.015556197 +0100 +++ linux-2.4.35.4/include/asm-mips/timex.h
@@ -31,6 +31,19 @@ @@ -31,6 +31,19 @@ static inline cycles_t get_cycles (void)
return read_c0_count(); return read_c0_count();
} }
@ -62,8 +62,8 @@ Index: linux-2.4.35.4/include/asm-mips/timex.h
Index: linux-2.4.35.4/include/net/pkt_sched.h Index: linux-2.4.35.4/include/net/pkt_sched.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/net/pkt_sched.h 2007-12-15 05:19:41.154766315 +0100 --- linux-2.4.35.4.orig/include/net/pkt_sched.h
+++ linux-2.4.35.4/include/net/pkt_sched.h 2007-12-15 05:19:55.023556652 +0100 +++ linux-2.4.35.4/include/net/pkt_sched.h
@@ -5,7 +5,11 @@ @@ -5,7 +5,11 @@
#define PSCHED_JIFFIES 2 #define PSCHED_JIFFIES 2
#define PSCHED_CPU 3 #define PSCHED_CPU 3
@ -76,7 +76,7 @@ Index: linux-2.4.35.4/include/net/pkt_sched.h
#include <linux/config.h> #include <linux/config.h>
#include <linux/types.h> #include <linux/types.h>
@@ -261,7 +265,7 @@ @@ -261,7 +265,7 @@ extern int psched_clock_scale;
#define PSCHED_US2JIFFIE(delay) (((delay)+psched_clock_per_hz-1)/psched_clock_per_hz) #define PSCHED_US2JIFFIE(delay) (((delay)+psched_clock_per_hz-1)/psched_clock_per_hz)
#define PSCHED_JIFFIE2US(delay) ((delay)*psched_clock_per_hz) #define PSCHED_JIFFIE2US(delay) ((delay)*psched_clock_per_hz)

6
target/linux/generic-2.4/patches/115-branch_emul_fix.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/arch/mips/kernel/branch.c Index: linux-2.4.35.4/arch/mips/kernel/branch.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/mips/kernel/branch.c 2007-12-15 05:19:41.102763351 +0100 --- linux-2.4.35.4.orig/arch/mips/kernel/branch.c
+++ linux-2.4.35.4/arch/mips/kernel/branch.c 2007-12-15 05:19:55.259570100 +0100 +++ linux-2.4.35.4/arch/mips/kernel/branch.c
@@ -170,7 +170,7 @@ @@ -170,7 +170,7 @@ int __compute_return_epc(struct pt_regs
bit = (insn.i_format.rt >> 2); bit = (insn.i_format.rt >> 2);
bit += (bit != 0); bit += (bit != 0);
bit += 23; bit += 23;

4
target/linux/generic-2.4/patches/116-bridge_ioctls.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.4.35.4/include/linux/sockios.h Index: linux-2.4.35.4/include/linux/sockios.h
=================================================================== ===================================================================
--- linux-2.4.35.4/include/linux/sockios.h 2008-02-10 23:23:00.102763351 +0100 --- linux-2.4.35.4.orig/include/linux/sockios.h
+++ linux-2.4.35.4.new/include/linux/sockios.h 2008-02-10 23:23:01.259570100 +0100 +++ linux-2.4.35.4/include/linux/sockios.h
@@ -68,6 +68,11 @@ @@ -68,6 +68,11 @@
#define SIOCGIFBR 0x8940 /* Bridging support */ #define SIOCGIFBR 0x8940 /* Bridging support */

2308
target/linux/generic-2.4/patches/200-i4l.patch
View File

File diff suppressed because it is too large Load Diff

12
target/linux/generic-2.4/patches/201-hfc_usb_backport.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/drivers/Makefile Index: linux-2.4.35.4/drivers/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/Makefile 2007-12-15 05:19:39.306660996 +0100 --- linux-2.4.35.4.orig/drivers/Makefile
+++ linux-2.4.35.4/drivers/Makefile 2007-12-15 05:19:59.111789629 +0100 +++ linux-2.4.35.4/drivers/Makefile
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@ subdir-$(CONFIG_FUSION) += message/fusi
subdir-$(CONFIG_MD) += md subdir-$(CONFIG_MD) += md
subdir-$(CONFIG_IEEE1394) += ieee1394 subdir-$(CONFIG_IEEE1394) += ieee1394
subdir-$(CONFIG_PNP) += pnp subdir-$(CONFIG_PNP) += pnp
@ -13,8 +13,8 @@ Index: linux-2.4.35.4/drivers/Makefile
Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_usb.c 2007-12-15 05:19:55.575588111 +0100 --- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_usb.c
+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c 2007-12-15 05:19:59.115789855 +0100 +++ linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c
@@ -1,13 +1,11 @@ @@ -1,13 +1,11 @@
-/* $Id: hfc_usb.c,v 2.3 2001/07/06 21:30:11 werner Exp $ -/* $Id: hfc_usb.c,v 2.3 2001/07/06 21:30:11 werner Exp $
+/* +/*
@ -477,7 +477,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c
} }
} /* ctrl_start_transfer */ } /* ctrl_start_transfer */
@@ -293,897 +275,1418 @@ @@ -293,897 +275,1418 @@ ctrl_start_transfer(hfcusb_data * hfc)
/* queue a control transfer request */ /* queue a control transfer request */
/* return 0 on success. */ /* return 0 on success. */
/************************************/ /************************************/

10
target/linux/generic-2.4/patches/202-pl2303_backport.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/drivers/usb/serial/pl2303.c Index: linux-2.4.35.4/drivers/usb/serial/pl2303.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/usb/serial/pl2303.c 2007-12-15 05:19:39.266658716 +0100 --- linux-2.4.35.4.orig/drivers/usb/serial/pl2303.c
+++ linux-2.4.35.4/drivers/usb/serial/pl2303.c 2007-12-15 05:19:59.351803306 +0100 +++ linux-2.4.35.4/drivers/usb/serial/pl2303.c
@@ -78,6 +78,11 @@ @@ -78,6 +78,11 @@ static struct usb_device_id id_table []
{ USB_DEVICE(RADIOSHACK_VENDOR_ID, RADIOSHACK_PRODUCT_ID) }, { USB_DEVICE(RADIOSHACK_VENDOR_ID, RADIOSHACK_PRODUCT_ID) },
{ USB_DEVICE(DCU10_VENDOR_ID, DCU10_PRODUCT_ID) }, { USB_DEVICE(DCU10_VENDOR_ID, DCU10_PRODUCT_ID) },
{ USB_DEVICE(SITECOM_VENDOR_ID, SITECOM_PRODUCT_ID) }, { USB_DEVICE(SITECOM_VENDOR_ID, SITECOM_PRODUCT_ID) },
@ -16,8 +16,8 @@ Index: linux-2.4.35.4/drivers/usb/serial/pl2303.c
Index: linux-2.4.35.4/drivers/usb/serial/pl2303.h Index: linux-2.4.35.4/drivers/usb/serial/pl2303.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/usb/serial/pl2303.h 2007-12-15 05:19:39.278659401 +0100 --- linux-2.4.35.4.orig/drivers/usb/serial/pl2303.h
+++ linux-2.4.35.4/drivers/usb/serial/pl2303.h 2007-12-15 05:19:59.355803533 +0100 +++ linux-2.4.35.4/drivers/usb/serial/pl2303.h
@@ -41,3 +41,21 @@ @@ -41,3 +41,21 @@
#define SITECOM_VENDOR_ID 0x6189 #define SITECOM_VENDOR_ID 0x6189

8
target/linux/generic-2.4/patches/203-hfsplus_fix.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/fs/hfsplus/super.c Index: linux-2.4.35.4/fs/hfsplus/super.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/hfsplus/super.c 2007-12-15 05:19:39.238657121 +0100 --- linux-2.4.35.4.orig/fs/hfsplus/super.c
+++ linux-2.4.35.4/fs/hfsplus/super.c 2007-12-15 05:19:59.575816071 +0100 +++ linux-2.4.35.4/fs/hfsplus/super.c
@@ -240,8 +240,7 @@ @@ -240,8 +240,7 @@ int hfsplus_remount(struct super_block *
if (!(*flags & MS_RDONLY)) { if (!(*flags & MS_RDONLY)) {
struct hfsplus_vh *vhdr = HFSPLUS_SB(sb).s_vhdr; struct hfsplus_vh *vhdr = HFSPLUS_SB(sb).s_vhdr;
@ -12,7 +12,7 @@ Index: linux-2.4.35.4/fs/hfsplus/super.c
printk("HFS+-fs warning: Filesystem was not cleanly unmounted, " printk("HFS+-fs warning: Filesystem was not cleanly unmounted, "
"running fsck.hfsplus is recommended. leaving read-only.\n"); "running fsck.hfsplus is recommended. leaving read-only.\n");
sb->s_flags |= MS_RDONLY; sb->s_flags |= MS_RDONLY;
@@ -343,8 +342,7 @@ @@ -343,8 +342,7 @@ static int hfsplus_fill_super(struct sup
/* Set up operations so we can load metadata */ /* Set up operations so we can load metadata */
sb->s_op = &hfsplus_sops; sb->s_op = &hfsplus_sops;

56
target/linux/generic-2.4/patches/206-gcc_3.4_fixes.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.4.35.4/arch/mips/kernel/signal.c Index: linux-2.4.35.4/arch/mips/kernel/signal.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/mips/kernel/signal.c 2007-12-15 05:19:39.146651877 +0100 --- linux-2.4.35.4.orig/arch/mips/kernel/signal.c
+++ linux-2.4.35.4/arch/mips/kernel/signal.c 2007-12-15 05:19:59.787828152 +0100 +++ linux-2.4.35.4/arch/mips/kernel/signal.c
@@ -6,8 +6,10 @@ @@ -6,8 +6,10 @@
* Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 1991, 1992 Linus Torvalds
* Copyright (C) 1994 - 1999 Ralf Baechle * Copyright (C) 1994 - 1999 Ralf Baechle
@ -13,7 +13,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/signal.c
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/smp.h> #include <linux/smp.h>
@@ -76,7 +78,9 @@ @@ -76,7 +78,9 @@ int copy_siginfo_to_user(siginfo_t *to,
* Atomically swap in the new signal mask, and wait for a signal. * Atomically swap in the new signal mask, and wait for a signal.
*/ */
save_static_function(sys_sigsuspend); save_static_function(sys_sigsuspend);
@ -24,7 +24,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/signal.c
{ {
sigset_t *uset, saveset, newset; sigset_t *uset, saveset, newset;
@@ -102,7 +106,9 @@ @@ -102,7 +106,9 @@ static_unused int _sys_sigsuspend(struct
} }
save_static_function(sys_rt_sigsuspend); save_static_function(sys_rt_sigsuspend);
@ -37,8 +37,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/signal.c
size_t sigsetsize; size_t sigsetsize;
Index: linux-2.4.35.4/arch/mips/kernel/syscall.c Index: linux-2.4.35.4/arch/mips/kernel/syscall.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/mips/kernel/syscall.c 2007-12-15 05:19:39.154652335 +0100 --- linux-2.4.35.4.orig/arch/mips/kernel/syscall.c
+++ linux-2.4.35.4/arch/mips/kernel/syscall.c 2007-12-15 05:19:59.795828608 +0100 +++ linux-2.4.35.4/arch/mips/kernel/syscall.c
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
* *
* Copyright (C) 1995 - 2000 by Ralf Baechle * Copyright (C) 1995 - 2000 by Ralf Baechle
@ -47,7 +47,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/syscall.c
* *
* TODO: Implement the compatibility syscalls. * TODO: Implement the compatibility syscalls.
* Don't waste that much memory for empty entries in the syscall * Don't waste that much memory for empty entries in the syscall
@@ -158,7 +159,9 @@ @@ -158,7 +159,9 @@ sys_mmap2(unsigned long addr, unsigned l
} }
save_static_function(sys_fork); save_static_function(sys_fork);
@ -58,7 +58,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/syscall.c
{ {
int res; int res;
@@ -168,7 +171,9 @@ @@ -168,7 +171,9 @@ static_unused int _sys_fork(struct pt_re
save_static_function(sys_clone); save_static_function(sys_clone);
@ -71,9 +71,9 @@ Index: linux-2.4.35.4/arch/mips/kernel/syscall.c
unsigned long newsp; unsigned long newsp;
Index: linux-2.4.35.4/arch/mips/ld.script.in Index: linux-2.4.35.4/arch/mips/ld.script.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/mips/ld.script.in 2007-12-15 05:19:39.162652791 +0100 --- linux-2.4.35.4.orig/arch/mips/ld.script.in
+++ linux-2.4.35.4/arch/mips/ld.script.in 2007-12-15 05:19:59.799828834 +0100 +++ linux-2.4.35.4/arch/mips/ld.script.in
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@ SECTIONS
{ {
_ftext = . ; _ftext = . ;
*(.text) *(.text)
@ -83,8 +83,8 @@ Index: linux-2.4.35.4/arch/mips/ld.script.in
*(.rodata1) *(.rodata1)
Index: linux-2.4.35.4/arch/mips64/kernel/signal.c Index: linux-2.4.35.4/arch/mips64/kernel/signal.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/mips64/kernel/signal.c 2007-12-15 05:19:39.170653246 +0100 --- linux-2.4.35.4.orig/arch/mips64/kernel/signal.c
+++ linux-2.4.35.4/arch/mips64/kernel/signal.c 2007-12-15 05:19:59.803829063 +0100 +++ linux-2.4.35.4/arch/mips64/kernel/signal.c
@@ -6,8 +6,10 @@ @@ -6,8 +6,10 @@
* Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 1991, 1992 Linus Torvalds
* Copyright (C) 1994 - 2000 Ralf Baechle * Copyright (C) 1994 - 2000 Ralf Baechle
@ -96,7 +96,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/signal.c
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/smp.h> #include <linux/smp.h>
@@ -75,7 +77,9 @@ @@ -75,7 +77,9 @@ int copy_siginfo_to_user(siginfo_t *to,
* Atomically swap in the new signal mask, and wait for a signal. * Atomically swap in the new signal mask, and wait for a signal.
*/ */
save_static_function(sys_rt_sigsuspend); save_static_function(sys_rt_sigsuspend);
@ -109,8 +109,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/signal.c
size_t sigsetsize; size_t sigsetsize;
Index: linux-2.4.35.4/arch/mips64/kernel/signal32.c Index: linux-2.4.35.4/arch/mips64/kernel/signal32.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/mips64/kernel/signal32.c 2007-12-15 05:19:39.174653475 +0100 --- linux-2.4.35.4.orig/arch/mips64/kernel/signal32.c
+++ linux-2.4.35.4/arch/mips64/kernel/signal32.c 2007-12-15 05:19:59.807829292 +0100 +++ linux-2.4.35.4/arch/mips64/kernel/signal32.c
@@ -6,7 +6,9 @@ @@ -6,7 +6,9 @@
* Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 1991, 1992 Linus Torvalds
* Copyright (C) 1994 - 2000 Ralf Baechle * Copyright (C) 1994 - 2000 Ralf Baechle
@ -121,7 +121,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/signal32.c
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/smp.h> #include <linux/smp.h>
@@ -192,7 +194,9 @@ @@ -192,7 +194,9 @@ static inline int get_sigset(sigset_t *k
* Atomically swap in the new signal mask, and wait for a signal. * Atomically swap in the new signal mask, and wait for a signal.
*/ */
save_static_function(sys32_sigsuspend); save_static_function(sys32_sigsuspend);
@ -132,7 +132,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/signal32.c
{ {
sigset32_t *uset; sigset32_t *uset;
sigset_t newset, saveset; sigset_t newset, saveset;
@@ -219,7 +223,9 @@ @@ -219,7 +223,9 @@ static_unused int _sys32_sigsuspend(abi6
} }
save_static_function(sys32_rt_sigsuspend); save_static_function(sys32_rt_sigsuspend);
@ -145,8 +145,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/signal32.c
sigset_t newset, saveset; sigset_t newset, saveset;
Index: linux-2.4.35.4/arch/mips64/kernel/syscall.c Index: linux-2.4.35.4/arch/mips64/kernel/syscall.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/mips64/kernel/syscall.c 2007-12-15 05:19:39.186654157 +0100 --- linux-2.4.35.4.orig/arch/mips64/kernel/syscall.c
+++ linux-2.4.35.4/arch/mips64/kernel/syscall.c 2007-12-15 05:19:59.811829522 +0100 +++ linux-2.4.35.4/arch/mips64/kernel/syscall.c
@@ -6,7 +6,9 @@ @@ -6,7 +6,9 @@
* Copyright (C) 1995 - 2000, 2001 by Ralf Baechle * Copyright (C) 1995 - 2000, 2001 by Ralf Baechle
* Copyright (C) 1999, 2000 Silicon Graphics, Inc. * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
@ -157,7 +157,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/syscall.c
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/mm.h> #include <linux/mm.h>
@@ -151,7 +153,9 @@ @@ -151,7 +153,9 @@ out:
} }
save_static_function(sys_fork); save_static_function(sys_fork);
@ -168,7 +168,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/syscall.c
{ {
int res; int res;
@@ -160,7 +164,9 @@ @@ -160,7 +164,9 @@ static_unused int _sys_fork(abi64_no_reg
} }
save_static_function(sys_clone); save_static_function(sys_clone);
@ -181,8 +181,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/syscall.c
unsigned long newsp; unsigned long newsp;
Index: linux-2.4.35.4/include/asm-mips/ptrace.h Index: linux-2.4.35.4/include/asm-mips/ptrace.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/asm-mips/ptrace.h 2007-12-15 05:19:39.194654615 +0100 --- linux-2.4.35.4.orig/include/asm-mips/ptrace.h
+++ linux-2.4.35.4/include/asm-mips/ptrace.h 2007-12-15 05:19:59.815829748 +0100 +++ linux-2.4.35.4/include/asm-mips/ptrace.h
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
* for more details. * for more details.
* *
@ -191,7 +191,7 @@ Index: linux-2.4.35.4/include/asm-mips/ptrace.h
* *
* Machine dependent structs and defines to help the user use * Machine dependent structs and defines to help the user use
* the ptrace system call. * the ptrace system call.
@@ -64,12 +65,10 @@ @@ -64,12 +65,10 @@ __asm__ (
"sw\t$22,"__str(PT_R22)"($29)\n\t" \ "sw\t$22,"__str(PT_R22)"($29)\n\t" \
"sw\t$23,"__str(PT_R23)"($29)\n\t" \ "sw\t$23,"__str(PT_R23)"($29)\n\t" \
"sw\t$30,"__str(PT_R30)"($29)\n\t" \ "sw\t$30,"__str(PT_R30)"($29)\n\t" \
@ -207,8 +207,8 @@ Index: linux-2.4.35.4/include/asm-mips/ptrace.h
/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */ /* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
Index: linux-2.4.35.4/include/asm-mips64/ptrace.h Index: linux-2.4.35.4/include/asm-mips64/ptrace.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/asm-mips64/ptrace.h 2007-12-15 05:19:39.202655071 +0100 --- linux-2.4.35.4.orig/include/asm-mips64/ptrace.h
+++ linux-2.4.35.4/include/asm-mips64/ptrace.h 2007-12-15 05:19:59.815829748 +0100 +++ linux-2.4.35.4/include/asm-mips64/ptrace.h
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
* *
* Copyright (C) 1994, 95, 96, 97, 98, 99, 2000 by Ralf Baechle * Copyright (C) 1994, 95, 96, 97, 98, 99, 2000 by Ralf Baechle
@ -217,7 +217,7 @@ Index: linux-2.4.35.4/include/asm-mips64/ptrace.h
*/ */
#ifndef _ASM_PTRACE_H #ifndef _ASM_PTRACE_H
#define _ASM_PTRACE_H #define _ASM_PTRACE_H
@@ -61,12 +62,10 @@ @@ -61,12 +62,10 @@ __asm__ (
"sd\t$22,"__str(PT_R22)"($29)\n\t" \ "sd\t$22,"__str(PT_R22)"($29)\n\t" \
"sd\t$23,"__str(PT_R23)"($29)\n\t" \ "sd\t$23,"__str(PT_R23)"($29)\n\t" \
"sd\t$30,"__str(PT_R30)"($29)\n\t" \ "sd\t$30,"__str(PT_R30)"($29)\n\t" \

6
target/linux/generic-2.4/patches/208-usb2_fix.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/drivers/usb/host/ehci-q.c Index: linux-2.4.35.4/drivers/usb/host/ehci-q.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/usb/host/ehci-q.c 2007-12-15 05:19:39.114650056 +0100 --- linux-2.4.35.4.orig/drivers/usb/host/ehci-q.c
+++ linux-2.4.35.4/drivers/usb/host/ehci-q.c 2007-12-15 05:20:00.107846389 +0100 +++ linux-2.4.35.4/drivers/usb/host/ehci-q.c
@@ -782,6 +782,11 @@ @@ -782,6 +782,11 @@ static void qh_link_async (struct ehci_h
if (!(cmd & CMD_ASE)) { if (!(cmd & CMD_ASE)) {
/* in case a clear of CMD_ASE didn't take yet */ /* in case a clear of CMD_ASE didn't take yet */
(void) handshake (&ehci->regs->status, STS_ASS, 0, 150); (void) handshake (&ehci->regs->status, STS_ASS, 0, 150);

16
target/linux/generic-2.4/patches/209-build_fixes.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/Makefile Index: linux-2.4.35.4/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/Makefile 2007-12-15 05:19:51.427351715 +0100 --- linux-2.4.35.4.orig/Makefile
+++ linux-2.4.35.4/Makefile 2007-12-15 05:20:00.315858242 +0100 +++ linux-2.4.35.4/Makefile
@@ -362,7 +362,7 @@ @@ -362,7 +362,7 @@ include/linux/compile.h: $(CONFIGURATION
@rm -f .ver1 @rm -f .ver1
include/linux/version.h: ./Makefile include/linux/version.h: ./Makefile
@ -11,7 +11,7 @@ Index: linux-2.4.35.4/Makefile
(echo KERNELRELEASE \"$(KERNELRELEASE)\" exceeds $(uts_len) characters >&2; false) (echo KERNELRELEASE \"$(KERNELRELEASE)\" exceeds $(uts_len) characters >&2; false)
@echo \#define UTS_RELEASE \"$(KERNELRELEASE)\" > .ver @echo \#define UTS_RELEASE \"$(KERNELRELEASE)\" > .ver
@echo \#define LINUX_VERSION_CODE `expr $(VERSION) \\* 65536 + $(PATCHLEVEL) \\* 256 + $(SUBLEVEL)` >> .ver @echo \#define LINUX_VERSION_CODE `expr $(VERSION) \\* 65536 + $(PATCHLEVEL) \\* 256 + $(SUBLEVEL)` >> .ver
@@ -500,7 +500,7 @@ @@ -500,7 +500,7 @@ dep-files: scripts/mkdep archdep include
ifdef CONFIG_MODVERSIONS ifdef CONFIG_MODVERSIONS
$(MAKE) update-modverfile $(MAKE) update-modverfile
endif endif
@ -22,9 +22,9 @@ Index: linux-2.4.35.4/Makefile
ifdef CONFIG_MODVERSIONS ifdef CONFIG_MODVERSIONS
Index: linux-2.4.35.4/Rules.make Index: linux-2.4.35.4/Rules.make
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/Rules.make 2007-12-15 05:19:39.078648003 +0100 --- linux-2.4.35.4.orig/Rules.make
+++ linux-2.4.35.4/Rules.make 2007-12-15 05:20:00.315858242 +0100 +++ linux-2.4.35.4/Rules.make
@@ -126,7 +126,7 @@ @@ -126,7 +126,7 @@ endif
# This make dependencies quickly # This make dependencies quickly
# #
fastdep: dummy fastdep: dummy
@ -33,7 +33,7 @@ Index: linux-2.4.35.4/Rules.make
ifdef ALL_SUB_DIRS ifdef ALL_SUB_DIRS
$(MAKE) $(patsubst %,_sfdep_%,$(ALL_SUB_DIRS)) _FASTDEP_ALL_SUB_DIRS="$(ALL_SUB_DIRS)" $(MAKE) $(patsubst %,_sfdep_%,$(ALL_SUB_DIRS)) _FASTDEP_ALL_SUB_DIRS="$(ALL_SUB_DIRS)"
endif endif
@@ -176,7 +176,14 @@ @@ -176,7 +176,14 @@ modules: $(ALL_MOBJS) dummy \
_modinst__: dummy _modinst__: dummy
ifneq "$(strip $(ALL_MOBJS))" "" ifneq "$(strip $(ALL_MOBJS))" ""
mkdir -p $(MODLIB)/kernel/$(MOD_DESTDIR) mkdir -p $(MODLIB)/kernel/$(MOD_DESTDIR)

6
target/linux/generic-2.4/patches/210-fix-irq-serial.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/drivers/char/serial.c Index: linux-2.4.35.4/drivers/char/serial.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/char/serial.c 2007-12-15 05:19:44.934981737 +0100 --- linux-2.4.35.4.orig/drivers/char/serial.c
+++ linux-2.4.35.4/drivers/char/serial.c 2007-12-15 05:20:00.539871010 +0100 +++ linux-2.4.35.4/drivers/char/serial.c
@@ -5458,18 +5458,6 @@ @@ -5458,18 +5458,6 @@ static int __init rs_init(void)
sizeof(struct rs_multiport_struct)); sizeof(struct rs_multiport_struct));
#endif #endif
} }

20
target/linux/generic-2.4/patches/212-htb_time_fix.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/net/sched/sch_htb.c Index: linux-2.4.35.4/net/sched/sch_htb.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/sched/sch_htb.c 2007-12-15 05:19:39.010644128 +0100 --- linux-2.4.35.4.orig/net/sched/sch_htb.c
+++ linux-2.4.35.4/net/sched/sch_htb.c 2007-12-15 05:20:00.751883092 +0100 +++ linux-2.4.35.4/net/sched/sch_htb.c
@@ -369,7 +369,7 @@ @@ -369,7 +369,7 @@ static void htb_debug_dump (struct htb_s
struct list_head *l; struct list_head *l;
list_for_each (l,q->hash+i) { list_for_each (l,q->hash+i) {
struct htb_class *cl = list_entry(l,struct htb_class,hlist); struct htb_class *cl = list_entry(l,struct htb_class,hlist);
@ -11,7 +11,7 @@ Index: linux-2.4.35.4/net/sched/sch_htb.c
printk(KERN_DEBUG "htb*c%x m=%d t=%ld c=%ld pq=%lu df=%ld ql=%d " printk(KERN_DEBUG "htb*c%x m=%d t=%ld c=%ld pq=%lu df=%ld ql=%d "
"pa=%x f:", "pa=%x f:",
cl->classid,cl->cmode,cl->tokens,cl->ctokens, cl->classid,cl->cmode,cl->tokens,cl->ctokens,
@@ -617,7 +617,7 @@ @@ -617,7 +617,7 @@ static void htb_deactivate_prios(struct
* mode transitions per time unit. The speed gain is about 1/6. * mode transitions per time unit. The speed gain is about 1/6.
*/ */
static __inline__ enum htb_cmode static __inline__ enum htb_cmode
@ -20,7 +20,7 @@ Index: linux-2.4.35.4/net/sched/sch_htb.c
{ {
long toks; long toks;
@@ -650,7 +650,7 @@ @@ -650,7 +650,7 @@ htb_class_mode(struct htb_class *cl,long
* to mode other than HTB_CAN_SEND (see htb_add_to_wait_tree). * to mode other than HTB_CAN_SEND (see htb_add_to_wait_tree).
*/ */
static void static void
@ -29,7 +29,7 @@ Index: linux-2.4.35.4/net/sched/sch_htb.c
{ {
enum htb_cmode new_mode = htb_class_mode(cl,diff); enum htb_cmode new_mode = htb_class_mode(cl,diff);
@@ -815,7 +815,8 @@ @@ -815,7 +815,8 @@ static void htb_rate_timer(unsigned long
static void htb_charge_class(struct htb_sched *q,struct htb_class *cl, static void htb_charge_class(struct htb_sched *q,struct htb_class *cl,
int level,int bytes) int level,int bytes)
{ {
@ -39,7 +39,7 @@ Index: linux-2.4.35.4/net/sched/sch_htb.c
enum htb_cmode old_mode; enum htb_cmode old_mode;
HTB_DBG(5,1,"htb_chrg_cl cl=%X lev=%d len=%d\n",cl->classid,level,bytes); HTB_DBG(5,1,"htb_chrg_cl cl=%X lev=%d len=%d\n",cl->classid,level,bytes);
@@ -831,7 +832,7 @@ @@ -831,7 +832,7 @@ static void htb_charge_class(struct htb_
#ifdef HTB_DEBUG #ifdef HTB_DEBUG
if (diff > cl->mbuffer || diff < 0 || PSCHED_TLESS(q->now, cl->t_c)) { if (diff > cl->mbuffer || diff < 0 || PSCHED_TLESS(q->now, cl->t_c)) {
if (net_ratelimit()) if (net_ratelimit())
@ -48,7 +48,7 @@ Index: linux-2.4.35.4/net/sched/sch_htb.c
cl->classid, diff, cl->classid, diff,
(unsigned long long) q->now, (unsigned long long) q->now,
(unsigned long long) cl->t_c, (unsigned long long) cl->t_c,
@@ -848,7 +849,7 @@ @@ -848,7 +849,7 @@ static void htb_charge_class(struct htb_
} }
HTB_ACCNT (ctokens,cbuffer,ceil); HTB_ACCNT (ctokens,cbuffer,ceil);
cl->t_c = q->now; cl->t_c = q->now;
@ -57,7 +57,7 @@ Index: linux-2.4.35.4/net/sched/sch_htb.c
old_mode = cl->cmode; diff = 0; old_mode = cl->cmode; diff = 0;
htb_change_class_mode(q,cl,&diff); htb_change_class_mode(q,cl,&diff);
@@ -887,7 +888,7 @@ @@ -887,7 +888,7 @@ static long htb_do_events(struct htb_sch
level,q->wait_pq[level].rb_node,q->row_mask[level]); level,q->wait_pq[level].rb_node,q->row_mask[level]);
for (i = 0; i < 500; i++) { for (i = 0; i < 500; i++) {
struct htb_class *cl; struct htb_class *cl;
@ -66,7 +66,7 @@ Index: linux-2.4.35.4/net/sched/sch_htb.c
rb_node_t *p = q->wait_pq[level].rb_node; rb_node_t *p = q->wait_pq[level].rb_node;
if (!p) return 0; if (!p) return 0;
while (p->rb_left) p = p->rb_left; while (p->rb_left) p = p->rb_left;
@@ -902,7 +903,7 @@ @@ -902,7 +903,7 @@ static long htb_do_events(struct htb_sch
#ifdef HTB_DEBUG #ifdef HTB_DEBUG
if (diff > cl->mbuffer || diff < 0 || PSCHED_TLESS(q->now, cl->t_c)) { if (diff > cl->mbuffer || diff < 0 || PSCHED_TLESS(q->now, cl->t_c)) {
if (net_ratelimit()) if (net_ratelimit())

4
target/linux/generic-2.4/patches/213-htb_disable_hysteresis.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.4.35.4/net/sched/sch_htb.c Index: linux-2.4.35.4/net/sched/sch_htb.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/sched/sch_htb.c 2007-12-15 05:20:00.751883092 +0100 --- linux-2.4.35.4.orig/net/sched/sch_htb.c
+++ linux-2.4.35.4/net/sched/sch_htb.c 2007-12-15 05:20:00.959894945 +0100 +++ linux-2.4.35.4/net/sched/sch_htb.c
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
#define HTB_EWMAC 2 /* rate average over HTB_EWMAC*HTB_HSIZE sec */ #define HTB_EWMAC 2 /* rate average over HTB_EWMAC*HTB_HSIZE sec */
#define HTB_DEBUG 1 /* compile debugging support (activated by tc tool) */ #define HTB_DEBUG 1 /* compile debugging support (activated by tc tool) */

8
target/linux/generic-2.4/patches/222-sound.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/drivers/sound/sound_core.c Index: linux-2.4.35.4/drivers/sound/sound_core.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/sound/sound_core.c 2007-12-15 05:19:38.946640480 +0100 --- linux-2.4.35.4.orig/drivers/sound/sound_core.c
+++ linux-2.4.35.4/drivers/sound/sound_core.c 2007-12-15 05:20:01.199908622 +0100 +++ linux-2.4.35.4/drivers/sound/sound_core.c
@@ -174,9 +174,9 @@ @@ -174,9 +174,9 @@ static int sound_insert_unit(struct soun
} }
if (r == low) if (r == low)
@ -14,7 +14,7 @@ Index: linux-2.4.35.4/drivers/sound/sound_core.c
s->de = devfs_register (devfs_handle, name_buf, s->de = devfs_register (devfs_handle, name_buf,
DEVFS_FL_NONE, SOUND_MAJOR, s->unit_minor, DEVFS_FL_NONE, SOUND_MAJOR, s->unit_minor,
S_IFCHR | mode, fops, NULL); S_IFCHR | mode, fops, NULL);
@@ -507,9 +507,9 @@ @@ -507,9 +507,9 @@ int soundcore_open(struct inode *inode,
* ALSA toplevel modules for soundcards, thus we need * ALSA toplevel modules for soundcards, thus we need
* load them at first. [Jaroslav Kysela <perex@jcu.cz>] * load them at first. [Jaroslav Kysela <perex@jcu.cz>]
*/ */

18
target/linux/generic-2.4/patches/224-atm_hotplug.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/include/linux/atmdev.h Index: linux-2.4.35.4/include/linux/atmdev.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/linux/atmdev.h 2007-12-15 05:19:38.898637744 +0100 --- linux-2.4.35.4.orig/include/linux/atmdev.h
+++ linux-2.4.35.4/include/linux/atmdev.h 2007-12-15 05:20:02.816000717 +0100 +++ linux-2.4.35.4/include/linux/atmdev.h
@@ -400,6 +400,7 @@ @@ -400,6 +400,7 @@ extern rwlock_t vcc_sklist_lock;
struct atm_dev *atm_dev_register(const char *type,const struct atmdev_ops *ops, struct atm_dev *atm_dev_register(const char *type,const struct atmdev_ops *ops,
int number,atm_dev_flags_t *flags); /* number == -1: pick first available */ int number,atm_dev_flags_t *flags); /* number == -1: pick first available */
struct atm_dev *atm_dev_lookup(int number); struct atm_dev *atm_dev_lookup(int number);
@ -12,8 +12,8 @@ Index: linux-2.4.35.4/include/linux/atmdev.h
void vcc_insert_socket(struct sock *sk); void vcc_insert_socket(struct sock *sk);
Index: linux-2.4.35.4/net/atm/resources.c Index: linux-2.4.35.4/net/atm/resources.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/atm/resources.c 2007-12-15 05:19:38.910638429 +0100 --- linux-2.4.35.4.orig/net/atm/resources.c
+++ linux-2.4.35.4/net/atm/resources.c 2007-12-15 05:20:02.824001175 +0100 +++ linux-2.4.35.4/net/atm/resources.c
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
#include <linux/sonet.h> #include <linux/sonet.h>
#include <linux/kernel.h> /* for barrier */ #include <linux/kernel.h> /* for barrier */
@ -22,7 +22,7 @@ Index: linux-2.4.35.4/net/atm/resources.c
#include <linux/bitops.h> #include <linux/bitops.h>
#include <net/sock.h> /* for struct sock */ #include <net/sock.h> /* for struct sock */
#include <asm/segment.h> /* for get_fs_long and put_fs_long */ #include <asm/segment.h> /* for get_fs_long and put_fs_long */
@@ -70,6 +71,44 @@ @@ -70,6 +71,44 @@ struct atm_dev *atm_dev_lookup(int numbe
return dev; return dev;
} }
@ -67,7 +67,7 @@ Index: linux-2.4.35.4/net/atm/resources.c
struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops, struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops,
int number, atm_dev_flags_t *flags) int number, atm_dev_flags_t *flags)
{ {
@@ -123,7 +162,10 @@ @@ -123,7 +162,10 @@ struct atm_dev *atm_dev_register(const c
} }
} }
#endif #endif
@ -79,7 +79,7 @@ Index: linux-2.4.35.4/net/atm/resources.c
return dev; return dev;
} }
@@ -131,6 +173,10 @@ @@ -131,6 +173,10 @@ struct atm_dev *atm_dev_register(const c
void atm_dev_deregister(struct atm_dev *dev) void atm_dev_deregister(struct atm_dev *dev)
{ {
unsigned long warning_time; unsigned long warning_time;
@ -90,7 +90,7 @@ Index: linux-2.4.35.4/net/atm/resources.c
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
if (dev->ops->proc_read) if (dev->ops->proc_read)
@@ -399,6 +445,7 @@ @@ -399,6 +445,7 @@ done:
} }

46
target/linux/generic-2.4/patches/225-string_lib_useful_exports.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/lib/string.c Index: linux-2.4.35.4/lib/string.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/lib/string.c 2007-12-15 05:19:38.866635920 +0100 --- linux-2.4.35.4.orig/lib/string.c
+++ linux-2.4.35.4/lib/string.c 2007-12-15 05:20:03.080015763 +0100 +++ linux-2.4.35.4/lib/string.c
@@ -50,6 +50,7 @@ @@ -50,6 +50,7 @@ int strnicmp(const char *s1, const char
} }
return (int)c1 - (int)c2; return (int)c1 - (int)c2;
} }
@ -10,7 +10,7 @@ Index: linux-2.4.35.4/lib/string.c
#endif #endif
char * ___strtok; char * ___strtok;
@@ -68,6 +69,7 @@ @@ -68,6 +69,7 @@ char * strcpy(char * dest,const char *sr
/* nothing */; /* nothing */;
return tmp; return tmp;
} }
@ -18,7 +18,7 @@ Index: linux-2.4.35.4/lib/string.c
#endif #endif
#ifndef __HAVE_ARCH_STRNCPY #ifndef __HAVE_ARCH_STRNCPY
@@ -90,6 +92,7 @@ @@ -90,6 +92,7 @@ char * strncpy(char * dest,const char *s
return tmp; return tmp;
} }
@ -26,7 +26,7 @@ Index: linux-2.4.35.4/lib/string.c
#endif #endif
#ifndef __HAVE_ARCH_STRCAT #ifndef __HAVE_ARCH_STRCAT
@@ -109,6 +112,7 @@ @@ -109,6 +112,7 @@ char * strcat(char * dest, const char *
return tmp; return tmp;
} }
@ -34,7 +34,7 @@ Index: linux-2.4.35.4/lib/string.c
#endif #endif
#ifndef __HAVE_ARCH_STRNCAT #ifndef __HAVE_ARCH_STRNCAT
@@ -138,6 +142,7 @@ @@ -138,6 +142,7 @@ char * strncat(char *dest, const char *s
return tmp; return tmp;
} }
@ -42,7 +42,7 @@ Index: linux-2.4.35.4/lib/string.c
#endif #endif
#ifndef __HAVE_ARCH_STRCMP #ifndef __HAVE_ARCH_STRCMP
@@ -157,6 +162,7 @@ @@ -157,6 +162,7 @@ int strcmp(const char * cs,const char *
return __res; return __res;
} }
@ -50,7 +50,7 @@ Index: linux-2.4.35.4/lib/string.c
#endif #endif
#ifndef __HAVE_ARCH_STRNCMP #ifndef __HAVE_ARCH_STRNCMP
@@ -178,6 +184,7 @@ @@ -178,6 +184,7 @@ int strncmp(const char * cs,const char *
return __res; return __res;
} }
@ -58,7 +58,7 @@ Index: linux-2.4.35.4/lib/string.c
#endif #endif
#ifndef __HAVE_ARCH_STRCHR #ifndef __HAVE_ARCH_STRCHR
@@ -193,6 +200,7 @@ @@ -193,6 +200,7 @@ char * strchr(const char * s, int c)
return NULL; return NULL;
return (char *) s; return (char *) s;
} }
@ -66,7 +66,7 @@ Index: linux-2.4.35.4/lib/string.c
#endif #endif
#ifndef __HAVE_ARCH_STRRCHR #ifndef __HAVE_ARCH_STRRCHR
@@ -210,6 +218,7 @@ @@ -210,6 +218,7 @@ char * strrchr(const char * s, int c)
} while (--p >= s); } while (--p >= s);
return NULL; return NULL;
} }
@ -74,7 +74,7 @@ Index: linux-2.4.35.4/lib/string.c
#endif #endif
#ifndef __HAVE_ARCH_STRLEN #ifndef __HAVE_ARCH_STRLEN
@@ -225,6 +234,7 @@ @@ -225,6 +234,7 @@ size_t strlen(const char * s)
/* nothing */; /* nothing */;
return sc - s; return sc - s;
} }
@ -82,7 +82,7 @@ Index: linux-2.4.35.4/lib/string.c
#endif #endif
#ifndef __HAVE_ARCH_STRNLEN #ifndef __HAVE_ARCH_STRNLEN
@@ -241,6 +251,7 @@ @@ -241,6 +251,7 @@ size_t strnlen(const char * s, size_t co
/* nothing */; /* nothing */;
return sc - s; return sc - s;
} }
@ -90,7 +90,7 @@ Index: linux-2.4.35.4/lib/string.c
#endif #endif
#ifndef __HAVE_ARCH_STRSPN #ifndef __HAVE_ARCH_STRSPN
@@ -268,6 +279,7 @@ @@ -268,6 +279,7 @@ size_t strspn(const char *s, const char
return count; return count;
} }
@ -98,7 +98,7 @@ Index: linux-2.4.35.4/lib/string.c
#endif #endif
#ifndef __HAVE_ARCH_STRPBRK #ifndef __HAVE_ARCH_STRPBRK
@@ -288,6 +300,7 @@ @@ -288,6 +300,7 @@ char * strpbrk(const char * cs,const cha
} }
return NULL; return NULL;
} }
@ -106,7 +106,7 @@ Index: linux-2.4.35.4/lib/string.c
#endif #endif
#ifndef __HAVE_ARCH_STRTOK #ifndef __HAVE_ARCH_STRTOK
@@ -345,6 +358,7 @@ @@ -345,6 +358,7 @@ char * strsep(char **s, const char *ct)
return sbegin; return sbegin;
} }
@ -114,7 +114,7 @@ Index: linux-2.4.35.4/lib/string.c
#endif #endif
#ifndef __HAVE_ARCH_MEMSET #ifndef __HAVE_ARCH_MEMSET
@@ -365,6 +379,7 @@ @@ -365,6 +379,7 @@ void * memset(void * s,int c,size_t coun
return s; return s;
} }
@ -122,7 +122,7 @@ Index: linux-2.4.35.4/lib/string.c
#endif #endif
#ifndef __HAVE_ARCH_BCOPY #ifndef __HAVE_ARCH_BCOPY
@@ -409,6 +424,7 @@ @@ -409,6 +424,7 @@ void * memcpy(void * dest,const void *sr
return dest; return dest;
} }
@ -130,7 +130,7 @@ Index: linux-2.4.35.4/lib/string.c
#endif #endif
#ifndef __HAVE_ARCH_MEMMOVE #ifndef __HAVE_ARCH_MEMMOVE
@@ -439,6 +455,7 @@ @@ -439,6 +455,7 @@ void * memmove(void * dest,const void *s
return dest; return dest;
} }
@ -138,7 +138,7 @@ Index: linux-2.4.35.4/lib/string.c
#endif #endif
#ifndef __HAVE_ARCH_MEMCMP #ifndef __HAVE_ARCH_MEMCMP
@@ -458,6 +475,7 @@ @@ -458,6 +475,7 @@ int memcmp(const void * cs,const void *
break; break;
return res; return res;
} }
@ -146,7 +146,7 @@ Index: linux-2.4.35.4/lib/string.c
#endif #endif
#ifndef __HAVE_ARCH_MEMSCAN #ifndef __HAVE_ARCH_MEMSCAN
@@ -482,6 +500,7 @@ @@ -482,6 +500,7 @@ void * memscan(void * addr, int c, size_
} }
return (void *) p; return (void *) p;
} }
@ -154,7 +154,7 @@ Index: linux-2.4.35.4/lib/string.c
#endif #endif
#ifndef __HAVE_ARCH_STRSTR #ifndef __HAVE_ARCH_STRSTR
@@ -506,6 +525,7 @@ @@ -506,6 +525,7 @@ char * strstr(const char * s1,const char
} }
return NULL; return NULL;
} }
@ -162,7 +162,7 @@ Index: linux-2.4.35.4/lib/string.c
#endif #endif
#ifndef __HAVE_ARCH_MEMCHR #ifndef __HAVE_ARCH_MEMCHR
@@ -528,5 +548,5 @@ @@ -528,5 +548,5 @@ void *memchr(const void *s, int c, size_
} }
return NULL; return NULL;
} }

46
target/linux/generic-2.4/patches/226-atm_br2684.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/net/atm/br2684.c Index: linux-2.4.35.4/net/atm/br2684.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/atm/br2684.c 2007-12-15 05:19:38.818633185 +0100 --- linux-2.4.35.4.orig/net/atm/br2684.c
+++ linux-2.4.35.4/net/atm/br2684.c 2007-12-15 05:20:03.656048591 +0100 +++ linux-2.4.35.4/net/atm/br2684.c
@@ -55,36 +55,55 @@ @@ -55,36 +55,55 @@ static void skb_debug(const struct sk_bu
#define skb_debug(skb) do {} while (0) #define skb_debug(skb) do {} while (0)
#endif #endif
@ -64,7 +64,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c
struct net_device_stats stats; struct net_device_stats stats;
int mac_was_set; int mac_was_set;
}; };
@@ -173,24 +192,84 @@ @@ -173,24 +192,84 @@ static int br2684_xmit_vcc(struct sk_buf
} }
skb = skb2; skb = skb2;
} }
@ -160,7 +160,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c
atomic_add(skb->truesize, &atmvcc->sk->wmem_alloc); atomic_add(skb->truesize, &atmvcc->sk->wmem_alloc);
ATM_SKB(skb)->atm_options = atmvcc->atm_options; ATM_SKB(skb)->atm_options = atmvcc->atm_options;
brdev->stats.tx_packets++; brdev->stats.tx_packets++;
@@ -428,18 +507,39 @@ @@ -428,18 +507,39 @@ static void br2684_push(struct atm_vcc *
atm_return(atmvcc, skb->truesize); atm_return(atmvcc, skb->truesize);
DPRINTK("skb from brdev %p\n", brdev); DPRINTK("skb from brdev %p\n", brdev);
if (brvcc->encaps == e_llc) { if (brvcc->encaps == e_llc) {
@ -205,7 +205,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c
} else { } else {
plen = PADLEN + ETH_HLEN; /* pad, dstmac,srcmac, ethtype */ plen = PADLEN + ETH_HLEN; /* pad, dstmac,srcmac, ethtype */
/* first 2 chars should be 0 */ /* first 2 chars should be 0 */
@@ -448,13 +548,14 @@ @@ -448,13 +548,14 @@ static void br2684_push(struct atm_vcc *
dev_kfree_skb(skb); dev_kfree_skb(skb);
return; return;
} }
@ -221,7 +221,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c
#ifdef FASTER_VERSION #ifdef FASTER_VERSION
/* FIXME: tcpdump shows that pointer to mac header is 2 bytes earlier, /* FIXME: tcpdump shows that pointer to mac header is 2 bytes earlier,
than should be. What else should I set? */ than should be. What else should I set? */
@@ -465,30 +566,29 @@ @@ -465,30 +566,29 @@ static void br2684_push(struct atm_vcc *
skb->protocol = ((u16 *) skb->data)[-1]; skb->protocol = ((u16 *) skb->data)[-1];
#else /* some protocols might require this: */ #else /* some protocols might require this: */
skb->protocol = br_type_trans(skb, &brdev->net_dev); skb->protocol = br_type_trans(skb, &brdev->net_dev);
@ -259,7 +259,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c
netif_rx(skb); netif_rx(skb);
} }
@@ -525,10 +625,10 @@ @@ -525,10 +625,10 @@ Note: we do not have explicit unassign,
err = -EEXIST; err = -EEXIST;
goto error; goto error;
} }
@ -274,7 +274,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c
err = -EINVAL; err = -EINVAL;
goto error; goto error;
} }
@@ -554,18 +654,21 @@ @@ -554,18 +654,21 @@ Note: we do not have explicit unassign,
brvcc->atmvcc = atmvcc; brvcc->atmvcc = atmvcc;
atmvcc->user_back = brvcc; atmvcc->user_back = brvcc;
brvcc->encaps = (enum br2684_encaps) be.encaps; brvcc->encaps = (enum br2684_encaps) be.encaps;
@ -297,7 +297,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c
write_unlock_irq(&devs_lock); write_unlock_irq(&devs_lock);
MOD_DEC_USE_COUNT; MOD_DEC_USE_COUNT;
return err; return err;
@@ -608,12 +711,25 @@ @@ -608,12 +711,25 @@ static int br2684_create(unsigned long a
if (ni.ifname[0] != '\0') { if (ni.ifname[0] != '\0') {
memcpy(brdev->net_dev.name, ni.ifname, memcpy(brdev->net_dev.name, ni.ifname,
@ -326,7 +326,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c
brdev->mac_was_set = 0; brdev->mac_was_set = 0;
#ifdef FASTER_VERSION #ifdef FASTER_VERSION
my_eth_header = brdev->net_dev.hard_header; my_eth_header = brdev->net_dev.hard_header;
@@ -677,12 +793,11 @@ @@ -677,12 +793,11 @@ static int br2684_ioctl(struct atm_vcc *
err = br2684_setfilt(atmvcc, arg); err = br2684_setfilt(atmvcc, arg);
MOD_DEC_USE_COUNT; MOD_DEC_USE_COUNT;
return err; return err;
@ -340,7 +340,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c
/* Never put more than 256 bytes in at once */ /* Never put more than 256 bytes in at once */
static int br2684_proc_engine(loff_t pos, char *buf) static int br2684_proc_engine(loff_t pos, char *buf)
{ {
@@ -692,52 +807,62 @@ @@ -692,52 +807,62 @@ static int br2684_proc_engine(loff_t pos
list_for_each(lhd, &br2684_devs) { list_for_each(lhd, &br2684_devs) {
brdev = list_entry_brdev(lhd); brdev = list_entry_brdev(lhd);
if (pos-- == 0) if (pos-- == 0)
@ -428,7 +428,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c
page = get_free_page(GFP_KERNEL); page = get_free_page(GFP_KERNEL);
if (!page) if (!page)
return -ENOMEM; return -ENOMEM;
@@ -746,7 +871,7 @@ @@ -746,7 +871,7 @@ static ssize_t br2684_proc_read(struct f
left = count; left = count;
read_lock(&devs_lock); read_lock(&devs_lock);
for (;;) { for (;;) {
@ -437,7 +437,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c
if (x == 0) if (x == 0)
break; break;
if (x > left) if (x > left)
@@ -761,12 +886,11 @@ @@ -761,12 +886,11 @@ static ssize_t br2684_proc_read(struct f
} }
len += x; len += x;
left -= x; left -= x;
@ -451,7 +451,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c
if (len > 0 && copy_to_user(buf, (char *) page, len)) if (len > 0 && copy_to_user(buf, (char *) page, len))
len = -EFAULT; len = -EFAULT;
free_page(page); free_page(page);
@@ -774,23 +898,20 @@ @@ -774,23 +898,20 @@ static ssize_t br2684_proc_read(struct f
} }
static struct file_operations br2684_proc_operations = { static struct file_operations br2684_proc_operations = {
@ -476,7 +476,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c
br2684_ioctl_set(br2684_ioctl); br2684_ioctl_set(br2684_ioctl);
return 0; return 0;
} }
@@ -799,9 +920,7 @@ @@ -799,9 +920,7 @@ static void __exit UNUSED br2684_exit(vo
{ {
struct br2684_dev *brdev; struct br2684_dev *brdev;
br2684_ioctl_set(NULL); br2684_ioctl_set(NULL);
@ -488,9 +488,9 @@ Index: linux-2.4.35.4/net/atm/br2684.c
unregister_netdev(&brdev->net_dev); unregister_netdev(&brdev->net_dev);
Index: linux-2.4.35.4/net/atm/common.c Index: linux-2.4.35.4/net/atm/common.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/atm/common.c 2007-12-15 05:19:38.826633641 +0100 --- linux-2.4.35.4.orig/net/atm/common.c
+++ linux-2.4.35.4/net/atm/common.c 2007-12-15 05:20:03.656048591 +0100 +++ linux-2.4.35.4/net/atm/common.c
@@ -158,6 +158,7 @@ @@ -158,6 +158,7 @@ void br2684_ioctl_set(int (*hook)(struct
} }
#ifdef CONFIG_ATM_BR2684_MODULE #ifdef CONFIG_ATM_BR2684_MODULE
EXPORT_SYMBOL(br2684_ioctl_set); EXPORT_SYMBOL(br2684_ioctl_set);
@ -500,8 +500,8 @@ Index: linux-2.4.35.4/net/atm/common.c
Index: linux-2.4.35.4/include/linux/atmbr2684.h Index: linux-2.4.35.4/include/linux/atmbr2684.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/linux/atmbr2684.h 2007-12-15 05:19:38.838634325 +0100 --- linux-2.4.35.4.orig/include/linux/atmbr2684.h
+++ linux-2.4.35.4/include/linux/atmbr2684.h 2007-12-15 05:20:03.668049273 +0100 +++ linux-2.4.35.4/include/linux/atmbr2684.h
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
#include <linux/atm.h> #include <linux/atm.h>
@ -539,7 +539,7 @@ Index: linux-2.4.35.4/include/linux/atmbr2684.h
}; };
/* /*
@@ -68,16 +78,17 @@ @@ -68,16 +78,17 @@ struct br2684_if_spec {
* is per-backend specific * is per-backend specific
*/ */
struct atm_backend_br2684 { struct atm_backend_br2684 {
@ -566,7 +566,7 @@ Index: linux-2.4.35.4/include/linux/atmbr2684.h
}; };
/* /*
@@ -95,7 +106,12 @@ @@ -95,7 +106,12 @@ struct br2684_filter_set {
struct br2684_filter filter; struct br2684_filter filter;
}; };

16
target/linux/generic-2.4/patches/227-jffs2_eofdetect.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.4.35.4/fs/jffs2/build.c Index: linux-2.4.35.4/fs/jffs2/build.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/jffs2/build.c 2007-12-15 05:19:38.778630906 +0100 --- linux-2.4.35.4.orig/fs/jffs2/build.c
+++ linux-2.4.35.4/fs/jffs2/build.c 2007-12-15 05:20:03.936064549 +0100 +++ linux-2.4.35.4/fs/jffs2/build.c
@@ -31,6 +31,10 @@ @@ -31,6 +31,10 @@
* provisions above, a recipient may use your version of this file * provisions above, a recipient may use your version of this file
* under either the RHEPL or the GPL. * under either the RHEPL or the GPL.
@ -21,7 +21,7 @@ Index: linux-2.4.35.4/fs/jffs2/build.c
#include "nodelist.h" #include "nodelist.h"
int jffs2_build_inode_pass1(struct jffs2_sb_info *, struct jffs2_inode_cache *); int jffs2_build_inode_pass1(struct jffs2_sb_info *, struct jffs2_inode_cache *);
@@ -89,6 +94,18 @@ @@ -89,6 +94,18 @@ int jffs2_build_filesystem(struct jffs2_
if (ret) if (ret)
return ret; return ret;
@ -42,8 +42,8 @@ Index: linux-2.4.35.4/fs/jffs2/build.c
as such, and also increase nlink of any children. */ as such, and also increase nlink of any children. */
Index: linux-2.4.35.4/fs/jffs2/scan.c Index: linux-2.4.35.4/fs/jffs2/scan.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/jffs2/scan.c 2007-12-15 05:19:38.786631361 +0100 --- linux-2.4.35.4.orig/fs/jffs2/scan.c
+++ linux-2.4.35.4/fs/jffs2/scan.c 2007-12-15 05:20:03.948065230 +0100 +++ linux-2.4.35.4/fs/jffs2/scan.c
@@ -31,6 +31,10 @@ @@ -31,6 +31,10 @@
* provisions above, a recipient may use your version of this file * provisions above, a recipient may use your version of this file
* under either the RHEPL or the GPL. * under either the RHEPL or the GPL.
@ -55,7 +55,7 @@ Index: linux-2.4.35.4/fs/jffs2/scan.c
* $Id: scan.c,v 1.51.2.4 2003/11/02 13:51:18 dwmw2 Exp $ * $Id: scan.c,v 1.51.2.4 2003/11/02 13:51:18 dwmw2 Exp $
* *
*/ */
@@ -88,7 +92,12 @@ @@ -88,7 +92,12 @@ int jffs2_scan_medium(struct jffs2_sb_in
for (i=0; i<c->nr_blocks; i++) { for (i=0; i<c->nr_blocks; i++) {
struct jffs2_eraseblock *jeb = &c->blocks[i]; struct jffs2_eraseblock *jeb = &c->blocks[i];
@ -69,7 +69,7 @@ Index: linux-2.4.35.4/fs/jffs2/scan.c
if (ret < 0) if (ret < 0)
return ret; return ret;
@@ -181,6 +190,7 @@ @@ -181,6 +190,7 @@ static int jffs2_scan_eraseblock (struct
while(ofs < jeb->offset + c->sector_size) { while(ofs < jeb->offset + c->sector_size) {
ssize_t retlen; ssize_t retlen;
@ -77,7 +77,7 @@ Index: linux-2.4.35.4/fs/jffs2/scan.c
ACCT_PARANOIA_CHECK(jeb); ACCT_PARANOIA_CHECK(jeb);
if (ofs & 3) { if (ofs & 3) {
@@ -202,8 +212,18 @@ @@ -202,8 +212,18 @@ static int jffs2_scan_eraseblock (struct
break; break;
} }

62
target/linux/generic-2.4/patches/228-more_usb_fixes.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/drivers/scsi/hosts.c Index: linux-2.4.35.4/drivers/scsi/hosts.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/scsi/hosts.c 2007-12-15 05:19:38.686625662 +0100 --- linux-2.4.35.4.orig/drivers/scsi/hosts.c
+++ linux-2.4.35.4/drivers/scsi/hosts.c 2007-12-15 05:20:04.720109227 +0100 +++ linux-2.4.35.4/drivers/scsi/hosts.c
@@ -107,8 +107,21 @@ @@ -107,8 +107,21 @@ scsi_unregister(struct Scsi_Host * sh){
if (shn) shn->host_registered = 0; if (shn) shn->host_registered = 0;
/* else {} : This should not happen, we should panic here... */ /* else {} : This should not happen, we should panic here... */
@ -27,9 +27,9 @@ Index: linux-2.4.35.4/drivers/scsi/hosts.c
Index: linux-2.4.35.4/drivers/usb/hcd.c Index: linux-2.4.35.4/drivers/usb/hcd.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/usb/hcd.c 2007-12-15 05:19:38.694626120 +0100 --- linux-2.4.35.4.orig/drivers/usb/hcd.c
+++ linux-2.4.35.4/drivers/usb/hcd.c 2007-12-15 05:20:04.724109453 +0100 +++ linux-2.4.35.4/drivers/usb/hcd.c
@@ -1105,7 +1105,8 @@ @@ -1105,7 +1105,8 @@ static int hcd_submit_urb (struct urb *u
break; break;
case PIPE_BULK: case PIPE_BULK:
allowed |= USB_DISABLE_SPD | USB_QUEUE_BULK allowed |= USB_DISABLE_SPD | USB_QUEUE_BULK
@ -39,7 +39,7 @@ Index: linux-2.4.35.4/drivers/usb/hcd.c
break; break;
case PIPE_INTERRUPT: case PIPE_INTERRUPT:
allowed |= USB_DISABLE_SPD; allowed |= USB_DISABLE_SPD;
@@ -1212,7 +1213,8 @@ @@ -1212,7 +1213,8 @@ static int hcd_submit_urb (struct urb *u
urb->setup_packet, urb->setup_packet,
sizeof (struct usb_ctrlrequest), sizeof (struct usb_ctrlrequest),
PCI_DMA_TODEVICE); PCI_DMA_TODEVICE);
@ -51,9 +51,9 @@ Index: linux-2.4.35.4/drivers/usb/hcd.c
urb->transfer_buffer, urb->transfer_buffer,
Index: linux-2.4.35.4/drivers/usb/host/ehci-hcd.c Index: linux-2.4.35.4/drivers/usb/host/ehci-hcd.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/usb/host/ehci-hcd.c 2007-12-15 05:19:38.702626576 +0100 --- linux-2.4.35.4.orig/drivers/usb/host/ehci-hcd.c
+++ linux-2.4.35.4/drivers/usb/host/ehci-hcd.c 2007-12-15 05:20:04.728109682 +0100 +++ linux-2.4.35.4/drivers/usb/host/ehci-hcd.c
@@ -399,6 +399,27 @@ @@ -399,6 +399,27 @@ static int ehci_start (struct usb_hcd *h
ehci_mem_cleanup (ehci); ehci_mem_cleanup (ehci);
return retval; return retval;
} }
@ -83,9 +83,9 @@ Index: linux-2.4.35.4/drivers/usb/host/ehci-hcd.c
Index: linux-2.4.35.4/drivers/usb/host/ehci-q.c Index: linux-2.4.35.4/drivers/usb/host/ehci-q.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/usb/host/ehci-q.c 2007-12-15 05:20:00.107846389 +0100 --- linux-2.4.35.4.orig/drivers/usb/host/ehci-q.c
+++ linux-2.4.35.4/drivers/usb/host/ehci-q.c 2007-12-15 05:20:04.728109682 +0100 +++ linux-2.4.35.4/drivers/usb/host/ehci-q.c
@@ -791,6 +791,8 @@ @@ -791,6 +791,8 @@ static void qh_link_async (struct ehci_h
writel (cmd, &ehci->regs->command); writel (cmd, &ehci->regs->command);
ehci->hcd.state = USB_STATE_RUNNING; ehci->hcd.state = USB_STATE_RUNNING;
/* posted write need not be known to HC yet ... */ /* posted write need not be known to HC yet ... */
@ -96,9 +96,9 @@ Index: linux-2.4.35.4/drivers/usb/host/ehci-q.c
Index: linux-2.4.35.4/drivers/usb/host/usb-uhci.c Index: linux-2.4.35.4/drivers/usb/host/usb-uhci.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/usb/host/usb-uhci.c 2007-12-15 05:19:38.714627260 +0100 --- linux-2.4.35.4.orig/drivers/usb/host/usb-uhci.c
+++ linux-2.4.35.4/drivers/usb/host/usb-uhci.c 2007-12-15 05:20:04.728109682 +0100 +++ linux-2.4.35.4/drivers/usb/host/usb-uhci.c
@@ -3034,6 +3034,21 @@ @@ -3034,6 +3034,21 @@ uhci_pci_probe (struct pci_dev *dev, con
pci_set_master(dev); pci_set_master(dev);
@ -122,8 +122,8 @@ Index: linux-2.4.35.4/drivers/usb/host/usb-uhci.c
Index: linux-2.4.35.4/drivers/usb/storage/transport.c Index: linux-2.4.35.4/drivers/usb/storage/transport.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/usb/storage/transport.c 2007-12-15 05:19:38.722627715 +0100 --- linux-2.4.35.4.orig/drivers/usb/storage/transport.c
+++ linux-2.4.35.4/drivers/usb/storage/transport.c 2007-12-15 05:20:04.732109911 +0100 +++ linux-2.4.35.4/drivers/usb/storage/transport.c
@@ -54,6 +54,22 @@ @@ -54,6 +54,22 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/errno.h> #include <linux/errno.h>
@ -147,7 +147,7 @@ Index: linux-2.4.35.4/drivers/usb/storage/transport.c
/*********************************************************************** /***********************************************************************
* Helper routines * Helper routines
@@ -554,6 +570,543 @@ @@ -554,6 +570,543 @@ int usb_stor_transfer_partial(struct us_
return US_BULK_TRANSFER_SHORT; return US_BULK_TRANSFER_SHORT;
} }
@ -691,7 +691,7 @@ Index: linux-2.4.35.4/drivers/usb/storage/transport.c
/* /*
* Transfer an entire SCSI command's worth of data payload over the bulk * Transfer an entire SCSI command's worth of data payload over the bulk
* pipe. * pipe.
@@ -569,6 +1122,8 @@ @@ -569,6 +1122,8 @@ void usb_stor_transfer(Scsi_Cmnd *srb, s
struct scatterlist *sg; struct scatterlist *sg;
unsigned int total_transferred = 0; unsigned int total_transferred = 0;
unsigned int transfer_amount; unsigned int transfer_amount;
@ -700,7 +700,7 @@ Index: linux-2.4.35.4/drivers/usb/storage/transport.c
/* calculate how much we want to transfer */ /* calculate how much we want to transfer */
transfer_amount = usb_stor_transfer_length(srb); transfer_amount = usb_stor_transfer_length(srb);
@@ -585,23 +1140,34 @@ @@ -585,23 +1140,34 @@ void usb_stor_transfer(Scsi_Cmnd *srb, s
* make the appropriate requests for each, until done * make the appropriate requests for each, until done
*/ */
sg = (struct scatterlist *) srb->request_buffer; sg = (struct scatterlist *) srb->request_buffer;
@ -754,9 +754,9 @@ Index: linux-2.4.35.4/drivers/usb/storage/transport.c
else else
Index: linux-2.4.35.4/drivers/usb/storage/transport.h Index: linux-2.4.35.4/drivers/usb/storage/transport.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/usb/storage/transport.h 2007-12-15 05:19:38.730628171 +0100 --- linux-2.4.35.4.orig/drivers/usb/storage/transport.h
+++ linux-2.4.35.4/drivers/usb/storage/transport.h 2007-12-15 05:20:04.732109911 +0100 +++ linux-2.4.35.4/drivers/usb/storage/transport.h
@@ -127,6 +127,16 @@ @@ -127,6 +127,16 @@ struct bulk_cs_wrap {
#define US_BULK_TRANSFER_ABORTED 3 /* transfer canceled */ #define US_BULK_TRANSFER_ABORTED 3 /* transfer canceled */
/* /*
@ -775,9 +775,9 @@ Index: linux-2.4.35.4/drivers/usb/storage/transport.h
Index: linux-2.4.35.4/drivers/usb/storage/usb.h Index: linux-2.4.35.4/drivers/usb/storage/usb.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/usb/storage/usb.h 2007-12-15 05:19:38.738628626 +0100 --- linux-2.4.35.4.orig/drivers/usb/storage/usb.h
+++ linux-2.4.35.4/drivers/usb/storage/usb.h 2007-12-15 05:20:04.736110140 +0100 +++ linux-2.4.35.4/drivers/usb/storage/usb.h
@@ -111,6 +111,60 @@ @@ -111,6 +111,60 @@ typedef int (*trans_reset)(struct us_dat
typedef void (*proto_cmnd)(Scsi_Cmnd*, struct us_data*); typedef void (*proto_cmnd)(Scsi_Cmnd*, struct us_data*);
typedef void (*extra_data_destructor)(void *); /* extra data destructor */ typedef void (*extra_data_destructor)(void *); /* extra data destructor */
@ -838,7 +838,7 @@ Index: linux-2.4.35.4/drivers/usb/storage/usb.h
/* we allocate one of these for every device that we remember */ /* we allocate one of these for every device that we remember */
struct us_data { struct us_data {
struct us_data *next; /* next device */ struct us_data *next; /* next device */
@@ -171,6 +225,7 @@ @@ -171,6 +225,7 @@ struct us_data {
struct urb *current_urb; /* non-int USB requests */ struct urb *current_urb; /* non-int USB requests */
struct completion current_done; /* the done flag */ struct completion current_done; /* the done flag */
unsigned int tag; /* tag for bulk CBW/CSW */ unsigned int tag; /* tag for bulk CBW/CSW */
@ -848,9 +848,9 @@ Index: linux-2.4.35.4/drivers/usb/storage/usb.h
struct semaphore sema; /* to sleep thread on */ struct semaphore sema; /* to sleep thread on */
Index: linux-2.4.35.4/include/linux/usb.h Index: linux-2.4.35.4/include/linux/usb.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/linux/usb.h 2007-12-15 05:19:38.750629310 +0100 --- linux-2.4.35.4.orig/include/linux/usb.h
+++ linux-2.4.35.4/include/linux/usb.h 2007-12-15 05:20:04.740110367 +0100 +++ linux-2.4.35.4/include/linux/usb.h
@@ -483,6 +483,8 @@ @@ -483,6 +483,8 @@ struct usb_driver {
#define URB_NO_INTERRUPT 0x0080 /* HINT: no non-error interrupt needed */ #define URB_NO_INTERRUPT 0x0080 /* HINT: no non-error interrupt needed */
/* ... less overhead for QUEUE_BULK */ /* ... less overhead for QUEUE_BULK */
#define USB_TIMEOUT_KILLED 0x1000 // only set by HCD! #define USB_TIMEOUT_KILLED 0x1000 // only set by HCD!

14
target/linux/generic-2.4/patches/230-tun_get_user_backport.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/include/linux/skbuff.h Index: linux-2.4.35.4/include/linux/skbuff.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/linux/skbuff.h 2007-12-15 05:19:38.654623841 +0100 --- linux-2.4.35.4.orig/include/linux/skbuff.h
+++ linux-2.4.35.4/include/linux/skbuff.h 2007-12-15 05:20:05.060128604 +0100 +++ linux-2.4.35.4/include/linux/skbuff.h
@@ -912,6 +912,49 @@ @@ -912,6 +912,49 @@ static inline void skb_reserve(struct sk
skb->tail+=len; skb->tail+=len;
} }
@ -54,9 +54,9 @@ Index: linux-2.4.35.4/include/linux/skbuff.h
static inline void __skb_trim(struct sk_buff *skb, unsigned int len) static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
Index: linux-2.4.35.4/drivers/net/tun.c Index: linux-2.4.35.4/drivers/net/tun.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/net/tun.c 2007-12-15 05:19:38.642623156 +0100 --- linux-2.4.35.4.orig/drivers/net/tun.c
+++ linux-2.4.35.4/drivers/net/tun.c 2007-12-15 05:20:05.056128377 +0100 +++ linux-2.4.35.4/drivers/net/tun.c
@@ -185,22 +185,31 @@ @@ -185,22 +185,31 @@ static __inline__ ssize_t tun_get_user(s
{ {
struct tun_pi pi = { 0, __constant_htons(ETH_P_IP) }; struct tun_pi pi = { 0, __constant_htons(ETH_P_IP) };
struct sk_buff *skb; struct sk_buff *skb;
@ -94,7 +94,7 @@ Index: linux-2.4.35.4/drivers/net/tun.c
skb->dev = &tun->dev; skb->dev = &tun->dev;
switch (tun->flags & TUN_TYPE_MASK) { switch (tun->flags & TUN_TYPE_MASK) {
@@ -271,7 +280,8 @@ @@ -271,7 +280,8 @@ static __inline__ ssize_t tun_put_user(s
pi.flags |= TUN_PKT_STRIP; pi.flags |= TUN_PKT_STRIP;
} }

80
target/linux/generic-2.4/patches/231-mini_fo.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/fs/Config.in Index: linux-2.4.35.4/fs/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/Config.in 2007-12-15 05:19:52.319402550 +0100 --- linux-2.4.35.4.orig/fs/Config.in
+++ linux-2.4.35.4/fs/Config.in 2007-12-15 05:20:05.284141367 +0100 +++ linux-2.4.35.4/fs/Config.in
@@ -77,6 +77,7 @@ @@ -77,6 +77,7 @@ dep_mbool ' JFS debugging' CONFIG_JFS_D
dep_mbool ' JFS statistics' CONFIG_JFS_STATISTICS $CONFIG_JFS_FS dep_mbool ' JFS statistics' CONFIG_JFS_STATISTICS $CONFIG_JFS_FS
tristate 'Minix fs support' CONFIG_MINIX_FS tristate 'Minix fs support' CONFIG_MINIX_FS
@ -12,9 +12,9 @@ Index: linux-2.4.35.4/fs/Config.in
tristate 'NTFS file system support (read only)' CONFIG_NTFS_FS tristate 'NTFS file system support (read only)' CONFIG_NTFS_FS
Index: linux-2.4.35.4/fs/Makefile Index: linux-2.4.35.4/fs/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/fs/Makefile 2007-12-15 05:19:52.319402550 +0100 --- linux-2.4.35.4.orig/fs/Makefile
+++ linux-2.4.35.4/fs/Makefile 2007-12-15 05:20:05.288141596 +0100 +++ linux-2.4.35.4/fs/Makefile
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@ subdir-$(CONFIG_RAMFS) += ramfs
subdir-$(CONFIG_CODA_FS) += coda subdir-$(CONFIG_CODA_FS) += coda
subdir-$(CONFIG_INTERMEZZO_FS) += intermezzo subdir-$(CONFIG_INTERMEZZO_FS) += intermezzo
subdir-$(CONFIG_MINIX_FS) += minix subdir-$(CONFIG_MINIX_FS) += minix
@ -24,8 +24,8 @@ Index: linux-2.4.35.4/fs/Makefile
subdir-$(CONFIG_MSDOS_FS) += msdos subdir-$(CONFIG_MSDOS_FS) += msdos
Index: linux-2.4.35.4/fs/mini_fo/aux.c Index: linux-2.4.35.4/fs/mini_fo/aux.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/mini_fo/aux.c 2007-12-15 05:20:05.296142055 +0100 +++ linux-2.4.35.4/fs/mini_fo/aux.c
@@ -0,0 +1,580 @@ @@ -0,0 +1,580 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -609,8 +609,8 @@ Index: linux-2.4.35.4/fs/mini_fo/aux.c
+ +
Index: linux-2.4.35.4/fs/mini_fo/ChangeLog Index: linux-2.4.35.4/fs/mini_fo/ChangeLog
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/mini_fo/ChangeLog 2007-12-15 05:20:05.296142055 +0100 +++ linux-2.4.35.4/fs/mini_fo/ChangeLog
@@ -0,0 +1,281 @@ @@ -0,0 +1,281 @@
+2006-01-24 Markus Klotzbuecher <mk@mary.denx.de> +2006-01-24 Markus Klotzbuecher <mk@mary.denx.de>
+ +
@ -895,8 +895,8 @@ Index: linux-2.4.35.4/fs/mini_fo/ChangeLog
+ +
Index: linux-2.4.35.4/fs/mini_fo/dentry.c Index: linux-2.4.35.4/fs/mini_fo/dentry.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/mini_fo/dentry.c 2007-12-15 05:20:05.296142055 +0100 +++ linux-2.4.35.4/fs/mini_fo/dentry.c
@@ -0,0 +1,244 @@ @@ -0,0 +1,244 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -1144,8 +1144,8 @@ Index: linux-2.4.35.4/fs/mini_fo/dentry.c
+}; +};
Index: linux-2.4.35.4/fs/mini_fo/file.c Index: linux-2.4.35.4/fs/mini_fo/file.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/mini_fo/file.c 2007-12-15 05:20:05.300142281 +0100 +++ linux-2.4.35.4/fs/mini_fo/file.c
@@ -0,0 +1,717 @@ @@ -0,0 +1,717 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -1866,8 +1866,8 @@ Index: linux-2.4.35.4/fs/mini_fo/file.c
+ }; + };
Index: linux-2.4.35.4/fs/mini_fo/fist.h Index: linux-2.4.35.4/fs/mini_fo/fist.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/mini_fo/fist.h 2007-12-15 05:20:05.300142281 +0100 +++ linux-2.4.35.4/fs/mini_fo/fist.h
@@ -0,0 +1,248 @@ @@ -0,0 +1,248 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -2119,8 +2119,8 @@ Index: linux-2.4.35.4/fs/mini_fo/fist.h
+#endif /* not __FIST_H_ */ +#endif /* not __FIST_H_ */
Index: linux-2.4.35.4/fs/mini_fo/inode.c Index: linux-2.4.35.4/fs/mini_fo/inode.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/mini_fo/inode.c 2007-12-15 05:20:05.300142281 +0100 +++ linux-2.4.35.4/fs/mini_fo/inode.c
@@ -0,0 +1,1573 @@ @@ -0,0 +1,1573 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -3697,8 +3697,8 @@ Index: linux-2.4.35.4/fs/mini_fo/inode.c
+ }; + };
Index: linux-2.4.35.4/fs/mini_fo/main.c Index: linux-2.4.35.4/fs/mini_fo/main.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/mini_fo/main.c 2007-12-15 05:20:05.300142281 +0100 +++ linux-2.4.35.4/fs/mini_fo/main.c
@@ -0,0 +1,414 @@ @@ -0,0 +1,414 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -4116,8 +4116,8 @@ Index: linux-2.4.35.4/fs/mini_fo/main.c
+module_exit(exit_mini_fo_fs) +module_exit(exit_mini_fo_fs)
Index: linux-2.4.35.4/fs/mini_fo/Makefile Index: linux-2.4.35.4/fs/mini_fo/Makefile
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/mini_fo/Makefile 2007-12-15 05:20:05.304142507 +0100 +++ linux-2.4.35.4/fs/mini_fo/Makefile
@@ -0,0 +1,22 @@ @@ -0,0 +1,22 @@
+# +#
+# Makefile for mini_fo 2.4 and 2.6 Linux kernels +# Makefile for mini_fo 2.4 and 2.6 Linux kernels
@ -4143,8 +4143,8 @@ Index: linux-2.4.35.4/fs/mini_fo/Makefile
+ +
Index: linux-2.4.35.4/fs/mini_fo/meta.c Index: linux-2.4.35.4/fs/mini_fo/meta.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/mini_fo/meta.c 2007-12-15 05:20:05.304142507 +0100 +++ linux-2.4.35.4/fs/mini_fo/meta.c
@@ -0,0 +1,1000 @@ @@ -0,0 +1,1000 @@
+/* +/*
+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de> + * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
@ -5148,8 +5148,8 @@ Index: linux-2.4.35.4/fs/mini_fo/meta.c
+ +
Index: linux-2.4.35.4/fs/mini_fo/mini_fo.h Index: linux-2.4.35.4/fs/mini_fo/mini_fo.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/mini_fo/mini_fo.h 2007-12-15 05:20:05.304142507 +0100 +++ linux-2.4.35.4/fs/mini_fo/mini_fo.h
@@ -0,0 +1,503 @@ @@ -0,0 +1,503 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -5656,8 +5656,8 @@ Index: linux-2.4.35.4/fs/mini_fo/mini_fo.h
+#endif /* not __MINI_FO_H_ */ +#endif /* not __MINI_FO_H_ */
Index: linux-2.4.35.4/fs/mini_fo/mini_fo-merge Index: linux-2.4.35.4/fs/mini_fo/mini_fo-merge
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/mini_fo/mini_fo-merge 2007-12-15 05:20:05.304142507 +0100 +++ linux-2.4.35.4/fs/mini_fo/mini_fo-merge
@@ -0,0 +1,180 @@ @@ -0,0 +1,180 @@
+#!/bin/bash +#!/bin/bash
+# +#
@ -5841,8 +5841,8 @@ Index: linux-2.4.35.4/fs/mini_fo/mini_fo-merge
+echo "Done!" +echo "Done!"
Index: linux-2.4.35.4/fs/mini_fo/mini_fo-overlay Index: linux-2.4.35.4/fs/mini_fo/mini_fo-overlay
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/mini_fo/mini_fo-overlay 2007-12-15 05:20:05.308142736 +0100 +++ linux-2.4.35.4/fs/mini_fo/mini_fo-overlay
@@ -0,0 +1,130 @@ @@ -0,0 +1,130 @@
+#!/bin/bash +#!/bin/bash
+# +#
@ -5976,8 +5976,8 @@ Index: linux-2.4.35.4/fs/mini_fo/mini_fo-overlay
+fi +fi
Index: linux-2.4.35.4/fs/mini_fo/mmap.c Index: linux-2.4.35.4/fs/mini_fo/mmap.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/mini_fo/mmap.c 2007-12-15 05:20:05.316143195 +0100 +++ linux-2.4.35.4/fs/mini_fo/mmap.c
@@ -0,0 +1,637 @@ @@ -0,0 +1,637 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
@ -6618,8 +6618,8 @@ Index: linux-2.4.35.4/fs/mini_fo/mmap.c
+} +}
Index: linux-2.4.35.4/fs/mini_fo/README Index: linux-2.4.35.4/fs/mini_fo/README
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/mini_fo/README 2007-12-15 05:20:05.316143195 +0100 +++ linux-2.4.35.4/fs/mini_fo/README
@@ -0,0 +1,163 @@ @@ -0,0 +1,163 @@
+README for the mini_fo overlay file system +README for the mini_fo overlay file system
+========================================= +=========================================
@ -6786,8 +6786,8 @@ Index: linux-2.4.35.4/fs/mini_fo/README
+ +
Index: linux-2.4.35.4/fs/mini_fo/RELEASE_NOTES Index: linux-2.4.35.4/fs/mini_fo/RELEASE_NOTES
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/mini_fo/RELEASE_NOTES 2007-12-15 05:20:05.316143195 +0100 +++ linux-2.4.35.4/fs/mini_fo/RELEASE_NOTES
@@ -0,0 +1,111 @@ @@ -0,0 +1,111 @@
+Release: mini_fo-0.6.1 (v0-6-1) +Release: mini_fo-0.6.1 (v0-6-1)
+Date: 21.09.2005 +Date: 21.09.2005
@ -6902,8 +6902,8 @@ Index: linux-2.4.35.4/fs/mini_fo/RELEASE_NOTES
+seperately by the lower fs. +seperately by the lower fs.
Index: linux-2.4.35.4/fs/mini_fo/state.c Index: linux-2.4.35.4/fs/mini_fo/state.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/mini_fo/state.c 2007-12-15 05:20:05.316143195 +0100 +++ linux-2.4.35.4/fs/mini_fo/state.c
@@ -0,0 +1,620 @@ @@ -0,0 +1,620 @@
+/* +/*
+ * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de> + * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
@ -7527,8 +7527,8 @@ Index: linux-2.4.35.4/fs/mini_fo/state.c
+ +
Index: linux-2.4.35.4/fs/mini_fo/super.c Index: linux-2.4.35.4/fs/mini_fo/super.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/fs/mini_fo/super.c 2007-12-15 05:20:05.316143195 +0100 +++ linux-2.4.35.4/fs/mini_fo/super.c
@@ -0,0 +1,259 @@ @@ -0,0 +1,259 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok

20
target/linux/generic-2.4/patches/601-netfilter_ipp2p_0.8.1rc1.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_ipp2p.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_ipp2p.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_ipp2p.h 2007-12-15 05:20:05.756168270 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_ipp2p.h
@@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
+#ifndef __IPT_IPP2P_H +#ifndef __IPT_IPP2P_H
+#define __IPT_IPP2P_H +#define __IPT_IPP2P_H
@ -36,9 +36,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_ipp2p.h
+#define IPP2P_XDCC (1 << 16) +#define IPP2P_XDCC (1 << 16)
Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:19:38.466613124 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:05.764168722 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
dep_tristate ' TOS match support' CONFIG_IP_NF_MATCH_TOS $CONFIG_IP_NF_IPTABLES dep_tristate ' TOS match support' CONFIG_IP_NF_MATCH_TOS $CONFIG_IP_NF_IPTABLES
dep_tristate ' recent match support' CONFIG_IP_NF_MATCH_RECENT $CONFIG_IP_NF_IPTABLES dep_tristate ' recent match support' CONFIG_IP_NF_MATCH_RECENT $CONFIG_IP_NF_IPTABLES
dep_tristate ' ECN match support' CONFIG_IP_NF_MATCH_ECN $CONFIG_IP_NF_IPTABLES dep_tristate ' ECN match support' CONFIG_IP_NF_MATCH_ECN $CONFIG_IP_NF_IPTABLES
@ -48,9 +48,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:19:38.474613582 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:05.764168722 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
@@ -67,6 +67,7 @@ @@ -67,6 +67,7 @@ obj-$(CONFIG_IP_NF_MATCH_HELPER) += ipt_
obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o
obj-$(CONFIG_IP_NF_MATCH_MARK) += ipt_mark.o obj-$(CONFIG_IP_NF_MATCH_MARK) += ipt_mark.o
obj-$(CONFIG_IP_NF_MATCH_MAC) += ipt_mac.o obj-$(CONFIG_IP_NF_MATCH_MAC) += ipt_mac.o
@ -60,8 +60,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o
Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_ipp2p.c Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_ipp2p.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_ipp2p.c 2007-12-15 05:20:05.764168722 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ipt_ipp2p.c
@@ -0,0 +1,868 @@ @@ -0,0 +1,868 @@
+#if defined(MODVERSIONS) +#if defined(MODVERSIONS)
+#include <linux/modversions.h> +#include <linux/modversions.h>

60
target/linux/generic-2.4/patches/602-netfilter_layer7_2.17_with_pktmatch.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/Documentation/Configure.help Index: linux-2.4.35.4/Documentation/Configure.help
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:19:54.063501941 +0100 --- linux-2.4.35.4.orig/Documentation/Configure.help
+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:20:06.024183543 +0100 +++ linux-2.4.35.4/Documentation/Configure.help
@@ -29207,6 +29207,18 @@ @@ -29207,6 +29207,18 @@ CONFIG_SOUND_WM97XX
If unsure, say N. If unsure, say N.
@ -23,9 +23,9 @@ Index: linux-2.4.35.4/Documentation/Configure.help
# capitalize: AppleTalk, Ethernet, DOS, DMA, FAT, FTP, Internet, # capitalize: AppleTalk, Ethernet, DOS, DMA, FAT, FTP, Internet,
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:19:38.358606970 +0100 --- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:20:06.024183543 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -207,6 +207,17 @@ @@ -207,6 +207,17 @@ struct ip_conntrack
} nat; } nat;
#endif /* CONFIG_IP_NF_NAT_NEEDED */ #endif /* CONFIG_IP_NF_NAT_NEEDED */
@ -45,8 +45,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
/* get master conntrack via master expectation */ /* get master conntrack via master expectation */
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_layer7.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_layer7.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_layer7.h 2007-12-15 05:20:06.032183998 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_layer7.h
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
+/* +/*
+ By Matthew Strait <quadong@users.sf.net>, Dec 2003. + By Matthew Strait <quadong@users.sf.net>, Dec 2003.
@ -77,9 +77,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_layer7.h
+#endif /* _IPT_LAYER7_H */ +#endif /* _IPT_LAYER7_H */
Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:05.764168722 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:06.036184227 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
@@ -44,6 +44,9 @@ @@ -44,6 +44,9 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
dep_tristate ' Unclean match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_UNCLEAN $CONFIG_IP_NF_IPTABLES dep_tristate ' Unclean match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_UNCLEAN $CONFIG_IP_NF_IPTABLES
dep_tristate ' Owner match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_OWNER $CONFIG_IP_NF_IPTABLES dep_tristate ' Owner match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_OWNER $CONFIG_IP_NF_IPTABLES
@ -91,9 +91,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
dep_tristate ' Packet filtering' CONFIG_IP_NF_FILTER $CONFIG_IP_NF_IPTABLES dep_tristate ' Packet filtering' CONFIG_IP_NF_FILTER $CONFIG_IP_NF_IPTABLES
Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:05.764168722 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:06.036184227 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
@@ -87,6 +87,7 @@ @@ -87,6 +87,7 @@ obj-$(CONFIG_IP_NF_MATCH_STATE) += ipt_s
obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += ipt_conntrack.o obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += ipt_conntrack.o
obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt_unclean.o obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt_unclean.o
obj-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss.o obj-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss.o
@ -103,9 +103,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c 2007-12-15 05:19:38.386608565 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c 2007-12-15 05:20:06.036184227 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
@@ -346,6 +346,14 @@ @@ -346,6 +346,14 @@ destroy_conntrack(struct nf_conntrack *n
} }
kfree(ct->master); kfree(ct->master);
} }
@ -122,9 +122,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
if (master) if (master)
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_standalone.c 2007-12-15 05:19:38.394609023 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_standalone.c
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c 2007-12-15 05:20:06.036184227 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
@@ -107,6 +107,13 @@ @@ -107,6 +107,13 @@ print_conntrack(char *buffer, struct ip_
len += sprintf(buffer + len, "[ASSURED] "); len += sprintf(buffer + len, "[ASSURED] ");
len += sprintf(buffer + len, "use=%u ", len += sprintf(buffer + len, "use=%u ",
atomic_read(&conntrack->ct_general.use)); atomic_read(&conntrack->ct_general.use));
@ -140,8 +140,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
return len; return len;
Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_layer7.c Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_layer7.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_layer7.c 2007-12-15 05:20:06.040184453 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ipt_layer7.c
@@ -0,0 +1,595 @@ @@ -0,0 +1,595 @@
+/* +/*
+ Kernel module to match application layer (OSI layer 7) + Kernel module to match application layer (OSI layer 7)
@ -740,8 +740,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_layer7.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.c Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.c 2007-12-15 05:20:06.040184453 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.c
@@ -0,0 +1,1195 @@ @@ -0,0 +1,1195 @@
+/* +/*
+ * regcomp and regexec -- regsub and regerror are elsewhere + * regcomp and regexec -- regsub and regerror are elsewhere
@ -1940,8 +1940,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.c
+ +
Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.h Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.h 2007-12-15 05:20:06.040184453 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.h
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+/* +/*
+ * Definitions etc. for regexp(3) routines. + * Definitions etc. for regexp(3) routines.
@ -1985,8 +1985,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.h
+#endif +#endif
Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regmagic.h Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regmagic.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/regexp/regmagic.h 2007-12-15 05:20:06.040184453 +0100 +++ linux-2.4.35.4/net/ipv4/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
@ -1995,8 +1995,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regmagic.h
+#define MAGIC 0234 +#define MAGIC 0234
Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regsub.c Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regsub.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/regexp/regsub.c 2007-12-15 05:20:06.044184683 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/regexp/regsub.c
@@ -0,0 +1,95 @@ @@ -0,0 +1,95 @@
+/* +/*
+ * regsub + * regsub

90
target/linux/generic-2.4/patches/603-netfilter_nat_pptp.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:20:06.024183543 +0100 --- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:20:06.392204515 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -50,16 +50,19 @@ @@ -50,16 +50,19 @@ enum ip_conntrack_status {
#include <linux/netfilter_ipv4/ip_conntrack_tcp.h> #include <linux/netfilter_ipv4/ip_conntrack_tcp.h>
#include <linux/netfilter_ipv4/ip_conntrack_icmp.h> #include <linux/netfilter_ipv4/ip_conntrack_icmp.h>
@ -22,7 +22,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
}; };
/* Add protocol helper include file here */ /* Add protocol helper include file here */
@@ -67,6 +70,7 @@ @@ -67,6 +70,7 @@ union ip_conntrack_expect_proto {
#include <linux/netfilter_ipv4/ip_conntrack_ftp.h> #include <linux/netfilter_ipv4/ip_conntrack_ftp.h>
#include <linux/netfilter_ipv4/ip_conntrack_irc.h> #include <linux/netfilter_ipv4/ip_conntrack_irc.h>
@ -30,7 +30,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
/* per expectation: application helper private data */ /* per expectation: application helper private data */
union ip_conntrack_expect_help { union ip_conntrack_expect_help {
@@ -74,6 +78,7 @@ @@ -74,6 +78,7 @@ union ip_conntrack_expect_help {
struct ip_ct_amanda_expect exp_amanda_info; struct ip_ct_amanda_expect exp_amanda_info;
struct ip_ct_ftp_expect exp_ftp_info; struct ip_ct_ftp_expect exp_ftp_info;
struct ip_ct_irc_expect exp_irc_info; struct ip_ct_irc_expect exp_irc_info;
@ -38,7 +38,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
#ifdef CONFIG_IP_NF_NAT_NEEDED #ifdef CONFIG_IP_NF_NAT_NEEDED
union { union {
@@ -87,14 +92,17 @@ @@ -87,14 +92,17 @@ union ip_conntrack_help {
/* insert conntrack helper private data (master) here */ /* insert conntrack helper private data (master) here */
struct ip_ct_ftp_master ct_ftp_info; struct ip_ct_ftp_master ct_ftp_info;
struct ip_ct_irc_master ct_irc_info; struct ip_ct_irc_master ct_irc_info;
@ -58,8 +58,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_pptp.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_pptp.h 2007-12-15 05:20:06.400204969 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
@@ -0,0 +1,313 @@ @@ -0,0 +1,313 @@
+/* PPTP constants and structs */ +/* PPTP constants and structs */
+#ifndef _CONNTRACK_PPTP_H +#ifndef _CONNTRACK_PPTP_H
@ -376,8 +376,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
+#endif /* _CONNTRACK_PPTP_H */ +#endif /* _CONNTRACK_PPTP_H */
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h 2007-12-15 05:20:06.400204969 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
@@ -0,0 +1,123 @@ @@ -0,0 +1,123 @@
+#ifndef _CONNTRACK_PROTO_GRE_H +#ifndef _CONNTRACK_PROTO_GRE_H
+#define _CONNTRACK_PROTO_GRE_H +#define _CONNTRACK_PROTO_GRE_H
@ -504,8 +504,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
+#endif /* _CONNTRACK_PROTO_GRE_H */ +#endif /* _CONNTRACK_PROTO_GRE_H */
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack_tuple.h 2007-12-15 05:19:38.250600816 +0100 --- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h 2007-12-15 05:20:06.400204969 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
union ip_conntrack_manip_proto union ip_conntrack_manip_proto
{ {
@ -515,7 +515,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
struct { struct {
u_int16_t port; u_int16_t port;
@@ -25,6 +25,9 @@ @@ -25,6 +25,9 @@ union ip_conntrack_manip_proto
struct { struct {
u_int16_t id; u_int16_t id;
} icmp; } icmp;
@ -525,7 +525,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
}; };
/* The manipulable part of the tuple. */ /* The manipulable part of the tuple. */
@@ -44,7 +47,7 @@ @@ -44,7 +47,7 @@ struct ip_conntrack_tuple
u_int32_t ip; u_int32_t ip;
union { union {
/* Add other protocols here. */ /* Add other protocols here. */
@ -534,7 +534,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
struct { struct {
u_int16_t port; u_int16_t port;
@@ -55,6 +58,9 @@ @@ -55,6 +58,9 @@ struct ip_conntrack_tuple
struct { struct {
u_int8_t type, code; u_int8_t type, code;
} icmp; } icmp;
@ -544,7 +544,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
} u; } u;
/* The protocol. */ /* The protocol. */
@@ -80,10 +86,16 @@ @@ -80,10 +86,16 @@ enum ip_conntrack_dir
#ifdef __KERNEL__ #ifdef __KERNEL__
#define DUMP_TUPLE(tp) \ #define DUMP_TUPLE(tp) \
@ -566,8 +566,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat_pptp.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat_pptp.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat_pptp.h 2007-12-15 05:20:06.400204969 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat_pptp.h
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+/* PPTP constants and structs */ +/* PPTP constants and structs */
+#ifndef _NAT_PPTP_H +#ifndef _NAT_PPTP_H
@ -582,9 +582,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat_pptp.h
+#endif /* _NAT_PPTP_H */ +#endif /* _NAT_PPTP_H */
Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:06.036184227 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:06.400204969 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
@@ -10,6 +10,8 @@ @@ -10,6 +10,8 @@ if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ];
dep_tristate ' Amanda protocol support' CONFIG_IP_NF_AMANDA $CONFIG_IP_NF_CONNTRACK dep_tristate ' Amanda protocol support' CONFIG_IP_NF_AMANDA $CONFIG_IP_NF_CONNTRACK
dep_tristate ' TFTP protocol support' CONFIG_IP_NF_TFTP $CONFIG_IP_NF_CONNTRACK dep_tristate ' TFTP protocol support' CONFIG_IP_NF_TFTP $CONFIG_IP_NF_CONNTRACK
dep_tristate ' IRC protocol support' CONFIG_IP_NF_IRC $CONFIG_IP_NF_CONNTRACK dep_tristate ' IRC protocol support' CONFIG_IP_NF_IRC $CONFIG_IP_NF_CONNTRACK
@ -593,7 +593,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
fi fi
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
@@ -63,6 +65,20 @@ @@ -63,6 +65,20 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
define_bool CONFIG_IP_NF_NAT_NEEDED y define_bool CONFIG_IP_NF_NAT_NEEDED y
dep_tristate ' MASQUERADE target support' CONFIG_IP_NF_TARGET_MASQUERADE $CONFIG_IP_NF_NAT dep_tristate ' MASQUERADE target support' CONFIG_IP_NF_TARGET_MASQUERADE $CONFIG_IP_NF_NAT
dep_tristate ' REDIRECT target support' CONFIG_IP_NF_TARGET_REDIRECT $CONFIG_IP_NF_NAT dep_tristate ' REDIRECT target support' CONFIG_IP_NF_TARGET_REDIRECT $CONFIG_IP_NF_NAT
@ -616,9 +616,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
else else
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c 2007-12-15 05:20:06.036184227 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c 2007-12-15 05:20:06.404205198 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
@@ -143,6 +143,8 @@ @@ -143,6 +143,8 @@ ip_ct_get_tuple(const struct iphdr *iph,
tuple->dst.ip = iph->daddr; tuple->dst.ip = iph->daddr;
tuple->dst.protonum = iph->protocol; tuple->dst.protonum = iph->protocol;
@ -627,7 +627,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
ret = protocol->pkt_to_tuple((u_int32_t *)iph + iph->ihl, ret = protocol->pkt_to_tuple((u_int32_t *)iph + iph->ihl,
len - 4*iph->ihl, len - 4*iph->ihl,
tuple); tuple);
@@ -158,6 +160,8 @@ @@ -158,6 +160,8 @@ invert_tuple(struct ip_conntrack_tuple *
inverse->dst.ip = orig->src.ip; inverse->dst.ip = orig->src.ip;
inverse->dst.protonum = orig->dst.protonum; inverse->dst.protonum = orig->dst.protonum;
@ -636,7 +636,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
return protocol->invert_tuple(inverse, orig); return protocol->invert_tuple(inverse, orig);
} }
@@ -970,8 +974,8 @@ @@ -970,8 +974,8 @@ int ip_conntrack_expect_related(struct i
* so there is no need to use the tuple lock too */ * so there is no need to use the tuple lock too */
DEBUGP("ip_conntrack_expect_related %p\n", related_to); DEBUGP("ip_conntrack_expect_related %p\n", related_to);
@ -647,7 +647,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
old = LIST_FIND(&ip_conntrack_expect_list, resent_expect, old = LIST_FIND(&ip_conntrack_expect_list, resent_expect,
struct ip_conntrack_expect *, &expect->tuple, struct ip_conntrack_expect *, &expect->tuple,
@@ -1089,15 +1093,14 @@ @@ -1089,15 +1093,14 @@ int ip_conntrack_change_expect(struct ip
MUST_BE_READ_LOCKED(&ip_conntrack_lock); MUST_BE_READ_LOCKED(&ip_conntrack_lock);
WRITE_LOCK(&ip_conntrack_expect_tuple_lock); WRITE_LOCK(&ip_conntrack_expect_tuple_lock);
@ -669,8 +669,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
/* Force NAT to find an unused tuple */ /* Force NAT to find an unused tuple */
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp_priv.h Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp_priv.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp_priv.h 2007-12-15 05:20:06.404205198 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp_priv.h
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
+#ifndef _IP_CT_PPTP_PRIV_H +#ifndef _IP_CT_PPTP_PRIV_H
+#define _IP_CT_PPTP_PRIV_H +#define _IP_CT_PPTP_PRIV_H
@ -698,8 +698,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp_priv.h
+#endif +#endif
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c 2007-12-15 05:20:06.404205198 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c
@@ -0,0 +1,333 @@ @@ -0,0 +1,333 @@
+/* +/*
+ * ip_conntrack_proto_gre.c - Version 1.2 + * ip_conntrack_proto_gre.c - Version 1.2
@ -1036,9 +1036,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_nat_core.c 2007-12-15 05:19:38.290603095 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_nat_core.c
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c 2007-12-15 05:20:06.404205198 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c
@@ -424,7 +424,7 @@ @@ -424,7 +424,7 @@ get_unique_tuple(struct ip_conntrack_tup
*tuple = *orig_tuple; *tuple = *orig_tuple;
while ((rptr = find_best_ips_proto_fast(tuple, mr, conntrack, hooknum)) while ((rptr = find_best_ips_proto_fast(tuple, mr, conntrack, hooknum))
!= NULL) { != NULL) {
@ -1047,7 +1047,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c
/* 3) The per-protocol part of the manip is made to /* 3) The per-protocol part of the manip is made to
map into the range to make a unique tuple. */ map into the range to make a unique tuple. */
@@ -564,9 +564,9 @@ @@ -564,9 +564,9 @@ ip_nat_setup_info(struct ip_conntrack *c
HOOK2MANIP(hooknum)==IP_NAT_MANIP_SRC ? "SRC" : "DST", HOOK2MANIP(hooknum)==IP_NAT_MANIP_SRC ? "SRC" : "DST",
conntrack); conntrack);
DEBUGP("Original: "); DEBUGP("Original: ");
@ -1061,8 +1061,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c
/* We now have two tuples (SRCIP/SRCPT/DSTIP/DSTPT): /* We now have two tuples (SRCIP/SRCPT/DSTIP/DSTPT):
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_pptp.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_pptp.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_pptp.c 2007-12-15 05:20:06.408205428 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_pptp.c
@@ -0,0 +1,482 @@ @@ -0,0 +1,482 @@
+/* +/*
+ * ip_nat_pptp.c - Version 1.5 + * ip_nat_pptp.c - Version 1.5
@ -1548,8 +1548,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_pptp.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_proto_gre.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_proto_gre.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_proto_gre.c 2007-12-15 05:20:06.408205428 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_proto_gre.c
@@ -0,0 +1,202 @@ @@ -0,0 +1,202 @@
+/* +/*
+ * ip_nat_proto_gre.c - Version 1.2 + * ip_nat_proto_gre.c - Version 1.2
@ -1755,9 +1755,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_proto_gre.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:06.036184227 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:06.408205428 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
@@ -36,23 +36,32 @@ @@ -36,23 +36,32 @@ obj-$(CONFIG_IP_NF_AMANDA) += ip_conntra
ifdef CONFIG_IP_NF_AMANDA ifdef CONFIG_IP_NF_AMANDA
export-objs += ip_conntrack_amanda.o export-objs += ip_conntrack_amanda.o
endif endif
@ -1794,8 +1794,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp.c 2007-12-15 05:20:06.408205428 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp.c
@@ -0,0 +1,635 @@ @@ -0,0 +1,635 @@
+/* +/*
+ * ip_conntrack_pptp.c - Version 1.9 + * ip_conntrack_pptp.c - Version 1.9

8
target/linux/generic-2.4/patches/604-netfilter_maxconn.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c 2007-12-15 05:20:06.404205198 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c 2007-12-15 05:20:06.772226171 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
@@ -1410,7 +1410,7 @@ @@ -1410,7 +1410,7 @@ void ip_conntrack_cleanup(void)
nf_unregister_sockopt(&so_getorigdst); nf_unregister_sockopt(&so_getorigdst);
} }
@ -11,7 +11,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
MODULE_PARM(hashsize, "i"); MODULE_PARM(hashsize, "i");
int __init ip_conntrack_init(void) int __init ip_conntrack_init(void)
@@ -1431,7 +1431,7 @@ @@ -1431,7 +1431,7 @@ int __init ip_conntrack_init(void)
if (ip_conntrack_htable_size < 16) if (ip_conntrack_htable_size < 16)
ip_conntrack_htable_size = 16; ip_conntrack_htable_size = 16;
} }

26
target/linux/generic-2.4/patches/605-netfilter_TTL.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/Documentation/Configure.help Index: linux-2.4.35.4/Documentation/Configure.help
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:20:06.024183543 +0100 --- linux-2.4.35.4.orig/Documentation/Configure.help
+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:20:06.996238934 +0100 +++ linux-2.4.35.4/Documentation/Configure.help
@@ -3209,6 +3209,15 @@ @@ -3209,6 +3209,15 @@ CONFIG_IP_NF_TARGET_LOG
If you want to compile it as a module, say M here and read If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'. <file:Documentation/modules.txt>. If unsure, say `N'.
@ -20,8 +20,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help
This option places ipchains (with masquerading and redirection This option places ipchains (with masquerading and redirection
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_TTL.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_TTL.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_TTL.h 2007-12-15 05:20:07.000239163 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_TTL.h
@@ -0,0 +1,21 @@ @@ -0,0 +1,21 @@
+/* TTL modification module for IP tables +/* TTL modification module for IP tables
+ * (C) 2000 by Harald Welte <laforge@gnumonks.org> */ + * (C) 2000 by Harald Welte <laforge@gnumonks.org> */
@ -46,9 +46,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_TTL.h
+#endif +#endif
Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:06.400204969 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:07.000239163 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
@@ -125,6 +125,7 @@ @@ -125,6 +125,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
dep_tristate ' MARK target support' CONFIG_IP_NF_TARGET_MARK $CONFIG_IP_NF_MANGLE dep_tristate ' MARK target support' CONFIG_IP_NF_TARGET_MARK $CONFIG_IP_NF_MANGLE
fi fi
dep_tristate ' LOG target support' CONFIG_IP_NF_TARGET_LOG $CONFIG_IP_NF_IPTABLES dep_tristate ' LOG target support' CONFIG_IP_NF_TARGET_LOG $CONFIG_IP_NF_IPTABLES
@ -58,8 +58,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
fi fi
Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_TTL.c Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_TTL.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_TTL.c 2007-12-15 05:20:07.000239163 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ipt_TTL.c
@@ -0,0 +1,110 @@ @@ -0,0 +1,110 @@
+/* TTL modification target for IP tables +/* TTL modification target for IP tables
+ * (C) 2000 by Harald Welte <laforge@gnumonks.org> + * (C) 2000 by Harald Welte <laforge@gnumonks.org>
@ -173,9 +173,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_TTL.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:06.408205428 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:07.000239163 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
@@ -109,6 +109,7 @@ @@ -109,6 +109,7 @@ obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) +=
obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
obj-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += ip_nat_snmp_basic.o obj-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += ip_nat_snmp_basic.o
obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o

22
target/linux/generic-2.4/patches/606-netfilter_NETMAP.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/Documentation/Configure.help Index: linux-2.4.35.4/Documentation/Configure.help
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:20:06.996238934 +0100 --- linux-2.4.35.4.orig/Documentation/Configure.help
+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:20:07.284255349 +0100 +++ linux-2.4.35.4/Documentation/Configure.help
@@ -3086,6 +3086,17 @@ @@ -3086,6 +3086,17 @@ CONFIG_IP_NF_TARGET_REDIRECT
If you want to compile it as a module, say M here and read If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'. <file:Documentation/modules.txt>. If unsure, say `N'.
@ -22,9 +22,9 @@ Index: linux-2.4.35.4/Documentation/Configure.help
This option adds a `mangle' table to iptables: see the man page for This option adds a `mangle' table to iptables: see the man page for
Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:07.000239163 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:07.284255349 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
@@ -65,6 +65,7 @@ @@ -65,6 +65,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
define_bool CONFIG_IP_NF_NAT_NEEDED y define_bool CONFIG_IP_NF_NAT_NEEDED y
dep_tristate ' MASQUERADE target support' CONFIG_IP_NF_TARGET_MASQUERADE $CONFIG_IP_NF_NAT dep_tristate ' MASQUERADE target support' CONFIG_IP_NF_TARGET_MASQUERADE $CONFIG_IP_NF_NAT
dep_tristate ' REDIRECT target support' CONFIG_IP_NF_TARGET_REDIRECT $CONFIG_IP_NF_NAT dep_tristate ' REDIRECT target support' CONFIG_IP_NF_TARGET_REDIRECT $CONFIG_IP_NF_NAT
@ -34,8 +34,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
else else
Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_NETMAP.c Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_NETMAP.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_NETMAP.c 2007-12-15 05:20:07.284255349 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ipt_NETMAP.c
@@ -0,0 +1,112 @@ @@ -0,0 +1,112 @@
+/* NETMAP - static NAT mapping of IP network addresses (1:1). +/* NETMAP - static NAT mapping of IP network addresses (1:1).
+ The mapping can be applied to source (POSTROUTING), + The mapping can be applied to source (POSTROUTING),
@ -151,9 +151,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_NETMAP.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:07.000239163 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:07.288255579 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
@@ -107,6 +107,7 @@ @@ -107,6 +107,7 @@ obj-$(CONFIG_IP_NF_TARGET_DSCP) += ipt_D
obj-$(CONFIG_IP_NF_TARGET_MARK) += ipt_MARK.o obj-$(CONFIG_IP_NF_TARGET_MARK) += ipt_MARK.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

52
target/linux/generic-2.4/patches/607-netfilter_connmark.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:20:06.392204515 +0100 --- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:20:07.552270623 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -226,6 +226,9 @@ @@ -226,6 +226,9 @@ struct ip_conntrack
unsigned int app_data_len; unsigned int app_data_len;
} layer7; } layer7;
#endif #endif
@ -14,8 +14,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
/* get master conntrack via master expectation */ /* get master conntrack via master expectation */
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CONNMARK.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CONNMARK.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CONNMARK.h 2007-12-15 05:20:07.556270849 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CONNMARK.h
@@ -0,0 +1,25 @@ @@ -0,0 +1,25 @@
+#ifndef _IPT_CONNMARK_H_target +#ifndef _IPT_CONNMARK_H_target
+#define _IPT_CONNMARK_H_target +#define _IPT_CONNMARK_H_target
@ -44,8 +44,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CONNMARK.h
+#endif /*_IPT_CONNMARK_H_target*/ +#endif /*_IPT_CONNMARK_H_target*/
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connmark.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connmark.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connmark.h 2007-12-15 05:20:07.564271306 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connmark.h
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
+#ifndef _IPT_CONNMARK_H +#ifndef _IPT_CONNMARK_H
+#define _IPT_CONNMARK_H +#define _IPT_CONNMARK_H
@ -67,9 +67,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connmark.h
+#endif /*_IPT_CONNMARK_H*/ +#endif /*_IPT_CONNMARK_H*/
Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:07.284255349 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:07.568271536 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
@@ -6,7 +6,8 @@ @@ -6,7 +6,8 @@ comment ' IP: Netfilter Configuration'
tristate 'Connection tracking (required for masq/NAT)' CONFIG_IP_NF_CONNTRACK tristate 'Connection tracking (required for masq/NAT)' CONFIG_IP_NF_CONNTRACK
if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; then if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; then
@ -79,7 +79,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
dep_tristate ' Amanda protocol support' CONFIG_IP_NF_AMANDA $CONFIG_IP_NF_CONNTRACK dep_tristate ' Amanda protocol support' CONFIG_IP_NF_AMANDA $CONFIG_IP_NF_CONNTRACK
dep_tristate ' TFTP protocol support' CONFIG_IP_NF_TFTP $CONFIG_IP_NF_CONNTRACK dep_tristate ' TFTP protocol support' CONFIG_IP_NF_TFTP $CONFIG_IP_NF_CONNTRACK
dep_tristate ' IRC protocol support' CONFIG_IP_NF_IRC $CONFIG_IP_NF_CONNTRACK dep_tristate ' IRC protocol support' CONFIG_IP_NF_IRC $CONFIG_IP_NF_CONNTRACK
@@ -42,6 +43,9 @@ @@ -42,6 +43,9 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; then if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; then
dep_tristate ' Connection state match support' CONFIG_IP_NF_MATCH_STATE $CONFIG_IP_NF_CONNTRACK $CONFIG_IP_NF_IPTABLES dep_tristate ' Connection state match support' CONFIG_IP_NF_MATCH_STATE $CONFIG_IP_NF_CONNTRACK $CONFIG_IP_NF_IPTABLES
dep_tristate ' Connection tracking match support' CONFIG_IP_NF_MATCH_CONNTRACK $CONFIG_IP_NF_CONNTRACK $CONFIG_IP_NF_IPTABLES dep_tristate ' Connection tracking match support' CONFIG_IP_NF_MATCH_CONNTRACK $CONFIG_IP_NF_CONNTRACK $CONFIG_IP_NF_IPTABLES
@ -89,7 +89,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
fi fi
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
dep_tristate ' Unclean match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_UNCLEAN $CONFIG_IP_NF_IPTABLES dep_tristate ' Unclean match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_UNCLEAN $CONFIG_IP_NF_IPTABLES
@@ -125,6 +129,9 @@ @@ -125,6 +129,9 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
dep_tristate ' MARK target support' CONFIG_IP_NF_TARGET_MARK $CONFIG_IP_NF_MANGLE dep_tristate ' MARK target support' CONFIG_IP_NF_TARGET_MARK $CONFIG_IP_NF_MANGLE
fi fi
@ -101,9 +101,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
dep_tristate ' ULOG target support' CONFIG_IP_NF_TARGET_ULOG $CONFIG_IP_NF_IPTABLES dep_tristate ' ULOG target support' CONFIG_IP_NF_TARGET_ULOG $CONFIG_IP_NF_IPTABLES
Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:07.288255579 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:07.568271536 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
@@ -93,6 +93,7 @@ @@ -93,6 +93,7 @@ obj-$(CONFIG_IP_NF_MATCH_LENGTH) += ipt_
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
obj-$(CONFIG_IP_NF_MATCH_STATE) += ipt_state.o obj-$(CONFIG_IP_NF_MATCH_STATE) += ipt_state.o
@ -111,7 +111,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += ipt_conntrack.o obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += ipt_conntrack.o
obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt_unclean.o obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt_unclean.o
obj-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss.o obj-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss.o
@@ -110,6 +111,7 @@ @@ -110,6 +111,7 @@ obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += i
obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
obj-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += ip_nat_snmp_basic.o obj-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += ip_nat_snmp_basic.o
obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o
@ -121,9 +121,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
obj-$(CONFIG_IP_NF_TARGET_TCPMSS) += ipt_TCPMSS.o obj-$(CONFIG_IP_NF_TARGET_TCPMSS) += ipt_TCPMSS.o
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c 2007-12-15 05:20:06.772226171 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c 2007-12-15 05:20:07.568271536 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
@@ -754,6 +754,9 @@ @@ -754,6 +754,9 @@ init_conntrack(const struct ip_conntrack
__set_bit(IPS_EXPECTED_BIT, &conntrack->status); __set_bit(IPS_EXPECTED_BIT, &conntrack->status);
conntrack->master = expected; conntrack->master = expected;
expected->sibling = conntrack; expected->sibling = conntrack;
@ -135,9 +135,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
nf_conntrack_get(&master_ct(conntrack)->infos[0]); nf_conntrack_get(&master_ct(conntrack)->infos[0]);
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_standalone.c 2007-12-15 05:20:06.036184227 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_standalone.c
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c 2007-12-15 05:20:07.568271536 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
@@ -107,6 +107,9 @@ @@ -107,6 +107,9 @@ print_conntrack(char *buffer, struct ip_
len += sprintf(buffer + len, "[ASSURED] "); len += sprintf(buffer + len, "[ASSURED] ");
len += sprintf(buffer + len, "use=%u ", len += sprintf(buffer + len, "use=%u ",
atomic_read(&conntrack->ct_general.use)); atomic_read(&conntrack->ct_general.use));
@ -149,8 +149,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
if(conntrack->layer7.app_proto) if(conntrack->layer7.app_proto)
Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_CONNMARK.c Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_CONNMARK.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_CONNMARK.c 2007-12-15 05:20:07.568271536 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ipt_CONNMARK.c
@@ -0,0 +1,118 @@ @@ -0,0 +1,118 @@
+/* This kernel module is used to modify the connection mark values, or +/* This kernel module is used to modify the connection mark values, or
+ * to optionally restore the skb nfmark from the connection mark + * to optionally restore the skb nfmark from the connection mark
@ -272,8 +272,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_CONNMARK.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_connmark.c Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_connmark.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_connmark.c 2007-12-15 05:20:07.572271763 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ipt_connmark.c
@@ -0,0 +1,83 @@ @@ -0,0 +1,83 @@
+/* This kernel module matches connection mark values set by the +/* This kernel module matches connection mark values set by the
+ * CONNMARK target + * CONNMARK target

98
target/linux/generic-2.4/patches/608-netfilter_ipset.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/Documentation/Configure.help Index: linux-2.4.35.4/Documentation/Configure.help
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:20:07.284255349 +0100 --- linux-2.4.35.4.orig/Documentation/Configure.help
+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:20:07.880289314 +0100 +++ linux-2.4.35.4/Documentation/Configure.help
@@ -3220,6 +3220,75 @@ @@ -3220,6 +3220,75 @@ CONFIG_IP_NF_TARGET_LOG
If you want to compile it as a module, say M here and read If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'. <file:Documentation/modules.txt>. If unsure, say `N'.
@ -80,8 +80,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help
This option adds a `TTL' target, which enables the user to set This option adds a `TTL' target, which enables the user to set
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set.h 2007-12-15 05:20:07.884289543 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set.h
@@ -0,0 +1,489 @@ @@ -0,0 +1,489 @@
+#ifndef _IP_SET_H +#ifndef _IP_SET_H
+#define _IP_SET_H +#define _IP_SET_H
@ -574,8 +574,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set.h
+#endif /*_IP_SET_H*/ +#endif /*_IP_SET_H*/
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iphash.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iphash.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iphash.h 2007-12-15 05:20:07.884289543 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iphash.h
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
+#ifndef __IP_SET_IPHASH_H +#ifndef __IP_SET_IPHASH_H
+#define __IP_SET_IPHASH_H +#define __IP_SET_IPHASH_H
@ -609,8 +609,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iphash.h
+#endif /* __IP_SET_IPHASH_H */ +#endif /* __IP_SET_IPHASH_H */
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipmap.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipmap.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipmap.h 2007-12-15 05:20:07.884289543 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipmap.h
@@ -0,0 +1,56 @@ @@ -0,0 +1,56 @@
+#ifndef __IP_SET_IPMAP_H +#ifndef __IP_SET_IPMAP_H
+#define __IP_SET_IPMAP_H +#define __IP_SET_IPMAP_H
@ -670,8 +670,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipmap.h
+#endif /* __IP_SET_IPMAP_H */ +#endif /* __IP_SET_IPMAP_H */
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iptree.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iptree.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iptree.h 2007-12-15 05:20:07.884289543 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iptree.h
@@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
+#ifndef __IP_SET_IPTREE_H +#ifndef __IP_SET_IPTREE_H
+#define __IP_SET_IPTREE_H +#define __IP_SET_IPTREE_H
@ -714,8 +714,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iptree.h
+#endif /* __IP_SET_IPTREE_H */ +#endif /* __IP_SET_IPTREE_H */
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_jhash.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_jhash.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_jhash.h 2007-12-15 05:20:07.884289543 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_jhash.h
@@ -0,0 +1,148 @@ @@ -0,0 +1,148 @@
+#ifndef _LINUX_IPSET_JHASH_H +#ifndef _LINUX_IPSET_JHASH_H
+#define _LINUX_IPSET_JHASH_H +#define _LINUX_IPSET_JHASH_H
@ -867,8 +867,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_jhash.h
+#endif /* _LINUX_IPSET_JHASH_H */ +#endif /* _LINUX_IPSET_JHASH_H */
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_macipmap.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_macipmap.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_macipmap.h 2007-12-15 05:20:07.884289543 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_macipmap.h
@@ -0,0 +1,38 @@ @@ -0,0 +1,38 @@
+#ifndef __IP_SET_MACIPMAP_H +#ifndef __IP_SET_MACIPMAP_H
+#define __IP_SET_MACIPMAP_H +#define __IP_SET_MACIPMAP_H
@ -910,8 +910,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_macipmap.h
+#endif /* __IP_SET_MACIPMAP_H */ +#endif /* __IP_SET_MACIPMAP_H */
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_malloc.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_malloc.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_malloc.h 2007-12-15 05:20:07.888289773 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_malloc.h
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
+#ifndef _IP_SET_MALLOC_H +#ifndef _IP_SET_MALLOC_H
+#define _IP_SET_MALLOC_H +#define _IP_SET_MALLOC_H
@ -942,8 +942,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_malloc.h
+#endif /*_IP_SET_MALLOC_H*/ +#endif /*_IP_SET_MALLOC_H*/
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_nethash.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_nethash.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_nethash.h 2007-12-15 05:20:07.888289773 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_nethash.h
@@ -0,0 +1,55 @@ @@ -0,0 +1,55 @@
+#ifndef __IP_SET_NETHASH_H +#ifndef __IP_SET_NETHASH_H
+#define __IP_SET_NETHASH_H +#define __IP_SET_NETHASH_H
@ -1002,8 +1002,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_nethash.h
+#endif /* __IP_SET_NETHASH_H */ +#endif /* __IP_SET_NETHASH_H */
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_portmap.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_portmap.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_portmap.h 2007-12-15 05:20:07.888289773 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_portmap.h
@@ -0,0 +1,25 @@ @@ -0,0 +1,25 @@
+#ifndef __IP_SET_PORTMAP_H +#ifndef __IP_SET_PORTMAP_H
+#define __IP_SET_PORTMAP_H +#define __IP_SET_PORTMAP_H
@ -1032,8 +1032,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_portmap.h
+#endif /* __IP_SET_PORTMAP_H */ +#endif /* __IP_SET_PORTMAP_H */
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_prime.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_prime.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_prime.h 2007-12-15 05:20:07.888289773 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_prime.h
@@ -0,0 +1,34 @@ @@ -0,0 +1,34 @@
+#ifndef __IP_SET_PRIME_H +#ifndef __IP_SET_PRIME_H
+#define __IP_SET_PRIME_H +#define __IP_SET_PRIME_H
@ -1071,8 +1071,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_prime.h
+#endif /* __IP_SET_PRIME_H */ +#endif /* __IP_SET_PRIME_H */
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_set.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_set.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_set.h 2007-12-15 05:20:07.888289773 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_set.h
@@ -0,0 +1,21 @@ @@ -0,0 +1,21 @@
+#ifndef _IPT_SET_H +#ifndef _IPT_SET_H
+#define _IPT_SET_H +#define _IPT_SET_H
@ -1097,9 +1097,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_set.h
+#endif /*_IPT_SET_H*/ +#endif /*_IPT_SET_H*/
Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:07.568271536 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:07.892290000 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
@@ -22,6 +22,20 @@ @@ -22,6 +22,20 @@ tristate 'IP tables support (required fo
if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; then if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; then
# The simple matches. # The simple matches.
dep_tristate ' limit match support' CONFIG_IP_NF_MATCH_LIMIT $CONFIG_IP_NF_IPTABLES dep_tristate ' limit match support' CONFIG_IP_NF_MATCH_LIMIT $CONFIG_IP_NF_IPTABLES
@ -1122,8 +1122,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
dep_tristate ' netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES dep_tristate ' netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set.c 2007-12-15 05:20:07.892290000 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_set.c
@@ -0,0 +1,2002 @@ @@ -0,0 +1,2002 @@
+/* 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>
@ -3129,8 +3129,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_iphash.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_iphash.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_iphash.c 2007-12-15 05:20:07.896290225 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_iphash.c
@@ -0,0 +1,379 @@ @@ -0,0 +1,379 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ * + *
@ -3513,8 +3513,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_iphash.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_ipmap.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_ipmap.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_ipmap.c 2007-12-15 05:20:07.896290225 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_ipmap.c
@@ -0,0 +1,314 @@ @@ -0,0 +1,314 @@
+/* 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>
@ -3832,8 +3832,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_ipmap.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_iptree.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_iptree.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_iptree.c 2007-12-15 05:20:07.896290225 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_iptree.c
@@ -0,0 +1,511 @@ @@ -0,0 +1,511 @@
+/* Copyright (C) 2005 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> +/* Copyright (C) 2005 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ * + *
@ -4348,8 +4348,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_iptree.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_macipmap.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_macipmap.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_macipmap.c 2007-12-15 05:20:07.896290225 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_macipmap.c
@@ -0,0 +1,340 @@ @@ -0,0 +1,340 @@
+/* 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>
@ -4693,8 +4693,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_macipmap.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_nethash.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_nethash.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_nethash.c 2007-12-15 05:20:07.900290454 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_nethash.c
@@ -0,0 +1,450 @@ @@ -0,0 +1,450 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ * + *
@ -5148,8 +5148,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_nethash.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_portmap.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_portmap.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_portmap.c 2007-12-15 05:20:07.900290454 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_portmap.c
@@ -0,0 +1,321 @@ @@ -0,0 +1,321 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ * + *
@ -5474,8 +5474,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_portmap.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_set.c Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_set.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_set.c 2007-12-15 05:20:07.900290454 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ipt_set.c
@@ -0,0 +1,114 @@ @@ -0,0 +1,114 @@
+/* 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>
@ -5593,8 +5593,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_set.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_SET.c Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_SET.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_SET.c 2007-12-15 05:20:07.900290454 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ipt_SET.c
@@ -0,0 +1,127 @@ @@ -0,0 +1,127 @@
+/* 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>
@ -5725,9 +5725,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_SET.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:07.568271536 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:07.900290454 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
@@ -75,6 +75,18 @@ @@ -75,6 +75,18 @@ obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o
obj-$(CONFIG_IP_NF_MATCH_HELPER) += ipt_helper.o obj-$(CONFIG_IP_NF_MATCH_HELPER) += ipt_helper.o
obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o
obj-$(CONFIG_IP_NF_MATCH_MARK) += ipt_mark.o obj-$(CONFIG_IP_NF_MATCH_MARK) += ipt_mark.o

36
target/linux/generic-2.4/patches/609-netfilter_string.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_string.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_string.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_string.h 2007-12-15 05:20:08.388318268 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_string.h
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
+#ifndef _IPT_STRING_H +#ifndef _IPT_STRING_H
+#define _IPT_STRING_H +#define _IPT_STRING_H
@ -23,9 +23,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_string.h
+#endif /*_IPT_STRING_H*/ +#endif /*_IPT_STRING_H*/
Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:07.892290000 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:08.396318720 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
@@ -63,6 +63,7 @@ @@ -63,6 +63,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
fi fi
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
dep_tristate ' Unclean match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_UNCLEAN $CONFIG_IP_NF_IPTABLES dep_tristate ' Unclean match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_UNCLEAN $CONFIG_IP_NF_IPTABLES
@ -35,8 +35,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
dep_mbool ' Layer 7 debugging output (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_LAYER7_DEBUG $CONFIG_IP_NF_MATCH_LAYER7 dep_mbool ' Layer 7 debugging output (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_LAYER7_DEBUG $CONFIG_IP_NF_MATCH_LAYER7
Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_string.c Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_string.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_string.c 2007-12-15 05:20:08.400318949 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ipt_string.c
@@ -0,0 +1,99 @@ @@ -0,0 +1,99 @@
+/* String matching match for iptables +/* String matching match for iptables
+ * + *
@ -139,9 +139,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_string.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:07.900290454 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:08.400318949 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
@@ -108,6 +108,7 @@ @@ -108,6 +108,7 @@ obj-$(CONFIG_IP_NF_MATCH_STATE) += ipt_s
obj-$(CONFIG_IP_NF_MATCH_CONNMARK) += ipt_connmark.o obj-$(CONFIG_IP_NF_MATCH_CONNMARK) += ipt_connmark.o
obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += ipt_conntrack.o obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += ipt_conntrack.o
obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt_unclean.o obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt_unclean.o
@ -151,8 +151,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.c Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.c 2007-12-15 05:20:08.400318949 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.c
@@ -0,0 +1,305 @@ @@ -0,0 +1,305 @@
+/* +/*
+ * lib/textsearch.c Generic text search interface + * lib/textsearch.c Generic text search interface
@ -461,8 +461,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.c
+ +
Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.h Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.h 2007-12-15 05:20:08.400318949 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.h
@@ -0,0 +1,182 @@ @@ -0,0 +1,182 @@
+#ifndef __LINUX_TEXTSEARCH_H +#ifndef __LINUX_TEXTSEARCH_H
+#define __LINUX_TEXTSEARCH_H +#define __LINUX_TEXTSEARCH_H
@ -648,8 +648,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.h
+#endif +#endif
Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_bm.c Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_bm.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_bm.c 2007-12-15 05:20:08.400318949 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_bm.c
@@ -0,0 +1,190 @@ @@ -0,0 +1,190 @@
+/* +/*
+ * lib/ts_bm.c Boyer-Moore text search implementation + * lib/ts_bm.c Boyer-Moore text search implementation
@ -843,8 +843,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_bm.c
+} +}
Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_kmp.c Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_kmp.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_kmp.c 2007-12-15 05:20:08.404319178 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_kmp.c
@@ -0,0 +1,141 @@ @@ -0,0 +1,141 @@
+/* +/*
+ * lib/ts_kmp.c Knuth-Morris-Pratt text search implementation + * lib/ts_kmp.c Knuth-Morris-Pratt text search implementation

82
target/linux/generic-2.4/patches/610-netfilter_connbytes.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:08.396318720 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:08.692335591 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
@@ -11,6 +11,8 @@ @@ -11,6 +11,8 @@ if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ];
dep_tristate ' Amanda protocol support' CONFIG_IP_NF_AMANDA $CONFIG_IP_NF_CONNTRACK dep_tristate ' Amanda protocol support' CONFIG_IP_NF_AMANDA $CONFIG_IP_NF_CONNTRACK
dep_tristate ' TFTP protocol support' CONFIG_IP_NF_TFTP $CONFIG_IP_NF_CONNTRACK dep_tristate ' TFTP protocol support' CONFIG_IP_NF_TFTP $CONFIG_IP_NF_CONNTRACK
dep_tristate ' IRC protocol support' CONFIG_IP_NF_IRC $CONFIG_IP_NF_CONNTRACK dep_tristate ' IRC protocol support' CONFIG_IP_NF_IRC $CONFIG_IP_NF_CONNTRACK
@ -13,9 +13,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
fi fi
Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:08.400318949 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:08.696335817 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
@@ -106,6 +106,7 @@ @@ -106,6 +106,7 @@ obj-$(CONFIG_IP_NF_MATCH_LENGTH) += ipt_
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
obj-$(CONFIG_IP_NF_MATCH_STATE) += ipt_state.o obj-$(CONFIG_IP_NF_MATCH_STATE) += ipt_state.o
obj-$(CONFIG_IP_NF_MATCH_CONNMARK) += ipt_connmark.o obj-$(CONFIG_IP_NF_MATCH_CONNMARK) += ipt_connmark.o
@ -25,9 +25,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
obj-$(CONFIG_IP_NF_MATCH_STRING) += ipt_string.o obj-$(CONFIG_IP_NF_MATCH_STRING) += ipt_string.o
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_amanda.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_amanda.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_amanda.c 2007-12-15 05:19:37.650566622 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_amanda.c
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_amanda.c 2007-12-15 05:20:08.700336046 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_amanda.c
@@ -75,7 +75,7 @@ @@ -75,7 +75,7 @@ static int help(const struct iphdr *iph,
/* increase the UDP timeout of the master connection as replies from /* increase the UDP timeout of the master connection as replies from
* Amanda clients to the server can be quite delayed */ * Amanda clients to the server can be quite delayed */
@ -38,9 +38,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_amanda.c
do { do {
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_tcp.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_tcp.c 2007-12-15 05:19:37.658567077 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_tcp.c 2007-12-15 05:20:08.700336046 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
@@ -211,7 +211,7 @@ @@ -211,7 +211,7 @@ static int tcp_packet(struct ip_conntrac
set_bit(IPS_ASSURED_BIT, &conntrack->status); set_bit(IPS_ASSURED_BIT, &conntrack->status);
WRITE_UNLOCK(&tcp_lock); WRITE_UNLOCK(&tcp_lock);
@ -51,9 +51,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
return NF_ACCEPT; return NF_ACCEPT;
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_udp.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_udp.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_udp.c 2007-12-15 05:19:37.666567533 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_udp.c
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_udp.c 2007-12-15 05:20:08.700336046 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_udp.c
@@ -47,16 +47,16 @@ @@ -47,16 +47,16 @@ static unsigned int udp_print_conntrack(
/* Returns verdict for packet, and may modify conntracktype */ /* Returns verdict for packet, and may modify conntracktype */
static int udp_packet(struct ip_conntrack *conntrack, static int udp_packet(struct ip_conntrack *conntrack,
struct iphdr *iph, size_t len, struct iphdr *iph, size_t len,
@ -75,9 +75,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_udp.c
} }
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_standalone.c 2007-12-15 05:20:07.568271536 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_standalone.c
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c 2007-12-15 05:20:08.700336046 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
@@ -79,6 +79,18 @@ @@ -79,6 +79,18 @@ print_expect(char *buffer, const struct
return len; return len;
} }
@ -96,7 +96,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
static unsigned int static unsigned int
print_conntrack(char *buffer, struct ip_conntrack *conntrack) print_conntrack(char *buffer, struct ip_conntrack *conntrack)
{ {
@@ -98,11 +110,15 @@ @@ -98,11 +110,15 @@ print_conntrack(char *buffer, struct ip_
len += print_tuple(buffer + len, len += print_tuple(buffer + len,
&conntrack->tuplehash[IP_CT_DIR_ORIGINAL].tuple, &conntrack->tuplehash[IP_CT_DIR_ORIGINAL].tuple,
proto); proto);
@ -112,7 +112,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
if (test_bit(IPS_ASSURED_BIT, &conntrack->status)) if (test_bit(IPS_ASSURED_BIT, &conntrack->status))
len += sprintf(buffer + len, "[ASSURED] "); len += sprintf(buffer + len, "[ASSURED] ");
len += sprintf(buffer + len, "use=%u ", len += sprintf(buffer + len, "use=%u ",
@@ -478,7 +494,7 @@ @@ -478,7 +494,7 @@ EXPORT_SYMBOL(ip_conntrack_get);
EXPORT_SYMBOL(ip_conntrack_helper_register); EXPORT_SYMBOL(ip_conntrack_helper_register);
EXPORT_SYMBOL(ip_conntrack_helper_unregister); EXPORT_SYMBOL(ip_conntrack_helper_unregister);
EXPORT_SYMBOL(ip_ct_iterate_cleanup); EXPORT_SYMBOL(ip_ct_iterate_cleanup);
@ -123,9 +123,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
EXPORT_SYMBOL(ip_ct_find_helper); EXPORT_SYMBOL(ip_ct_find_helper);
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_generic.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_generic.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_generic.c 2007-12-15 05:19:37.682568446 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_generic.c
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_generic.c 2007-12-15 05:20:08.700336046 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_generic.c
@@ -41,9 +41,9 @@ @@ -41,9 +41,9 @@ static unsigned int generic_print_conntr
/* Returns verdict for packet, or -1 for invalid. */ /* Returns verdict for packet, or -1 for invalid. */
static int established(struct ip_conntrack *conntrack, static int established(struct ip_conntrack *conntrack,
struct iphdr *iph, size_t len, struct iphdr *iph, size_t len,
@ -139,9 +139,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_generic.c
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_icmp.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_icmp.c 2007-12-15 05:19:37.686568672 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_icmp.c 2007-12-15 05:20:08.704336275 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@ static int icmp_packet(struct ip_conntra
ct->timeout.function((unsigned long)ct); ct->timeout.function((unsigned long)ct);
} else { } else {
atomic_inc(&ct->proto.icmp.count); atomic_inc(&ct->proto.icmp.count);
@ -152,9 +152,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
return NF_ACCEPT; return NF_ACCEPT;
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c 2007-12-15 05:20:07.568271536 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c 2007-12-15 05:20:08.704336275 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
@@ -1196,22 +1196,40 @@ @@ -1196,22 +1196,40 @@ void ip_conntrack_helper_unregister(stru
MOD_DEC_USE_COUNT; MOD_DEC_USE_COUNT;
} }
@ -200,9 +200,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
} }
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:20:07.552270623 +0100 --- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:20:08.704336275 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -164,6 +164,12 @@ @@ -164,6 +164,12 @@ struct ip_conntrack_expect
union ip_conntrack_expect_help help; union ip_conntrack_expect_help help;
}; };
@ -215,7 +215,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
struct ip_conntrack_helper; struct ip_conntrack_helper;
struct ip_conntrack struct ip_conntrack
@@ -181,6 +187,12 @@ @@ -181,6 +187,12 @@ struct ip_conntrack
/* Timer function; drops refcnt when it goes off. */ /* Timer function; drops refcnt when it goes off. */
struct timer_list timeout; struct timer_list timeout;
@ -228,7 +228,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
/* If we're expecting another related connection, this will be /* If we're expecting another related connection, this will be
in expected linked list */ in expected linked list */
struct list_head sibling_list; struct list_head sibling_list;
@@ -264,8 +276,10 @@ @@ -264,8 +276,10 @@ extern int invert_tuplepr(struct ip_conn
const struct ip_conntrack_tuple *orig); const struct ip_conntrack_tuple *orig);
/* Refresh conntrack for this many jiffies */ /* Refresh conntrack for this many jiffies */
@ -243,8 +243,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
/* Call me when a conntrack is destroyed. */ /* Call me when a conntrack is destroyed. */
Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_connbytes.c Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_connbytes.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_connbytes.c 2007-12-15 05:20:08.704336275 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ipt_connbytes.c
@@ -0,0 +1,163 @@ @@ -0,0 +1,163 @@
+/* Kernel module to match connection tracking byte counter. +/* Kernel module to match connection tracking byte counter.
+ * GPL (C) 2002 Martin Devera (devik@cdi.cz). + * GPL (C) 2002 Martin Devera (devik@cdi.cz).
@ -411,8 +411,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_connbytes.c
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connbytes.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connbytes.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connbytes.h 2007-12-15 05:20:08.708336505 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connbytes.h
@@ -0,0 +1,25 @@ @@ -0,0 +1,25 @@
+#ifndef _IPT_CONNBYTES_H +#ifndef _IPT_CONNBYTES_H
+#define _IPT_CONNBYTES_H +#define _IPT_CONNBYTES_H
@ -441,9 +441,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connbytes.h
+#endif +#endif
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_gre.c 2007-12-15 05:20:06.404205198 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_gre.c
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c 2007-12-15 05:20:08.708336505 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c
@@ -237,16 +237,16 @@ @@ -237,16 +237,16 @@ static unsigned int gre_print_conntrack(
/* Returns verdict for packet, and may modify conntrack */ /* Returns verdict for packet, and may modify conntrack */
static int gre_packet(struct ip_conntrack *ct, static int gre_packet(struct ip_conntrack *ct,
struct iphdr *iph, size_t len, struct iphdr *iph, size_t len,

48
target/linux/generic-2.4/patches/611-netfilter_condition.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/Documentation/Configure.help Index: linux-2.4.35.4/Documentation/Configure.help
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:20:07.880289314 +0100 --- linux-2.4.35.4.orig/Documentation/Configure.help
+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:20:09.280369103 +0100 +++ linux-2.4.35.4/Documentation/Configure.help
@@ -2979,6 +2979,14 @@ @@ -2979,6 +2979,14 @@ CONFIG_IP_NF_MATCH_TOS
If you want to compile it as a module, say M here and read If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'. <file:Documentation/modules.txt>. If unsure, say `N'.
@ -17,7 +17,7 @@ Index: linux-2.4.35.4/Documentation/Configure.help
conntrack match support conntrack match support
CONFIG_IP_NF_MATCH_CONNTRACK CONFIG_IP_NF_MATCH_CONNTRACK
This is a general conntrack match module, a superset of the state match. This is a general conntrack match module, a superset of the state match.
@@ -3354,6 +3362,14 @@ @@ -3354,6 +3362,14 @@ CONFIG_IP6_NF_MATCH_MARK
If you want to compile it as a module, say M here and read If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'. <file:Documentation/modules.txt>. If unsure, say `N'.
@ -34,8 +34,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help
Multiport matching allows you to match TCP or UDP packets based on Multiport matching allows you to match TCP or UDP packets based on
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_condition.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_condition.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_condition.h 2007-12-15 05:20:09.296370013 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_condition.h
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+#ifndef __IPT_CONDITION_MATCH__ +#ifndef __IPT_CONDITION_MATCH__
+#define __IPT_CONDITION_MATCH__ +#define __IPT_CONDITION_MATCH__
@ -50,8 +50,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_condition.h
+#endif +#endif
Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_condition.h Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_condition.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_condition.h 2007-12-15 05:20:09.300370243 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_condition.h
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+#ifndef __IP6T_CONDITION_MATCH__ +#ifndef __IP6T_CONDITION_MATCH__
+#define __IP6T_CONDITION_MATCH__ +#define __IP6T_CONDITION_MATCH__
@ -66,9 +66,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_condition.h
+#endif +#endif
Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:08.692335591 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:09.300370243 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
@@ -43,6 +43,7 @@ @@ -43,6 +43,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
dep_tristate ' netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES dep_tristate ' netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES
dep_tristate ' Multiple port match support' CONFIG_IP_NF_MATCH_MULTIPORT $CONFIG_IP_NF_IPTABLES dep_tristate ' Multiple port match support' CONFIG_IP_NF_MATCH_MULTIPORT $CONFIG_IP_NF_IPTABLES
dep_tristate ' TOS match support' CONFIG_IP_NF_MATCH_TOS $CONFIG_IP_NF_IPTABLES dep_tristate ' TOS match support' CONFIG_IP_NF_MATCH_TOS $CONFIG_IP_NF_IPTABLES
@ -78,9 +78,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
dep_tristate ' peer to peer traffic match support' CONFIG_IP_NF_MATCH_IPP2P $CONFIG_IP_NF_IPTABLES dep_tristate ' peer to peer traffic match support' CONFIG_IP_NF_MATCH_IPP2P $CONFIG_IP_NF_IPTABLES
Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:08.696335817 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:09.300370243 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
@@ -94,6 +94,7 @@ @@ -94,6 +94,7 @@ obj-$(CONFIG_IP_NF_MATCH_PKTTYPE) += ipt
obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.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
@ -90,8 +90,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_condition.c Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_condition.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_condition.c 2007-12-15 05:20:09.300370243 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ipt_condition.c
@@ -0,0 +1,256 @@ @@ -0,0 +1,256 @@
+/*-------------------------------------------*\ +/*-------------------------------------------*\
+| Netfilter Condition Module | +| Netfilter Condition Module |
@ -351,9 +351,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_condition.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in 2007-12-15 05:19:37.590563202 +0100 --- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in
+++ linux-2.4.35.4/net/ipv6/netfilter/Config.in 2007-12-15 05:20:09.300370243 +0100 +++ linux-2.4.35.4/net/ipv6/netfilter/Config.in
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@ tristate 'IP6 tables support (required f
if [ "$CONFIG_IP6_NF_IPTABLES" != "n" ]; then if [ "$CONFIG_IP6_NF_IPTABLES" != "n" ]; then
# The simple matches. # The simple matches.
dep_tristate ' limit match support' CONFIG_IP6_NF_MATCH_LIMIT $CONFIG_IP6_NF_IPTABLES dep_tristate ' limit match support' CONFIG_IP6_NF_MATCH_LIMIT $CONFIG_IP6_NF_IPTABLES
@ -363,9 +363,9 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in
dep_tristate ' Routing header match support (EXPERIMENTAL)' CONFIG_IP6_NF_MATCH_RT $CONFIG_IP6_NF_IPTABLES dep_tristate ' Routing header match support (EXPERIMENTAL)' CONFIG_IP6_NF_MATCH_RT $CONFIG_IP6_NF_IPTABLES
Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile 2007-12-15 05:19:37.598563658 +0100 --- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile
+++ linux-2.4.35.4/net/ipv6/netfilter/Makefile 2007-12-15 05:20:09.304370470 +0100 +++ linux-2.4.35.4/net/ipv6/netfilter/Makefile
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@ export-objs := ip6_tables.o
# Link order matters here. # Link order matters here.
obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o
obj-$(CONFIG_IP6_NF_MATCH_LIMIT) += ip6t_limit.o obj-$(CONFIG_IP6_NF_MATCH_LIMIT) += ip6t_limit.o
@ -375,8 +375,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile
obj-$(CONFIG_IP6_NF_MATCH_MAC) += ip6t_mac.o obj-$(CONFIG_IP6_NF_MATCH_MAC) += ip6t_mac.o
Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_condition.c Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_condition.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_condition.c 2007-12-15 05:20:09.304370470 +0100 +++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_condition.c
@@ -0,0 +1,254 @@ @@ -0,0 +1,254 @@
+/*-------------------------------------------*\ +/*-------------------------------------------*\
+| Netfilter Condition Module for IPv6 | +| Netfilter Condition Module for IPv6 |

26
target/linux/generic-2.4/patches/612-netfilter_quota.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/Documentation/Configure.help Index: linux-2.4.35.4/Documentation/Configure.help
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:20:09.280369103 +0100 --- linux-2.4.35.4.orig/Documentation/Configure.help
+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:20:09.632389161 +0100 +++ linux-2.4.35.4/Documentation/Configure.help
@@ -2888,6 +2888,13 @@ @@ -2888,6 +2888,13 @@ CONFIG_IP_NF_MATCH_LIMIT
If you want to compile it as a module, say M here and read If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'. <file:Documentation/modules.txt>. If unsure, say `N'.
@ -18,8 +18,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help
This patch allows you to match packet in accrodance This patch allows you to match packet in accrodance
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_quota.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_quota.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_quota.h 2007-12-15 05:20:09.636389390 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_quota.h
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
+#ifndef _IPT_QUOTA_H +#ifndef _IPT_QUOTA_H
+#define _IPT_QUOTA_H +#define _IPT_QUOTA_H
@ -35,9 +35,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_quota.h
+#endif /*_IPT_QUOTA_H*/ +#endif /*_IPT_QUOTA_H*/
Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:09.300370243 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:09.644389846 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@ tristate 'IP tables support (required fo
if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; then if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; then
# The simple matches. # The simple matches.
dep_tristate ' limit match support' CONFIG_IP_NF_MATCH_LIMIT $CONFIG_IP_NF_IPTABLES dep_tristate ' limit match support' CONFIG_IP_NF_MATCH_LIMIT $CONFIG_IP_NF_IPTABLES
@ -47,9 +47,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
if [ "$CONFIG_IP_NF_SET" != "n" ]; then if [ "$CONFIG_IP_NF_SET" != "n" ]; then
Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:09.300370243 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:09.644389846 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
@@ -74,6 +74,7 @@ @@ -74,6 +74,7 @@ obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o
# matches # matches
obj-$(CONFIG_IP_NF_MATCH_HELPER) += ipt_helper.o obj-$(CONFIG_IP_NF_MATCH_HELPER) += ipt_helper.o
obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o
@ -59,8 +59,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
obj-$(CONFIG_IP_NF_TARGET_SET) += ipt_SET.o obj-$(CONFIG_IP_NF_TARGET_SET) += ipt_SET.o
Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_quota.c Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_quota.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_quota.c 2007-12-15 05:20:09.644389846 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ipt_quota.c
@@ -0,0 +1,88 @@ @@ -0,0 +1,88 @@
+/* +/*
+ * netfilter module to enforce network quotas + * netfilter module to enforce network quotas

38
target/linux/generic-2.4/patches/613-netfilter_nat_h323.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:09.644389846 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:09.916405347 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@ if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ];
dep_tristate ' Connection byte counter support' CONFIG_IP_NF_MATCH_CONNBYTES $CONFIG_IP_NF_CT_ACCT $CONFIG_IP_NF_CONNTRACK $CONFIG_IP_NF_IPTABLES dep_tristate ' Connection byte counter support' CONFIG_IP_NF_MATCH_CONNBYTES $CONFIG_IP_NF_CT_ACCT $CONFIG_IP_NF_CONNTRACK $CONFIG_IP_NF_IPTABLES
dep_tristate ' GRE protocol support' CONFIG_IP_NF_CT_PROTO_GRE $CONFIG_IP_NF_CONNTRACK dep_tristate ' GRE protocol support' CONFIG_IP_NF_CT_PROTO_GRE $CONFIG_IP_NF_CONNTRACK
dep_tristate ' PPTP protocol support' CONFIG_IP_NF_PPTP $CONFIG_IP_NF_CT_PROTO_GRE dep_tristate ' PPTP protocol support' CONFIG_IP_NF_PPTP $CONFIG_IP_NF_CT_PROTO_GRE
@ -10,7 +10,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
fi fi
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
@@ -110,6 +111,13 @@ @@ -110,6 +111,13 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
define_tristate CONFIG_IP_NF_NAT_AMANDA $CONFIG_IP_NF_NAT define_tristate CONFIG_IP_NF_NAT_AMANDA $CONFIG_IP_NF_NAT
fi fi
fi fi
@ -26,9 +26,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
fi fi
Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:09.644389846 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:09.916405347 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
@@ -53,6 +53,10 @@ @@ -53,6 +53,10 @@ obj-$(CONFIG_IP_NF_PPTP) += ip_conntrack
ifdef CONFIG_IP_NF_NAT_PPTP ifdef CONFIG_IP_NF_NAT_PPTP
export-objs += ip_conntrack_pptp.o export-objs += ip_conntrack_pptp.o
endif endif
@ -39,7 +39,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
# NAT helpers # NAT helpers
@@ -62,6 +66,7 @@ @@ -62,6 +66,7 @@ obj-$(CONFIG_IP_NF_NAT_FTP) += ip_nat_ft
obj-$(CONFIG_IP_NF_NAT_IRC) += ip_nat_irc.o obj-$(CONFIG_IP_NF_NAT_IRC) += ip_nat_irc.o
obj-$(CONFIG_IP_NF_NAT_PROTO_GRE) += ip_nat_proto_gre.o obj-$(CONFIG_IP_NF_NAT_PROTO_GRE) += ip_nat_proto_gre.o
obj-$(CONFIG_IP_NF_NAT_PPTP) += ip_nat_pptp.o obj-$(CONFIG_IP_NF_NAT_PPTP) += ip_nat_pptp.o
@ -49,8 +49,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_h323.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_h323.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_h323.c 2007-12-15 05:20:09.920405577 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_h323.c
@@ -0,0 +1,302 @@ @@ -0,0 +1,302 @@
+/* +/*
+ * H.323 'brute force' extension for H.323 connection tracking. + * H.323 'brute force' extension for H.323 connection tracking.
@ -356,8 +356,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_h323.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_h323.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_h323.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_h323.c 2007-12-15 05:20:09.920405577 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_h323.c
@@ -0,0 +1,403 @@ @@ -0,0 +1,403 @@
+/* +/*
+ * H.323 'brute force' extension for NAT alteration. + * H.323 'brute force' extension for NAT alteration.
@ -764,9 +764,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_h323.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:20:08.704336275 +0100 --- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:20:09.920405577 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -71,6 +71,7 @@ @@ -71,6 +71,7 @@ union ip_conntrack_expect_proto {
#include <linux/netfilter_ipv4/ip_conntrack_ftp.h> #include <linux/netfilter_ipv4/ip_conntrack_ftp.h>
#include <linux/netfilter_ipv4/ip_conntrack_irc.h> #include <linux/netfilter_ipv4/ip_conntrack_irc.h>
#include <linux/netfilter_ipv4/ip_conntrack_pptp.h> #include <linux/netfilter_ipv4/ip_conntrack_pptp.h>
@ -774,7 +774,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
/* per expectation: application helper private data */ /* per expectation: application helper private data */
union ip_conntrack_expect_help { union ip_conntrack_expect_help {
@@ -79,6 +80,7 @@ @@ -79,6 +80,7 @@ union ip_conntrack_expect_help {
struct ip_ct_ftp_expect exp_ftp_info; struct ip_ct_ftp_expect exp_ftp_info;
struct ip_ct_irc_expect exp_irc_info; struct ip_ct_irc_expect exp_irc_info;
struct ip_ct_pptp_expect exp_pptp_info; struct ip_ct_pptp_expect exp_pptp_info;
@ -782,7 +782,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
#ifdef CONFIG_IP_NF_NAT_NEEDED #ifdef CONFIG_IP_NF_NAT_NEEDED
union { union {
@@ -93,6 +95,7 @@ @@ -93,6 +95,7 @@ union ip_conntrack_help {
struct ip_ct_ftp_master ct_ftp_info; struct ip_ct_ftp_master ct_ftp_info;
struct ip_ct_irc_master ct_irc_info; struct ip_ct_irc_master ct_irc_info;
struct ip_ct_pptp_master ct_pptp_info; struct ip_ct_pptp_master ct_pptp_info;
@ -792,8 +792,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
#ifdef CONFIG_IP_NF_NAT_NEEDED #ifdef CONFIG_IP_NF_NAT_NEEDED
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_h323.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_h323.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_h323.h 2007-12-15 05:20:09.920405577 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_h323.h
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
+#ifndef _IP_CONNTRACK_H323_H +#ifndef _IP_CONNTRACK_H323_H
+#define _IP_CONNTRACK_H323_H +#define _IP_CONNTRACK_H323_H

52
target/linux/generic-2.4/patches/614-netfilter_nat_rtsp.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:09.916405347 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:10.196421304 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@ if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ];
dep_tristate ' GRE protocol support' CONFIG_IP_NF_CT_PROTO_GRE $CONFIG_IP_NF_CONNTRACK dep_tristate ' GRE protocol support' CONFIG_IP_NF_CT_PROTO_GRE $CONFIG_IP_NF_CONNTRACK
dep_tristate ' PPTP protocol support' CONFIG_IP_NF_PPTP $CONFIG_IP_NF_CT_PROTO_GRE dep_tristate ' PPTP protocol support' CONFIG_IP_NF_PPTP $CONFIG_IP_NF_CT_PROTO_GRE
dep_tristate ' H.323 (netmeeting) support' CONFIG_IP_NF_H323 $CONFIG_IP_NF_CONNTRACK dep_tristate ' H.323 (netmeeting) support' CONFIG_IP_NF_H323 $CONFIG_IP_NF_CONNTRACK
@ -10,7 +10,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
fi fi
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
@@ -118,6 +119,13 @@ @@ -118,6 +119,13 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
define_tristate CONFIG_IP_NF_NAT_H323 $CONFIG_IP_NF_NAT define_tristate CONFIG_IP_NF_NAT_H323 $CONFIG_IP_NF_NAT
fi fi
fi fi
@ -26,9 +26,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
fi fi
Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:09.916405347 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:10.196421304 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
@@ -57,6 +57,11 @@ @@ -57,6 +57,11 @@ obj-$(CONFIG_IP_NF_H323) += ip_conntrack
ifdef CONFIG_IP_NF_NAT_H323 ifdef CONFIG_IP_NF_NAT_H323
export-objs += ip_conntrack_h323.o export-objs += ip_conntrack_h323.o
endif endif
@ -40,7 +40,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
# NAT helpers # NAT helpers
@@ -67,6 +72,7 @@ @@ -67,6 +72,7 @@ obj-$(CONFIG_IP_NF_NAT_IRC) += ip_nat_ir
obj-$(CONFIG_IP_NF_NAT_PROTO_GRE) += ip_nat_proto_gre.o obj-$(CONFIG_IP_NF_NAT_PROTO_GRE) += ip_nat_proto_gre.o
obj-$(CONFIG_IP_NF_NAT_PPTP) += ip_nat_pptp.o obj-$(CONFIG_IP_NF_NAT_PPTP) += ip_nat_pptp.o
obj-$(CONFIG_IP_NF_NAT_H323) += ip_nat_h323.o obj-$(CONFIG_IP_NF_NAT_H323) += ip_nat_h323.o
@ -50,8 +50,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c 2007-12-15 05:20:10.200421534 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c
@@ -0,0 +1,507 @@ @@ -0,0 +1,507 @@
+/* +/*
+ * RTSP extension for IP connection tracking + * RTSP extension for IP connection tracking
@ -562,8 +562,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c 2007-12-15 05:20:10.200421534 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c
@@ -0,0 +1,621 @@ @@ -0,0 +1,621 @@
+/* +/*
+ * RTSP extension for TCP NAT alteration + * RTSP extension for TCP NAT alteration
@ -1188,9 +1188,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/arch/mips/kernel/mips_ksyms.c 2007-12-15 05:19:54.695537960 +0100 --- linux-2.4.35.4.orig/arch/mips/kernel/mips_ksyms.c
+++ linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c 2007-12-15 05:20:10.200421534 +0100 +++ linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c
@@ -52,6 +52,7 @@ @@ -52,6 +52,7 @@ EXPORT_SYMBOL(EISA_bus);
/* /*
* String functions * String functions
*/ */
@ -1200,8 +1200,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c
EXPORT_SYMBOL_NOVERS(memcpy); EXPORT_SYMBOL_NOVERS(memcpy);
Index: linux-2.4.35.4/include/linux/netfilter_helpers.h Index: linux-2.4.35.4/include/linux/netfilter_helpers.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_helpers.h 2007-12-15 05:20:10.200421534 +0100 +++ linux-2.4.35.4/include/linux/netfilter_helpers.h
@@ -0,0 +1,133 @@ @@ -0,0 +1,133 @@
+/* +/*
+ * Helpers for netfiler modules. This file provides implementations for basic + * Helpers for netfiler modules. This file provides implementations for basic
@ -1338,8 +1338,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_helpers.h
+#endif /* _NETFILTER_HELPERS_H */ +#endif /* _NETFILTER_HELPERS_H */
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h 2007-12-15 05:20:10.200421534 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h
@@ -0,0 +1,68 @@ @@ -0,0 +1,68 @@
+/* +/*
+ * RTSP extension for IP connection tracking. + * RTSP extension for IP connection tracking.
@ -1411,8 +1411,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h
+#endif /* _IP_CONNTRACK_RTSP_H */ +#endif /* _IP_CONNTRACK_RTSP_H */
Index: linux-2.4.35.4/include/linux/netfilter_mime.h Index: linux-2.4.35.4/include/linux/netfilter_mime.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_mime.h 2007-12-15 05:20:10.204421761 +0100 +++ linux-2.4.35.4/include/linux/netfilter_mime.h
@@ -0,0 +1,90 @@ @@ -0,0 +1,90 @@
+/* +/*
+ * MIME functions for netfilter modules. This file provides implementations + * MIME functions for netfilter modules. This file provides implementations
@ -1506,9 +1506,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_mime.h
+#endif /* _NETFILTER_MIME_H */ +#endif /* _NETFILTER_MIME_H */
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:20:09.920405577 +0100 --- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:20:10.204421761 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -72,6 +72,7 @@ @@ -72,6 +72,7 @@ union ip_conntrack_expect_proto {
#include <linux/netfilter_ipv4/ip_conntrack_irc.h> #include <linux/netfilter_ipv4/ip_conntrack_irc.h>
#include <linux/netfilter_ipv4/ip_conntrack_pptp.h> #include <linux/netfilter_ipv4/ip_conntrack_pptp.h>
#include <linux/netfilter_ipv4/ip_conntrack_h323.h> #include <linux/netfilter_ipv4/ip_conntrack_h323.h>
@ -1516,7 +1516,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
/* per expectation: application helper private data */ /* per expectation: application helper private data */
union ip_conntrack_expect_help { union ip_conntrack_expect_help {
@@ -81,6 +82,7 @@ @@ -81,6 +82,7 @@ union ip_conntrack_expect_help {
struct ip_ct_irc_expect exp_irc_info; struct ip_ct_irc_expect exp_irc_info;
struct ip_ct_pptp_expect exp_pptp_info; struct ip_ct_pptp_expect exp_pptp_info;
struct ip_ct_h225_expect exp_h225_info; struct ip_ct_h225_expect exp_h225_info;
@ -1524,7 +1524,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
#ifdef CONFIG_IP_NF_NAT_NEEDED #ifdef CONFIG_IP_NF_NAT_NEEDED
union { union {
@@ -96,6 +98,7 @@ @@ -96,6 +98,7 @@ union ip_conntrack_help {
struct ip_ct_irc_master ct_irc_info; struct ip_ct_irc_master ct_irc_info;
struct ip_ct_pptp_master ct_pptp_info; struct ip_ct_pptp_master ct_pptp_info;
struct ip_ct_h225_master ct_h225_info; struct ip_ct_h225_master ct_h225_info;

38
target/linux/generic-2.4/patches/615-netfilter_nat_mms.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:10.196421304 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:10.504438857 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@ if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ];
dep_tristate ' PPTP protocol support' CONFIG_IP_NF_PPTP $CONFIG_IP_NF_CT_PROTO_GRE dep_tristate ' PPTP protocol support' CONFIG_IP_NF_PPTP $CONFIG_IP_NF_CT_PROTO_GRE
dep_tristate ' H.323 (netmeeting) support' CONFIG_IP_NF_H323 $CONFIG_IP_NF_CONNTRACK dep_tristate ' H.323 (netmeeting) support' CONFIG_IP_NF_H323 $CONFIG_IP_NF_CONNTRACK
dep_tristate ' RTSP protocol support' CONFIG_IP_NF_RTSP $CONFIG_IP_NF_CONNTRACK dep_tristate ' RTSP protocol support' CONFIG_IP_NF_RTSP $CONFIG_IP_NF_CONNTRACK
@ -10,7 +10,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
fi fi
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
@@ -126,6 +127,13 @@ @@ -126,6 +127,13 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
define_tristate CONFIG_IP_NF_NAT_RTSP $CONFIG_IP_NF_NAT define_tristate CONFIG_IP_NF_NAT_RTSP $CONFIG_IP_NF_NAT
fi fi
fi fi
@ -26,9 +26,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
fi fi
Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:10.196421304 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:10.508439083 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
@@ -61,6 +61,10 @@ @@ -61,6 +61,10 @@ obj-$(CONFIG_IP_NF_RTSP) += ip_conntrack
ifdef CONFIG_IP_NF_NAT_RTSP ifdef CONFIG_IP_NF_NAT_RTSP
export-objs += ip_conntrack_rtsp.o export-objs += ip_conntrack_rtsp.o
endif endif
@ -39,7 +39,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
@@ -73,6 +77,7 @@ @@ -73,6 +77,7 @@ obj-$(CONFIG_IP_NF_NAT_PROTO_GRE) += ip_
obj-$(CONFIG_IP_NF_NAT_PPTP) += ip_nat_pptp.o obj-$(CONFIG_IP_NF_NAT_PPTP) += ip_nat_pptp.o
obj-$(CONFIG_IP_NF_NAT_H323) += ip_nat_h323.o obj-$(CONFIG_IP_NF_NAT_H323) += ip_nat_h323.o
obj-$(CONFIG_IP_NF_NAT_RTSP) += ip_nat_rtsp.o obj-$(CONFIG_IP_NF_NAT_RTSP) += ip_nat_rtsp.o
@ -49,8 +49,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_mms.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_mms.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_mms.c 2007-12-15 05:20:10.516439541 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_mms.c
@@ -0,0 +1,292 @@ @@ -0,0 +1,292 @@
+/* MMS extension for IP connection tracking +/* MMS extension for IP connection tracking
+ * (C) 2002 by Filip Sneppe <filip.sneppe@cronos.be> + * (C) 2002 by Filip Sneppe <filip.sneppe@cronos.be>
@ -346,8 +346,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_mms.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_mms.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_mms.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_mms.c 2007-12-15 05:20:10.516439541 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_mms.c
@@ -0,0 +1,330 @@ @@ -0,0 +1,330 @@
+/* MMS extension for TCP NAT alteration. +/* MMS extension for TCP NAT alteration.
+ * (C) 2002 by Filip Sneppe <filip.sneppe@cronos.be> + * (C) 2002 by Filip Sneppe <filip.sneppe@cronos.be>
@ -681,9 +681,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_mms.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:20:10.204421761 +0100 --- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:20:10.516439541 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -73,6 +73,7 @@ @@ -73,6 +73,7 @@ union ip_conntrack_expect_proto {
#include <linux/netfilter_ipv4/ip_conntrack_pptp.h> #include <linux/netfilter_ipv4/ip_conntrack_pptp.h>
#include <linux/netfilter_ipv4/ip_conntrack_h323.h> #include <linux/netfilter_ipv4/ip_conntrack_h323.h>
#include <linux/netfilter_ipv4/ip_conntrack_rtsp.h> #include <linux/netfilter_ipv4/ip_conntrack_rtsp.h>
@ -691,7 +691,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
/* per expectation: application helper private data */ /* per expectation: application helper private data */
union ip_conntrack_expect_help { union ip_conntrack_expect_help {
@@ -83,6 +84,7 @@ @@ -83,6 +84,7 @@ union ip_conntrack_expect_help {
struct ip_ct_pptp_expect exp_pptp_info; struct ip_ct_pptp_expect exp_pptp_info;
struct ip_ct_h225_expect exp_h225_info; struct ip_ct_h225_expect exp_h225_info;
struct ip_ct_rtsp_expect exp_rtsp_info; struct ip_ct_rtsp_expect exp_rtsp_info;
@ -699,7 +699,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
#ifdef CONFIG_IP_NF_NAT_NEEDED #ifdef CONFIG_IP_NF_NAT_NEEDED
union { union {
@@ -99,6 +101,7 @@ @@ -99,6 +101,7 @@ union ip_conntrack_help {
struct ip_ct_pptp_master ct_pptp_info; struct ip_ct_pptp_master ct_pptp_info;
struct ip_ct_h225_master ct_h225_info; struct ip_ct_h225_master ct_h225_info;
struct ip_ct_rtsp_master ct_rtsp_info; struct ip_ct_rtsp_master ct_rtsp_info;
@ -709,8 +709,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
#ifdef CONFIG_IP_NF_NAT_NEEDED #ifdef CONFIG_IP_NF_NAT_NEEDED
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_mms.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_mms.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_mms.h 2007-12-15 05:20:10.516439541 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_mms.h
@@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
+#ifndef _IP_CONNTRACK_MMS_H +#ifndef _IP_CONNTRACK_MMS_H
+#define _IP_CONNTRACK_MMS_H +#define _IP_CONNTRACK_MMS_H

96
target/linux/generic-2.4/patches/616-netfilter_imq.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/Documentation/Configure.help Index: linux-2.4.35.4/Documentation/Configure.help
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:20:09.632389161 +0100 --- linux-2.4.35.4.orig/Documentation/Configure.help
+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:20:10.792455269 +0100 +++ linux-2.4.35.4/Documentation/Configure.help
@@ -3160,6 +3160,22 @@ @@ -3160,6 +3160,22 @@ CONFIG_IP_NF_TARGET_TOS
If you want to compile it as a module, say M here and read If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'. <file:Documentation/modules.txt>. If unsure, say `N'.
@ -25,7 +25,7 @@ Index: linux-2.4.35.4/Documentation/Configure.help
MARK target support MARK target support
CONFIG_IP_NF_TARGET_MARK CONFIG_IP_NF_TARGET_MARK
This option adds a `MARK' target, which allows you to create rules This option adds a `MARK' target, which allows you to create rules
@@ -9919,6 +9935,20 @@ @@ -9919,6 +9935,20 @@ CONFIG_BONDING
say M here and read <file:Documentation/modules.txt>. The module say M here and read <file:Documentation/modules.txt>. The module
will be called bonding.o. will be called bonding.o.
@ -48,9 +48,9 @@ Index: linux-2.4.35.4/Documentation/Configure.help
Say Y if you intend to use SLIP or CSLIP (compressed SLIP) to Say Y if you intend to use SLIP or CSLIP (compressed SLIP) to
Index: linux-2.4.35.4/drivers/net/Config.in Index: linux-2.4.35.4/drivers/net/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/net/Config.in 2007-12-15 05:19:54.067502171 +0100 --- linux-2.4.35.4.orig/drivers/net/Config.in
+++ linux-2.4.35.4/drivers/net/Config.in 2007-12-15 05:20:10.796455498 +0100 +++ linux-2.4.35.4/drivers/net/Config.in
@@ -7,6 +7,11 @@ @@ -7,6 +7,11 @@ source drivers/net/arcnet/Config.in
tristate 'Dummy net driver support' CONFIG_DUMMY tristate 'Dummy net driver support' CONFIG_DUMMY
tristate 'Bonding driver support' CONFIG_BONDING tristate 'Bonding driver support' CONFIG_BONDING
tristate 'EQL (serial line load balancing) support' CONFIG_EQUALIZER tristate 'EQL (serial line load balancing) support' CONFIG_EQUALIZER
@ -64,9 +64,9 @@ Index: linux-2.4.35.4/drivers/net/Config.in
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
Index: linux-2.4.35.4/drivers/net/Makefile Index: linux-2.4.35.4/drivers/net/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/net/Makefile 2007-12-15 05:19:51.931380439 +0100 --- linux-2.4.35.4.orig/drivers/net/Makefile
+++ linux-2.4.35.4/drivers/net/Makefile 2007-12-15 05:20:10.804455954 +0100 +++ linux-2.4.35.4/drivers/net/Makefile
@@ -176,6 +176,7 @@ @@ -176,6 +176,7 @@ endif
obj-$(CONFIG_STRIP) += strip.o obj-$(CONFIG_STRIP) += strip.o
obj-$(CONFIG_DUMMY) += dummy.o obj-$(CONFIG_DUMMY) += dummy.o
@ -76,8 +76,8 @@ Index: linux-2.4.35.4/drivers/net/Makefile
obj-$(CONFIG_AT1500) += lance.o obj-$(CONFIG_AT1500) += lance.o
Index: linux-2.4.35.4/drivers/net/imq.c Index: linux-2.4.35.4/drivers/net/imq.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/drivers/net/imq.c 2007-12-15 05:20:10.808456180 +0100 +++ linux-2.4.35.4/drivers/net/imq.c
@@ -0,0 +1,321 @@ @@ -0,0 +1,321 @@
+/* +/*
+ * Pseudo-driver for the intermediate queue device. + * Pseudo-driver for the intermediate queue device.
@ -402,8 +402,8 @@ Index: linux-2.4.35.4/drivers/net/imq.c
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
Index: linux-2.4.35.4/include/linux/imq.h Index: linux-2.4.35.4/include/linux/imq.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/imq.h 2007-12-15 05:20:10.808456180 +0100 +++ linux-2.4.35.4/include/linux/imq.h
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
+#ifndef _IMQ_H +#ifndef _IMQ_H
+#define _IMQ_H +#define _IMQ_H
@ -416,8 +416,8 @@ Index: linux-2.4.35.4/include/linux/imq.h
+#endif /* _IMQ_H */ +#endif /* _IMQ_H */
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_IMQ.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_IMQ.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_IMQ.h 2007-12-15 05:20:10.808456180 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_IMQ.h
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
+#ifndef _IPT_IMQ_H +#ifndef _IPT_IMQ_H
+#define _IPT_IMQ_H +#define _IPT_IMQ_H
@ -429,8 +429,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_IMQ.h
+#endif /* _IPT_IMQ_H */ +#endif /* _IPT_IMQ_H */
Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_IMQ.h Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_IMQ.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_IMQ.h 2007-12-15 05:20:10.808456180 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_IMQ.h
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
+#ifndef _IP6T_IMQ_H +#ifndef _IP6T_IMQ_H
+#define _IP6T_IMQ_H +#define _IP6T_IMQ_H
@ -442,9 +442,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_IMQ.h
+#endif /* _IP6T_IMQ_H */ +#endif /* _IP6T_IMQ_H */
Index: linux-2.4.35.4/include/linux/skbuff.h Index: linux-2.4.35.4/include/linux/skbuff.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/linux/skbuff.h 2007-12-15 05:20:05.060128604 +0100 --- linux-2.4.35.4.orig/include/linux/skbuff.h
+++ linux-2.4.35.4/include/linux/skbuff.h 2007-12-15 05:20:10.808456180 +0100 +++ linux-2.4.35.4/include/linux/skbuff.h
@@ -93,6 +93,9 @@ @@ -93,6 +93,9 @@ struct nf_ct_info {
struct nf_conntrack *master; struct nf_conntrack *master;
}; };
#endif #endif
@ -454,7 +454,7 @@ Index: linux-2.4.35.4/include/linux/skbuff.h
struct sk_buff_head { struct sk_buff_head {
/* These two members must be first. */ /* These two members must be first. */
@@ -182,7 +185,7 @@ @@ -182,7 +185,7 @@ struct sk_buff {
unsigned int len; /* Length of actual data */ unsigned int len; /* Length of actual data */
unsigned int data_len; unsigned int data_len;
unsigned int csum; /* Checksum */ unsigned int csum; /* Checksum */
@ -463,7 +463,7 @@ Index: linux-2.4.35.4/include/linux/skbuff.h
cloned, /* head may be cloned (check refcnt to be sure). */ cloned, /* head may be cloned (check refcnt to be sure). */
pkt_type, /* Packet class */ pkt_type, /* Packet class */
ip_summed; /* Driver fed us an IP checksum */ ip_summed; /* Driver fed us an IP checksum */
@@ -219,6 +222,9 @@ @@ -219,6 +222,9 @@ struct sk_buff {
#ifdef CONFIG_NET_SCHED #ifdef CONFIG_NET_SCHED
__u32 tc_index; /* traffic control index */ __u32 tc_index; /* traffic control index */
#endif #endif
@ -475,9 +475,9 @@ Index: linux-2.4.35.4/include/linux/skbuff.h
#ifdef __KERNEL__ #ifdef __KERNEL__
Index: linux-2.4.35.4/net/core/skbuff.c Index: linux-2.4.35.4/net/core/skbuff.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/core/skbuff.c 2007-12-15 05:19:37.174539496 +0100 --- linux-2.4.35.4.orig/net/core/skbuff.c
+++ linux-2.4.35.4/net/core/skbuff.c 2007-12-15 05:20:10.812456409 +0100 +++ linux-2.4.35.4/net/core/skbuff.c
@@ -202,6 +202,10 @@ @@ -202,6 +202,10 @@ struct sk_buff *alloc_skb(unsigned int s
/* Set up other state */ /* Set up other state */
skb->len = 0; skb->len = 0;
skb->cloned = 0; skb->cloned = 0;
@ -488,7 +488,7 @@ Index: linux-2.4.35.4/net/core/skbuff.c
skb->data_len = 0; skb->data_len = 0;
atomic_set(&skb->users, 1); atomic_set(&skb->users, 1);
@@ -250,6 +254,10 @@ @@ -250,6 +254,10 @@ static inline void skb_headerinit(void *
#ifdef CONFIG_NET_SCHED #ifdef CONFIG_NET_SCHED
skb->tc_index = 0; skb->tc_index = 0;
#endif #endif
@ -499,7 +499,7 @@ Index: linux-2.4.35.4/net/core/skbuff.c
} }
static void skb_drop_fraglist(struct sk_buff *skb) static void skb_drop_fraglist(struct sk_buff *skb)
@@ -400,6 +408,10 @@ @@ -400,6 +408,10 @@ struct sk_buff *skb_clone(struct sk_buff
#ifdef CONFIG_NET_SCHED #ifdef CONFIG_NET_SCHED
C(tc_index); C(tc_index);
#endif #endif
@ -510,7 +510,7 @@ Index: linux-2.4.35.4/net/core/skbuff.c
atomic_inc(&(skb_shinfo(skb)->dataref)); atomic_inc(&(skb_shinfo(skb)->dataref));
skb->cloned = 1; skb->cloned = 1;
@@ -444,6 +456,10 @@ @@ -444,6 +456,10 @@ static void copy_skb_header(struct sk_bu
#ifdef CONFIG_NET_SCHED #ifdef CONFIG_NET_SCHED
new->tc_index = old->tc_index; new->tc_index = old->tc_index;
#endif #endif
@ -523,9 +523,9 @@ Index: linux-2.4.35.4/net/core/skbuff.c
/** /**
Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:10.504438857 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:10.812456409 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
@@ -171,6 +171,7 @@ @@ -171,6 +171,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
dep_tristate ' DSCP target support' CONFIG_IP_NF_TARGET_DSCP $CONFIG_IP_NF_MANGLE dep_tristate ' DSCP target support' CONFIG_IP_NF_TARGET_DSCP $CONFIG_IP_NF_MANGLE
dep_tristate ' MARK target support' CONFIG_IP_NF_TARGET_MARK $CONFIG_IP_NF_MANGLE dep_tristate ' MARK target support' CONFIG_IP_NF_TARGET_MARK $CONFIG_IP_NF_MANGLE
@ -535,9 +535,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
dep_tristate ' CONNMARK target support' CONFIG_IP_NF_TARGET_CONNMARK $CONFIG_IP_NF_IPTABLES dep_tristate ' CONNMARK target support' CONFIG_IP_NF_TARGET_CONNMARK $CONFIG_IP_NF_IPTABLES
Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:10.508439083 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:10.812456409 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
@@ -138,6 +138,7 @@ @@ -138,6 +138,7 @@ obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TO
obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
obj-$(CONFIG_IP_NF_TARGET_DSCP) += ipt_DSCP.o obj-$(CONFIG_IP_NF_TARGET_DSCP) += ipt_DSCP.o
obj-$(CONFIG_IP_NF_TARGET_MARK) += ipt_MARK.o obj-$(CONFIG_IP_NF_TARGET_MARK) += ipt_MARK.o
@ -547,8 +547,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_IMQ.c Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_IMQ.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_IMQ.c 2007-12-15 05:20:10.812456409 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ipt_IMQ.c
@@ -0,0 +1,78 @@ @@ -0,0 +1,78 @@
+/* This target marks packets to be enqueued to an imq device */ +/* This target marks packets to be enqueued to an imq device */
+#include <linux/module.h> +#include <linux/module.h>
@ -630,9 +630,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_IMQ.c
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in 2007-12-15 05:20:09.300370243 +0100 --- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in
+++ linux-2.4.35.4/net/ipv6/netfilter/Config.in 2007-12-15 05:20:10.816456638 +0100 +++ linux-2.4.35.4/net/ipv6/netfilter/Config.in
@@ -72,6 +72,7 @@ @@ -72,6 +72,7 @@ if [ "$CONFIG_IP6_NF_IPTABLES" != "n" ];
if [ "$CONFIG_IP6_NF_MANGLE" != "n" ]; then if [ "$CONFIG_IP6_NF_MANGLE" != "n" ]; then
# dep_tristate ' TOS target support' CONFIG_IP6_NF_TARGET_TOS $CONFIG_IP_NF_MANGLE # dep_tristate ' TOS target support' CONFIG_IP6_NF_TARGET_TOS $CONFIG_IP_NF_MANGLE
dep_tristate ' MARK target support' CONFIG_IP6_NF_TARGET_MARK $CONFIG_IP6_NF_MANGLE dep_tristate ' MARK target support' CONFIG_IP6_NF_TARGET_MARK $CONFIG_IP6_NF_MANGLE
@ -642,9 +642,9 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in
fi fi
Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile 2007-12-15 05:20:09.304370470 +0100 --- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile
+++ linux-2.4.35.4/net/ipv6/netfilter/Makefile 2007-12-15 05:20:10.816456638 +0100 +++ linux-2.4.35.4/net/ipv6/netfilter/Makefile
@@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@ obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t
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
obj-$(CONFIG_IP6_NF_TARGET_MARK) += ip6t_MARK.o obj-$(CONFIG_IP6_NF_TARGET_MARK) += ip6t_MARK.o
@ -654,8 +654,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile
obj-$(CONFIG_IP6_NF_MATCH_HL) += ip6t_hl.o obj-$(CONFIG_IP6_NF_MATCH_HL) += ip6t_hl.o
Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_IMQ.c Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_IMQ.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_IMQ.c 2007-12-15 05:20:10.816456638 +0100 +++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_IMQ.c
@@ -0,0 +1,78 @@ @@ -0,0 +1,78 @@
+/* This target marks packets to be enqueued to an imq device */ +/* This target marks packets to be enqueued to an imq device */
+#include <linux/module.h> +#include <linux/module.h>
@ -737,8 +737,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_IMQ.c
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
Index: linux-2.4.35.4/net/sched/sch_generic.c Index: linux-2.4.35.4/net/sched/sch_generic.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/sched/sch_generic.c 2007-12-15 05:19:37.226542457 +0100 --- linux-2.4.35.4.orig/net/sched/sch_generic.c
+++ linux-2.4.35.4/net/sched/sch_generic.c 2007-12-15 05:20:10.816456638 +0100 +++ linux-2.4.35.4/net/sched/sch_generic.c
@@ -29,6 +29,9 @@ @@ -29,6 +29,9 @@
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
@ -749,7 +749,7 @@ Index: linux-2.4.35.4/net/sched/sch_generic.c
#include <linux/list.h> #include <linux/list.h>
#include <net/sock.h> #include <net/sock.h>
#include <net/pkt_sched.h> #include <net/pkt_sched.h>
@@ -90,7 +93,11 @@ @@ -90,7 +93,11 @@ int qdisc_restart(struct net_device *dev
spin_unlock(&dev->queue_lock); spin_unlock(&dev->queue_lock);
if (!netif_queue_stopped(dev)) { if (!netif_queue_stopped(dev)) {

20
target/linux/generic-2.4/patches/617-netfilter_time.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:10.812456409 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:11.208478976 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
@@ -47,6 +47,7 @@ @@ -47,6 +47,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
dep_tristate ' netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES dep_tristate ' netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES
dep_tristate ' Multiple port match support' CONFIG_IP_NF_MATCH_MULTIPORT $CONFIG_IP_NF_IPTABLES dep_tristate ' Multiple port match support' CONFIG_IP_NF_MATCH_MULTIPORT $CONFIG_IP_NF_IPTABLES
dep_tristate ' TOS match support' CONFIG_IP_NF_MATCH_TOS $CONFIG_IP_NF_IPTABLES dep_tristate ' TOS match support' CONFIG_IP_NF_MATCH_TOS $CONFIG_IP_NF_IPTABLES
@ -12,8 +12,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
dep_tristate ' ECN match support' CONFIG_IP_NF_MATCH_ECN $CONFIG_IP_NF_IPTABLES dep_tristate ' ECN match support' CONFIG_IP_NF_MATCH_ECN $CONFIG_IP_NF_IPTABLES
Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_time.c Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_time.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_time.c 2007-12-15 05:20:11.212479205 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ipt_time.c
@@ -0,0 +1,193 @@ @@ -0,0 +1,193 @@
+/* +/*
+ This is a module which is used for time matching + This is a module which is used for time matching
@ -210,9 +210,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_time.c
+} +}
Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:10.812456409 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:11.216479434 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
@@ -111,6 +111,7 @@ @@ -111,6 +111,7 @@ obj-$(CONFIG_IP_NF_MATCH_PKTTYPE) += ipt
obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.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
@ -222,8 +222,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_time.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_time.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_time.h 2007-12-15 05:20:11.216479434 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_time.h
@@ -0,0 +1,15 @@ @@ -0,0 +1,15 @@
+#ifndef __ipt_time_h_included__ +#ifndef __ipt_time_h_included__
+#define __ipt_time_h_included__ +#define __ipt_time_h_included__

10
target/linux/generic-2.4/patches/618-netfilter_multiport_backport.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_multiport.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_multiport.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ipt_multiport.h 2007-12-15 05:19:37.022530833 +0100 --- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ipt_multiport.h
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_multiport.h 2007-12-15 05:20:11.456493111 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_multiport.h
@@ -11,11 +11,12 @@ @@ -11,11 +11,12 @@ enum ipt_multiport_flags
#define IPT_MULTI_PORTS 15 #define IPT_MULTI_PORTS 15
@ -19,8 +19,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_multiport.h
#endif /*_IPT_MULTIPORT_H*/ #endif /*_IPT_MULTIPORT_H*/
Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_multiport.c Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_multiport.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/ipt_multiport.c 2007-12-15 05:19:37.030531288 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/ipt_multiport.c
+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_multiport.c 2007-12-15 05:20:11.464493568 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ipt_multiport.c
@@ -1,5 +1,14 @@ @@ -1,5 +1,14 @@
/* Kernel module to match one of a list of TCP/UDP ports: ports are in /* Kernel module to match one of a list of TCP/UDP ports: ports are in
the same place so we can treat them as equal. */ the same place so we can treat them as equal. */

20
target/linux/generic-2.4/patches/619-netfilter_classify.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CLASSIFY.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CLASSIFY.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CLASSIFY.h 2007-12-15 05:20:11.684506105 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CLASSIFY.h
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
+#ifndef _IPT_CLASSIFY_H +#ifndef _IPT_CLASSIFY_H
+#define _IPT_CLASSIFY_H +#define _IPT_CLASSIFY_H
@ -13,9 +13,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CLASSIFY.h
+#endif /*_IPT_CLASSIFY_H */ +#endif /*_IPT_CLASSIFY_H */
Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:11.208478976 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:11.688506331 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
@@ -172,6 +172,7 @@ @@ -172,6 +172,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
dep_tristate ' DSCP target support' CONFIG_IP_NF_TARGET_DSCP $CONFIG_IP_NF_MANGLE dep_tristate ' DSCP target support' CONFIG_IP_NF_TARGET_DSCP $CONFIG_IP_NF_MANGLE
dep_tristate ' MARK target support' CONFIG_IP_NF_TARGET_MARK $CONFIG_IP_NF_MANGLE dep_tristate ' MARK target support' CONFIG_IP_NF_TARGET_MARK $CONFIG_IP_NF_MANGLE
@ -25,8 +25,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
if [ "$CONFIG_IP_NF_CONNTRACK_MARK" != "n" ]; then if [ "$CONFIG_IP_NF_CONNTRACK_MARK" != "n" ]; then
Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_CLASSIFY.c Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_CLASSIFY.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_CLASSIFY.c 2007-12-15 05:20:11.696506789 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ipt_CLASSIFY.c
@@ -0,0 +1,82 @@ @@ -0,0 +1,82 @@
+/* +/*
+ * This is a module which is used for setting the skb->priority field + * This is a module which is used for setting the skb->priority field
@ -112,9 +112,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_CLASSIFY.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:11.216479434 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:11.696506789 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
@@ -134,6 +134,7 @@ @@ -134,6 +134,7 @@ obj-$(CONFIG_IP_NF_MATCH_LAYER7) += ipt_
# targets # targets
obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o

26
target/linux/generic-2.4/patches/620-netfilter_iprange.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/Documentation/Configure.help Index: linux-2.4.35.4/Documentation/Configure.help
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:20:10.792455269 +0100 --- linux-2.4.35.4.orig/Documentation/Configure.help
+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:20:11.948521148 +0100 +++ linux-2.4.35.4/Documentation/Configure.help
@@ -2986,6 +2986,14 @@ @@ -2986,6 +2986,14 @@ CONFIG_IP_NF_MATCH_TOS
If you want to compile it as a module, say M here and read If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'. <file:Documentation/modules.txt>. If unsure, say `N'.
@ -19,8 +19,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help
This option allows you to match firewall rules against condition This option allows you to match firewall rules against condition
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_iprange.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_iprange.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_iprange.h 2007-12-15 05:20:11.952521377 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_iprange.h
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
+#ifndef _IPT_IPRANGE_H +#ifndef _IPT_IPRANGE_H
+#define _IPT_IPRANGE_H +#define _IPT_IPRANGE_H
@ -47,9 +47,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_iprange.h
+#endif /* _IPT_IPRANGE_H */ +#endif /* _IPT_IPRANGE_H */
Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:11.688506331 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:11.960521836 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@ tristate 'IP tables support (required fo
if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; then if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; then
# The simple matches. # The simple matches.
dep_tristate ' limit match support' CONFIG_IP_NF_MATCH_LIMIT $CONFIG_IP_NF_IPTABLES dep_tristate ' limit match support' CONFIG_IP_NF_MATCH_LIMIT $CONFIG_IP_NF_IPTABLES
@ -59,8 +59,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
dep_tristate ' IP set support' CONFIG_IP_NF_SET $CONFIG_IP_NF_IPTABLES dep_tristate ' IP set support' CONFIG_IP_NF_SET $CONFIG_IP_NF_IPTABLES
Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_iprange.c Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_iprange.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_iprange.c 2007-12-15 05:20:11.964522063 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ipt_iprange.c
@@ -0,0 +1,101 @@ @@ -0,0 +1,101 @@
+/* +/*
+ * iptables module to match IP address ranges + * iptables module to match IP address ranges
@ -165,9 +165,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_iprange.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:11.696506789 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:11.976522746 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
@@ -90,6 +90,7 @@ @@ -90,6 +90,7 @@ obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o
# matches # matches
obj-$(CONFIG_IP_NF_MATCH_HELPER) += ipt_helper.o obj-$(CONFIG_IP_NF_MATCH_HELPER) += ipt_helper.o
obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o

50
target/linux/generic-2.4/patches/621-netfilter_random.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/Documentation/Configure.help Index: linux-2.4.35.4/Documentation/Configure.help
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:20:11.948521148 +0100 --- linux-2.4.35.4.orig/Documentation/Configure.help
+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:20:12.260538930 +0100 +++ linux-2.4.35.4/Documentation/Configure.help
@@ -2914,6 +2914,15 @@ @@ -2914,6 +2914,15 @@ CONFIG_IP_NF_MATCH_MAC
If you want to compile it as a module, say M here and read If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'. <file:Documentation/modules.txt>. If unsure, say `N'.
@ -18,7 +18,7 @@ Index: linux-2.4.35.4/Documentation/Configure.help
Netfilter MARK match support Netfilter MARK match support
CONFIG_IP_NF_MATCH_MARK CONFIG_IP_NF_MATCH_MARK
Netfilter mark matching allows you to match packets based on the Netfilter mark matching allows you to match packets based on the
@@ -3229,6 +3238,7 @@ @@ -3229,6 +3238,7 @@ CONFIG_IP_NF_MATCH_HELPER
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
Documentation/modules.txt. If unsure, say `Y'. Documentation/modules.txt. If unsure, say `Y'.
@ -26,7 +26,7 @@ Index: linux-2.4.35.4/Documentation/Configure.help
TCPMSS match support TCPMSS match support
CONFIG_IP_NF_MATCH_TCPMSS CONFIG_IP_NF_MATCH_TCPMSS
This option adds a `tcpmss' match, which allows you to examine the This option adds a `tcpmss' match, which allows you to examine the
@@ -3376,6 +3386,14 @@ @@ -3376,6 +3386,14 @@ CONFIG_IP6_NF_MATCH_MAC
If you want to compile it as a module, say M here and read If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'. <file:Documentation/modules.txt>. If unsure, say `N'.
@ -43,8 +43,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help
This option allows you to match the length of a packet against a This option allows you to match the length of a packet against a
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_random.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_random.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_random.h 2007-12-15 05:20:12.264539159 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_random.h
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+#ifndef _IPT_RAND_H +#ifndef _IPT_RAND_H
+#define _IPT_RAND_H +#define _IPT_RAND_H
@ -59,8 +59,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_random.h
+#endif /*_IPT_RAND_H*/ +#endif /*_IPT_RAND_H*/
Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_random.h Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_random.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_random.h 2007-12-15 05:20:12.272539617 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_random.h
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+#ifndef _IP6T_RAND_H +#ifndef _IP6T_RAND_H
+#define _IP6T_RAND_H +#define _IP6T_RAND_H
@ -75,9 +75,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_random.h
+#endif /*_IP6T_RAND_H*/ +#endif /*_IP6T_RAND_H*/
Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:11.960521836 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:12.276539844 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
@@ -48,6 +48,7 @@ @@ -48,6 +48,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
dep_tristate ' netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES dep_tristate ' netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES
dep_tristate ' Multiple port match support' CONFIG_IP_NF_MATCH_MULTIPORT $CONFIG_IP_NF_IPTABLES dep_tristate ' Multiple port match support' CONFIG_IP_NF_MATCH_MULTIPORT $CONFIG_IP_NF_IPTABLES
dep_tristate ' TOS match support' CONFIG_IP_NF_MATCH_TOS $CONFIG_IP_NF_IPTABLES dep_tristate ' TOS match support' CONFIG_IP_NF_MATCH_TOS $CONFIG_IP_NF_IPTABLES
@ -87,8 +87,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
dep_tristate ' recent match support' CONFIG_IP_NF_MATCH_RECENT $CONFIG_IP_NF_IPTABLES dep_tristate ' recent match support' CONFIG_IP_NF_MATCH_RECENT $CONFIG_IP_NF_IPTABLES
Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_random.c Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_random.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_random.c 2007-12-15 05:20:12.276539844 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ipt_random.c
@@ -0,0 +1,96 @@ @@ -0,0 +1,96 @@
+/* +/*
+ This is a module which is used for a "random" match support. + This is a module which is used for a "random" match support.
@ -188,9 +188,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_random.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:11.976522746 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:12.276539844 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
@@ -115,6 +115,8 @@ @@ -115,6 +115,8 @@ obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos
obj-$(CONFIG_IP_NF_MATCH_TIME) += ipt_time.o obj-$(CONFIG_IP_NF_MATCH_TIME) += ipt_time.o
obj-$(CONFIG_IP_NF_MATCH_CONDITION) += ipt_condition.o obj-$(CONFIG_IP_NF_MATCH_CONDITION) += ipt_condition.o
@ -201,9 +201,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o
Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in 2007-12-15 05:20:10.816456638 +0100 --- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in
+++ linux-2.4.35.4/net/ipv6/netfilter/Config.in 2007-12-15 05:20:12.276539844 +0100 +++ linux-2.4.35.4/net/ipv6/netfilter/Config.in
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@ if [ "$CONFIG_IP6_NF_IPTABLES" != "n" ];
dep_tristate ' limit match support' CONFIG_IP6_NF_MATCH_LIMIT $CONFIG_IP6_NF_IPTABLES dep_tristate ' limit match support' CONFIG_IP6_NF_MATCH_LIMIT $CONFIG_IP6_NF_IPTABLES
dep_tristate ' condition match support' CONFIG_IP6_NF_MATCH_CONDITION $CONFIG_IP6_NF_IPTABLES dep_tristate ' condition match support' CONFIG_IP6_NF_MATCH_CONDITION $CONFIG_IP6_NF_IPTABLES
dep_tristate ' MAC address match support' CONFIG_IP6_NF_MATCH_MAC $CONFIG_IP6_NF_IPTABLES dep_tristate ' MAC address match support' CONFIG_IP6_NF_MATCH_MAC $CONFIG_IP6_NF_IPTABLES
@ -213,8 +213,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in
fi fi
Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_random.c Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_random.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_random.c 2007-12-15 05:20:12.276539844 +0100 +++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_random.c
@@ -0,0 +1,97 @@ @@ -0,0 +1,97 @@
+/* +/*
+ This is a module which is used for a "random" match support. + This is a module which is used for a "random" match support.
@ -315,9 +315,9 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_random.c
+module_exit(fini); +module_exit(fini);
Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile 2007-12-15 05:20:10.816456638 +0100 --- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile
+++ linux-2.4.35.4/net/ipv6/netfilter/Makefile 2007-12-15 05:20:12.280540069 +0100 +++ linux-2.4.35.4/net/ipv6/netfilter/Makefile
@@ -32,6 +32,7 @@ @@ -32,6 +32,7 @@ obj-$(CONFIG_IP6_NF_TARGET_MARK) += ip6t
obj-$(CONFIG_IP6_NF_TARGET_IMQ) += ip6t_IMQ.o obj-$(CONFIG_IP6_NF_TARGET_IMQ) += ip6t_IMQ.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

28
target/linux/generic-2.4/patches/621-tc_esfq.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/Documentation/Configure.help Index: linux-2.4.35.4/Documentation/Configure.help
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:20:12.260538930 +0100 --- linux-2.4.35.4.orig/Documentation/Configure.help
+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:20:12.604558535 +0100 +++ linux-2.4.35.4/Documentation/Configure.help
@@ -11153,6 +11153,24 @@ @@ -11153,6 +11153,24 @@ CONFIG_NET_SCH_HFSC
whenever you want). If you want to compile it as a module, say M whenever you want). If you want to compile it as a module, say M
here and read <file:Documentation/modules.txt>. here and read <file:Documentation/modules.txt>.
@ -29,9 +29,9 @@ Index: linux-2.4.35.4/Documentation/Configure.help
Say Y here if you want to use the Clark-Shenker-Zhang (CSZ) packet Say Y here if you want to use the Clark-Shenker-Zhang (CSZ) packet
Index: linux-2.4.35.4/include/linux/pkt_sched.h Index: linux-2.4.35.4/include/linux/pkt_sched.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/linux/pkt_sched.h 2007-12-15 05:19:36.750515331 +0100 --- linux-2.4.35.4.orig/include/linux/pkt_sched.h
+++ linux-2.4.35.4/include/linux/pkt_sched.h 2007-12-15 05:20:12.608558764 +0100 +++ linux-2.4.35.4/include/linux/pkt_sched.h
@@ -173,8 +173,36 @@ @@ -173,8 +173,36 @@ 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.
@ -70,9 +70,9 @@ Index: linux-2.4.35.4/include/linux/pkt_sched.h
enum enum
Index: linux-2.4.35.4/net/sched/Config.in Index: linux-2.4.35.4/net/sched/Config.in
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/sched/Config.in 2007-12-15 05:19:36.758515786 +0100 --- linux-2.4.35.4.orig/net/sched/Config.in
+++ linux-2.4.35.4/net/sched/Config.in 2007-12-15 05:20:12.608558764 +0100 +++ linux-2.4.35.4/net/sched/Config.in
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@ fi
tristate ' The simplest PRIO pseudoscheduler' CONFIG_NET_SCH_PRIO tristate ' The simplest PRIO pseudoscheduler' CONFIG_NET_SCH_PRIO
tristate ' RED queue' CONFIG_NET_SCH_RED tristate ' RED queue' CONFIG_NET_SCH_RED
tristate ' SFQ queue' CONFIG_NET_SCH_SFQ tristate ' SFQ queue' CONFIG_NET_SCH_SFQ
@ -82,9 +82,9 @@ Index: linux-2.4.35.4/net/sched/Config.in
tristate ' GRED queue' CONFIG_NET_SCH_GRED tristate ' GRED queue' CONFIG_NET_SCH_GRED
Index: linux-2.4.35.4/net/sched/Makefile Index: linux-2.4.35.4/net/sched/Makefile
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/sched/Makefile 2007-12-15 05:19:36.766516242 +0100 --- linux-2.4.35.4.orig/net/sched/Makefile
+++ linux-2.4.35.4/net/sched/Makefile 2007-12-15 05:20:12.608558764 +0100 +++ linux-2.4.35.4/net/sched/Makefile
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@ obj-$(CONFIG_NET_SCH_HPFQ) += sch_hpfq.o
obj-$(CONFIG_NET_SCH_HFSC) += sch_hfsc.o obj-$(CONFIG_NET_SCH_HFSC) += sch_hfsc.o
obj-$(CONFIG_NET_SCH_HTB) += sch_htb.o obj-$(CONFIG_NET_SCH_HTB) += sch_htb.o
obj-$(CONFIG_NET_SCH_SFQ) += sch_sfq.o obj-$(CONFIG_NET_SCH_SFQ) += sch_sfq.o
@ -94,8 +94,8 @@ Index: linux-2.4.35.4/net/sched/Makefile
obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o
Index: linux-2.4.35.4/net/sched/sch_esfq.c Index: linux-2.4.35.4/net/sched/sch_esfq.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/net/sched/sch_esfq.c 2007-12-15 05:20:12.608558764 +0100 +++ linux-2.4.35.4/net/sched/sch_esfq.c
@@ -0,0 +1,649 @@ @@ -0,0 +1,649 @@
+/* +/*
+ * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline. + * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline.

4
target/linux/generic-2.4/patches/622-netfilter_ipset_porthash.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h 2007-12-15 05:20:12.884574492 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h
@@ -0,0 +1,34 @@ @@ -0,0 +1,34 @@
+#ifndef __IP_SET_IPPORTHASH_H +#ifndef __IP_SET_IPPORTHASH_H
+#define __IP_SET_IPPORTHASH_H +#define __IP_SET_IPPORTHASH_H

198
target/linux/generic-2.4/patches/700-multiple_default_gateways.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_nat.h 2007-12-15 05:19:36.574505299 +0100 --- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_nat.h
+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat.h 2007-12-15 05:20:13.092586349 +0100 +++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat.h
@@ -121,5 +121,13 @@ @@ -121,5 +121,13 @@ extern int ip_nat_used_tuple(const struc
extern u_int16_t ip_nat_cheat_check(u_int32_t oldvalinv, extern u_int16_t ip_nat_cheat_check(u_int32_t oldvalinv,
u_int32_t newval, u_int32_t newval,
u_int16_t oldcheck); u_int16_t oldcheck);
@ -18,9 +18,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat.h
#endif #endif
Index: linux-2.4.35.4/include/linux/rtnetlink.h Index: linux-2.4.35.4/include/linux/rtnetlink.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/linux/rtnetlink.h 2007-12-15 05:19:36.582505757 +0100 --- linux-2.4.35.4.orig/include/linux/rtnetlink.h
+++ linux-2.4.35.4/include/linux/rtnetlink.h 2007-12-15 05:20:13.092586349 +0100 +++ linux-2.4.35.4/include/linux/rtnetlink.h
@@ -234,6 +234,8 @@ @@ -234,6 +234,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 */
@ -31,9 +31,9 @@ Index: linux-2.4.35.4/include/linux/rtnetlink.h
Index: linux-2.4.35.4/include/net/ip_fib.h Index: linux-2.4.35.4/include/net/ip_fib.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/net/ip_fib.h 2007-12-15 05:19:36.590506213 +0100 --- linux-2.4.35.4.orig/include/net/ip_fib.h
+++ linux-2.4.35.4/include/net/ip_fib.h 2007-12-15 05:20:13.100586801 +0100 +++ linux-2.4.35.4/include/net/ip_fib.h
@@ -162,7 +162,8 @@ @@ -162,7 +162,8 @@ static inline int fib_lookup(const struc
static inline void fib_select_default(const struct rt_key *key, struct fib_result *res) static inline void fib_select_default(const struct rt_key *key, struct fib_result *res)
{ {
@ -43,7 +43,7 @@ Index: linux-2.4.35.4/include/net/ip_fib.h
main_table->tb_select_default(main_table, key, res); main_table->tb_select_default(main_table, key, res);
} }
@@ -174,6 +175,7 @@ @@ -174,6 +175,7 @@ extern struct fib_table * fib_tables[RT_
extern int fib_lookup(const struct rt_key *key, struct fib_result *res); extern int fib_lookup(const struct rt_key *key, struct fib_result *res);
extern struct fib_table *__fib_new_table(int id); extern struct fib_table *__fib_new_table(int id);
extern void fib_rule_put(struct fib_rule *r); extern void fib_rule_put(struct fib_rule *r);
@ -51,7 +51,7 @@ Index: linux-2.4.35.4/include/net/ip_fib.h
static inline struct fib_table *fib_get_table(int id) static inline struct fib_table *fib_get_table(int id)
{ {
@@ -275,5 +277,6 @@ @@ -275,5 +277,6 @@ static inline void fib_res_put(struct fi
#endif #endif
} }
@ -60,9 +60,9 @@ Index: linux-2.4.35.4/include/net/ip_fib.h
#endif /* _NET_FIB_H */ #endif /* _NET_FIB_H */
Index: linux-2.4.35.4/include/net/route.h Index: linux-2.4.35.4/include/net/route.h
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/include/net/route.h 2007-12-15 05:19:36.598506668 +0100 --- linux-2.4.35.4.orig/include/net/route.h
+++ linux-2.4.35.4/include/net/route.h 2007-12-15 05:20:13.104587030 +0100 +++ linux-2.4.35.4/include/net/route.h
@@ -49,6 +49,8 @@ @@ -49,6 +49,8 @@ struct rt_key
{ {
__u32 dst; __u32 dst;
__u32 src; __u32 src;
@ -71,7 +71,7 @@ Index: linux-2.4.35.4/include/net/route.h
int iif; int iif;
int oif; int oif;
#ifdef CONFIG_IP_ROUTE_FWMARK #ifdef CONFIG_IP_ROUTE_FWMARK
@@ -128,6 +130,7 @@ @@ -128,6 +130,7 @@ extern void ip_rt_advice(struct rtable
extern void rt_cache_flush(int how); extern void rt_cache_flush(int how);
extern int ip_route_output_key(struct rtable **, const struct rt_key *key); extern int ip_route_output_key(struct rtable **, const struct rt_key *key);
extern int ip_route_input(struct sk_buff*, u32 dst, u32 src, u8 tos, struct net_device *devin); extern int ip_route_input(struct sk_buff*, u32 dst, u32 src, u8 tos, struct net_device *devin);
@ -79,7 +79,7 @@ Index: linux-2.4.35.4/include/net/route.h
extern unsigned short ip_rt_frag_needed(struct iphdr *iph, unsigned short new_mtu); extern unsigned short ip_rt_frag_needed(struct iphdr *iph, unsigned short new_mtu);
extern void ip_rt_update_pmtu(struct dst_entry *dst, unsigned mtu); extern void ip_rt_update_pmtu(struct dst_entry *dst, unsigned mtu);
extern void ip_rt_send_redirect(struct sk_buff *skb); extern void ip_rt_send_redirect(struct sk_buff *skb);
@@ -148,6 +151,15 @@ @@ -148,6 +151,15 @@ static inline int ip_route_output(struct
} }
@ -97,8 +97,8 @@ Index: linux-2.4.35.4/include/net/route.h
if (rt) if (rt)
Index: linux-2.4.35.4/net/ipv4/fib_frontend.c Index: linux-2.4.35.4/net/ipv4/fib_frontend.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/fib_frontend.c 2007-12-15 05:19:36.606507123 +0100 --- linux-2.4.35.4.orig/net/ipv4/fib_frontend.c
+++ linux-2.4.35.4/net/ipv4/fib_frontend.c 2007-12-15 05:20:13.108587259 +0100 +++ linux-2.4.35.4/net/ipv4/fib_frontend.c
@@ -54,6 +54,8 @@ @@ -54,6 +54,8 @@
struct fib_table *local_table; struct fib_table *local_table;
struct fib_table *main_table; struct fib_table *main_table;
@ -108,7 +108,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_frontend.c
#else #else
#define RT_TABLE_MIN 1 #define RT_TABLE_MIN 1
@@ -71,6 +73,7 @@ @@ -71,6 +73,7 @@ struct fib_table *__fib_new_table(int id
return tb; return tb;
} }
@ -116,7 +116,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_frontend.c
#endif /* CONFIG_IP_MULTIPLE_TABLES */ #endif /* CONFIG_IP_MULTIPLE_TABLES */
@@ -209,6 +212,9 @@ @@ -209,6 +212,9 @@ int fib_validate_source(u32 src, u32 dst
struct in_device *in_dev; struct in_device *in_dev;
struct rt_key key; struct rt_key key;
struct fib_result res; struct fib_result res;
@ -126,7 +126,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_frontend.c
int no_addr, rpf; int no_addr, rpf;
int ret; int ret;
@@ -216,6 +222,7 @@ @@ -216,6 +222,7 @@ int fib_validate_source(u32 src, u32 dst
key.src = dst; key.src = dst;
key.tos = tos; key.tos = tos;
key.oif = 0; key.oif = 0;
@ -134,7 +134,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_frontend.c
key.iif = oif; key.iif = oif;
key.scope = RT_SCOPE_UNIVERSE; key.scope = RT_SCOPE_UNIVERSE;
@@ -237,31 +244,35 @@ @@ -237,31 +244,35 @@ int fib_validate_source(u32 src, u32 dst
goto e_inval_res; goto e_inval_res;
*spec_dst = FIB_RES_PREFSRC(res); *spec_dst = FIB_RES_PREFSRC(res);
fib_combine_itag(itag, &res); fib_combine_itag(itag, &res);
@ -177,7 +177,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_frontend.c
return ret; return ret;
last_resort: last_resort:
@@ -579,9 +590,7 @@ @@ -579,9 +590,7 @@ static int fib_inetaddr_event(struct not
switch (event) { switch (event) {
case NETDEV_UP: case NETDEV_UP:
fib_add_ifaddr(ifa); fib_add_ifaddr(ifa);
@ -187,7 +187,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_frontend.c
rt_cache_flush(-1); rt_cache_flush(-1);
break; break;
case NETDEV_DOWN: case NETDEV_DOWN:
@@ -617,9 +626,7 @@ @@ -617,9 +626,7 @@ static int fib_netdev_event(struct notif
for_ifa(in_dev) { for_ifa(in_dev) {
fib_add_ifaddr(ifa); fib_add_ifaddr(ifa);
} endfor_ifa(in_dev); } endfor_ifa(in_dev);
@ -199,9 +199,9 @@ Index: linux-2.4.35.4/net/ipv4/fib_frontend.c
case NETDEV_DOWN: case NETDEV_DOWN:
Index: linux-2.4.35.4/net/ipv4/fib_hash.c Index: linux-2.4.35.4/net/ipv4/fib_hash.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/fib_hash.c 2007-12-15 05:19:36.614507579 +0100 --- linux-2.4.35.4.orig/net/ipv4/fib_hash.c
+++ linux-2.4.35.4/net/ipv4/fib_hash.c 2007-12-15 05:20:13.108587259 +0100 +++ linux-2.4.35.4/net/ipv4/fib_hash.c
@@ -71,6 +71,7 @@ @@ -71,6 +71,7 @@ struct fib_node
struct fib_info *fn_info; struct fib_info *fn_info;
#define FIB_INFO(f) ((f)->fn_info) #define FIB_INFO(f) ((f)->fn_info)
fn_key_t fn_key; fn_key_t fn_key;
@ -209,7 +209,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_hash.c
u8 fn_tos; u8 fn_tos;
u8 fn_type; u8 fn_type;
u8 fn_scope; u8 fn_scope;
@@ -336,72 +337,123 @@ @@ -336,72 +337,123 @@ out:
return err; return err;
} }
@ -364,7 +364,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_hash.c
goto out; goto out;
} }
fi = next_fi; fi = next_fi;
@@ -409,16 +461,25 @@ @@ -409,16 +461,25 @@ fn_hash_select_default(struct fib_table
} }
if (order<=0 || fi==NULL) { if (order<=0 || fi==NULL) {
@ -393,7 +393,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_hash.c
goto out; goto out;
} }
@@ -428,8 +489,11 @@ @@ -428,8 +489,11 @@ fn_hash_select_default(struct fib_table
res->fi = last_resort; res->fi = last_resort;
if (last_resort) if (last_resort)
atomic_inc(&last_resort->fib_clntref); atomic_inc(&last_resort->fib_clntref);
@ -406,7 +406,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_hash.c
out: out:
read_unlock(&fib_hash_lock); read_unlock(&fib_hash_lock);
} }
@@ -589,6 +653,7 @@ @@ -589,6 +653,7 @@ replace:
memset(new_f, 0, sizeof(struct fib_node)); memset(new_f, 0, sizeof(struct fib_node));
@ -416,9 +416,9 @@ Index: linux-2.4.35.4/net/ipv4/fib_hash.c
new_f->fn_tos = tos; new_f->fn_tos = tos;
Index: linux-2.4.35.4/net/ipv4/fib_rules.c Index: linux-2.4.35.4/net/ipv4/fib_rules.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/fib_rules.c 2007-12-15 05:19:36.618507808 +0100 --- linux-2.4.35.4.orig/net/ipv4/fib_rules.c
+++ linux-2.4.35.4/net/ipv4/fib_rules.c 2007-12-15 05:20:13.108587259 +0100 +++ linux-2.4.35.4/net/ipv4/fib_rules.c
@@ -307,6 +307,11 @@ @@ -307,6 +307,11 @@ static void fib_rules_attach(struct net_
} }
} }
@ -430,7 +430,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_rules.c
int fib_lookup(const struct rt_key *key, struct fib_result *res) int fib_lookup(const struct rt_key *key, struct fib_result *res)
{ {
int err; int err;
@@ -371,8 +376,10 @@ @@ -371,8 +376,10 @@ FRprintk("FAILURE\n");
void fib_select_default(const struct rt_key *key, struct fib_result *res) void fib_select_default(const struct rt_key *key, struct fib_result *res)
{ {
@ -445,8 +445,8 @@ Index: linux-2.4.35.4/net/ipv4/fib_rules.c
tb->tb_select_default(tb, key, res); tb->tb_select_default(tb, key, res);
Index: linux-2.4.35.4/net/ipv4/fib_semantics.c Index: linux-2.4.35.4/net/ipv4/fib_semantics.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/fib_semantics.c 2007-12-15 05:19:36.626508263 +0100 --- linux-2.4.35.4.orig/net/ipv4/fib_semantics.c
+++ linux-2.4.35.4/net/ipv4/fib_semantics.c 2007-12-15 05:20:13.112587489 +0100 +++ linux-2.4.35.4/net/ipv4/fib_semantics.c
@@ -48,6 +48,7 @@ @@ -48,6 +48,7 @@
static struct fib_info *fib_info_list; static struct fib_info *fib_info_list;
static rwlock_t fib_info_lock = RW_LOCK_UNLOCKED; static rwlock_t fib_info_lock = RW_LOCK_UNLOCKED;
@ -455,7 +455,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c
#define for_fib_info() { struct fib_info *fi; \ #define for_fib_info() { struct fib_info *fi; \
for (fi = fib_info_list; fi; fi = fi->fib_next) for (fi = fib_info_list; fi; fi = fi->fib_next)
@@ -150,7 +151,7 @@ @@ -150,7 +151,7 @@ static __inline__ int nh_comp(const stru
#ifdef CONFIG_NET_CLS_ROUTE #ifdef CONFIG_NET_CLS_ROUTE
nh->nh_tclassid != onh->nh_tclassid || nh->nh_tclassid != onh->nh_tclassid ||
#endif #endif
@ -464,7 +464,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c
return -1; return -1;
onh++; onh++;
} endfor_nexthops(fi); } endfor_nexthops(fi);
@@ -166,7 +167,7 @@ @@ -166,7 +167,7 @@ static __inline__ struct fib_info * fib_
nfi->fib_prefsrc == fi->fib_prefsrc && nfi->fib_prefsrc == fi->fib_prefsrc &&
nfi->fib_priority == fi->fib_priority && nfi->fib_priority == fi->fib_priority &&
memcmp(nfi->fib_metrics, fi->fib_metrics, sizeof(fi->fib_metrics)) == 0 && memcmp(nfi->fib_metrics, fi->fib_metrics, sizeof(fi->fib_metrics)) == 0 &&
@ -473,7 +473,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c
(nfi->fib_nhs == 0 || nh_comp(fi, nfi) == 0)) (nfi->fib_nhs == 0 || nh_comp(fi, nfi) == 0))
return fi; return fi;
} endfor_fib_info(); } endfor_fib_info();
@@ -365,8 +366,11 @@ @@ -365,8 +366,11 @@ static int fib_check_nh(const struct rtm
return -EINVAL; return -EINVAL;
if ((dev = __dev_get_by_index(nh->nh_oif)) == NULL) if ((dev = __dev_get_by_index(nh->nh_oif)) == NULL)
return -ENODEV; return -ENODEV;
@ -487,7 +487,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c
nh->nh_dev = dev; nh->nh_dev = dev;
dev_hold(dev); dev_hold(dev);
nh->nh_scope = RT_SCOPE_LINK; nh->nh_scope = RT_SCOPE_LINK;
@@ -380,23 +384,48 @@ @@ -380,23 +384,48 @@ static int fib_check_nh(const struct rtm
/* It is not necessary, but requires a bit of thinking */ /* It is not necessary, but requires a bit of thinking */
if (key.scope < RT_SCOPE_LINK) if (key.scope < RT_SCOPE_LINK)
key.scope = RT_SCOPE_LINK; key.scope = RT_SCOPE_LINK;
@ -552,7 +552,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c
} else { } else {
struct in_device *in_dev; struct in_device *in_dev;
@@ -407,8 +436,11 @@ @@ -407,8 +436,11 @@ out:
if (in_dev == NULL) if (in_dev == NULL)
return -ENODEV; return -ENODEV;
if (!(in_dev->dev->flags&IFF_UP)) { if (!(in_dev->dev->flags&IFF_UP)) {
@ -566,7 +566,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c
} }
nh->nh_dev = in_dev->dev; nh->nh_dev = in_dev->dev;
dev_hold(nh->nh_dev); dev_hold(nh->nh_dev);
@@ -606,8 +638,12 @@ @@ -606,8 +638,12 @@ fib_semantic_match(int type, struct fib_
for_nexthops(fi) { for_nexthops(fi) {
if (nh->nh_flags&RTNH_F_DEAD) if (nh->nh_flags&RTNH_F_DEAD)
continue; continue;
@ -581,7 +581,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c
} }
#ifdef CONFIG_IP_ROUTE_MULTIPATH #ifdef CONFIG_IP_ROUTE_MULTIPATH
if (nhsel < fi->fib_nhs) { if (nhsel < fi->fib_nhs) {
@@ -873,22 +909,35 @@ @@ -873,22 +909,35 @@ int fib_sync_down(u32 local, struct net_
if (local && fi->fib_prefsrc == local) { if (local && fi->fib_prefsrc == local) {
fi->fib_flags |= RTNH_F_DEAD; fi->fib_flags |= RTNH_F_DEAD;
ret++; ret++;
@ -626,7 +626,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c
} }
#ifdef CONFIG_IP_ROUTE_MULTIPATH #ifdef CONFIG_IP_ROUTE_MULTIPATH
if (force > 1 && nh->nh_dev == dev) { if (force > 1 && nh->nh_dev == dev) {
@@ -906,37 +955,55 @@ @@ -906,37 +955,55 @@ int fib_sync_down(u32 local, struct net_
return ret; return ret;
} }
@ -690,7 +690,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c
} endfor_nexthops(fi) } endfor_nexthops(fi)
if (alive > 0) { if (alive > 0) {
@@ -944,9 +1011,13 @@ @@ -944,9 +1011,13 @@ int fib_sync_up(struct net_device *dev)
ret++; ret++;
} }
} endfor_fib_info(); } endfor_fib_info();
@ -704,7 +704,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c
/* /*
The algorithm is suboptimal, but it provides really The algorithm is suboptimal, but it provides really
fair weighted route distribution. fair weighted route distribution.
@@ -955,24 +1026,45 @@ @@ -955,24 +1026,45 @@ int fib_sync_up(struct net_device *dev)
void fib_select_multipath(const struct rt_key *key, struct fib_result *res) void fib_select_multipath(const struct rt_key *key, struct fib_result *res)
{ {
struct fib_info *fi = res->fi; struct fib_info *fi = res->fi;
@ -758,7 +758,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c
} }
@@ -982,20 +1074,40 @@ @@ -982,20 +1074,40 @@ void fib_select_multipath(const struct r
w = jiffies % fi->fib_power; w = jiffies % fi->fib_power;
@ -804,9 +804,9 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c
#endif #endif
Index: linux-2.4.35.4/net/ipv4/ip_nat_dumb.c Index: linux-2.4.35.4/net/ipv4/ip_nat_dumb.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/ip_nat_dumb.c 2007-12-15 05:19:36.634508719 +0100 --- linux-2.4.35.4.orig/net/ipv4/ip_nat_dumb.c
+++ linux-2.4.35.4/net/ipv4/ip_nat_dumb.c 2007-12-15 05:20:13.112587489 +0100 +++ linux-2.4.35.4/net/ipv4/ip_nat_dumb.c
@@ -124,6 +124,7 @@ @@ -124,6 +124,7 @@ ip_do_nat(struct sk_buff *skb)
key.dst = ciph->saddr; key.dst = ciph->saddr;
key.iif = skb->dev->ifindex; key.iif = skb->dev->ifindex;
key.oif = 0; key.oif = 0;
@ -816,9 +816,9 @@ Index: linux-2.4.35.4/net/ipv4/ip_nat_dumb.c
#endif #endif
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_fw_compat_masq.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_fw_compat_masq.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_fw_compat_masq.c 2007-12-15 05:19:36.642509177 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_fw_compat_masq.c
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_fw_compat_masq.c 2007-12-15 05:20:13.112587489 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_fw_compat_masq.c
@@ -41,6 +41,10 @@ @@ -41,6 +41,10 @@ do_masquerade(struct sk_buff **pskb, con
enum ip_conntrack_info ctinfo; enum ip_conntrack_info ctinfo;
struct ip_conntrack *ct; struct ip_conntrack *ct;
unsigned int ret; unsigned int ret;
@ -829,7 +829,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_fw_compat_masq.c
/* Sorry, only ICMP, TCP and UDP. */ /* Sorry, only ICMP, TCP and UDP. */
if (iph->protocol != IPPROTO_ICMP if (iph->protocol != IPPROTO_ICMP
@@ -64,22 +68,28 @@ @@ -64,22 +68,28 @@ do_masquerade(struct sk_buff **pskb, con
} }
info = &ct->nat.info; info = &ct->nat.info;
@ -862,7 +862,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_fw_compat_masq.c
ip_rt_put(rt); ip_rt_put(rt);
range = ((struct ip_nat_multi_range) range = ((struct ip_nat_multi_range)
{ 1, { 1,
@@ -92,11 +102,31 @@ @@ -92,11 +102,31 @@ do_masquerade(struct sk_buff **pskb, con
WRITE_UNLOCK(&ip_nat_lock); WRITE_UNLOCK(&ip_nat_lock);
return ret; return ret;
} }
@ -897,9 +897,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_fw_compat_masq.c
void void
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_nat_core.c 2007-12-15 05:20:06.404205198 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_nat_core.c
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c 2007-12-15 05:20:13.112587489 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c
@@ -994,6 +994,60 @@ @@ -994,6 +994,60 @@ icmp_reply_translation(struct sk_buff *s
return NF_ACCEPT; return NF_ACCEPT;
} }
@ -962,9 +962,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c
size_t i; size_t i;
Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_standalone.c Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_standalone.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_nat_standalone.c 2007-12-15 05:19:36.654509858 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_nat_standalone.c
+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_standalone.c 2007-12-15 05:20:13.112587489 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_standalone.c
@@ -245,6 +245,9 @@ @@ -245,6 +245,9 @@ ip_nat_local_fn(unsigned int hooknum,
/* Before packet filtering, change destination */ /* Before packet filtering, change destination */
static struct nf_hook_ops ip_nat_in_ops static struct nf_hook_ops ip_nat_in_ops
= { { NULL, NULL }, ip_nat_in, PF_INET, NF_IP_PRE_ROUTING, NF_IP_PRI_NAT_DST }; = { { NULL, NULL }, ip_nat_in, PF_INET, NF_IP_PRE_ROUTING, NF_IP_PRI_NAT_DST };
@ -974,7 +974,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_standalone.c
/* After packet filtering, change source */ /* After packet filtering, change source */
static struct nf_hook_ops ip_nat_out_ops static struct nf_hook_ops ip_nat_out_ops
= { { NULL, NULL }, ip_nat_out, PF_INET, NF_IP_POST_ROUTING, NF_IP_PRI_NAT_SRC}; = { { NULL, NULL }, ip_nat_out, PF_INET, NF_IP_POST_ROUTING, NF_IP_PRI_NAT_SRC};
@@ -313,10 +316,15 @@ @@ -313,10 +316,15 @@ static int init_or_cleanup(int init)
printk("ip_nat_init: can't register in hook.\n"); printk("ip_nat_init: can't register in hook.\n");
goto cleanup_nat; goto cleanup_nat;
} }
@ -991,7 +991,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_standalone.c
} }
ret = nf_register_hook(&ip_nat_local_out_ops); ret = nf_register_hook(&ip_nat_local_out_ops);
if (ret < 0) { if (ret < 0) {
@@ -336,6 +344,8 @@ @@ -336,6 +344,8 @@ static int init_or_cleanup(int init)
nf_unregister_hook(&ip_nat_local_out_ops); nf_unregister_hook(&ip_nat_local_out_ops);
cleanup_outops: cleanup_outops:
nf_unregister_hook(&ip_nat_out_ops); nf_unregister_hook(&ip_nat_out_ops);
@ -1002,9 +1002,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_standalone.c
cleanup_nat: cleanup_nat:
Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_MASQUERADE.c Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_MASQUERADE.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/netfilter/ipt_MASQUERADE.c 2007-12-15 05:19:36.662510316 +0100 --- linux-2.4.35.4.orig/net/ipv4/netfilter/ipt_MASQUERADE.c
+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_MASQUERADE.c 2007-12-15 05:20:13.116587715 +0100 +++ linux-2.4.35.4/net/ipv4/netfilter/ipt_MASQUERADE.c
@@ -87,7 +87,8 @@ @@ -87,7 +87,8 @@ masquerade_target(struct sk_buff **pskb,
key.dst = (*pskb)->nh.iph->daddr; key.dst = (*pskb)->nh.iph->daddr;
key.src = 0; /* Unknown: that's what we're trying to establish */ key.src = 0; /* Unknown: that's what we're trying to establish */
key.tos = RT_TOS((*pskb)->nh.iph->tos)|RTO_CONN; key.tos = RT_TOS((*pskb)->nh.iph->tos)|RTO_CONN;
@ -1014,7 +1014,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_MASQUERADE.c
#ifdef CONFIG_IP_ROUTE_FWMARK #ifdef CONFIG_IP_ROUTE_FWMARK
key.fwmark = (*pskb)->nfmark; key.fwmark = (*pskb)->nfmark;
#endif #endif
@@ -98,13 +99,6 @@ @@ -98,13 +99,6 @@ masquerade_target(struct sk_buff **pskb,
" No route: Rusty's brain broke!\n"); " No route: Rusty's brain broke!\n");
return NF_DROP; return NF_DROP;
} }
@ -1030,9 +1030,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_MASQUERADE.c
DEBUGP("newsrc = %u.%u.%u.%u\n", NIPQUAD(newsrc)); DEBUGP("newsrc = %u.%u.%u.%u\n", NIPQUAD(newsrc));
Index: linux-2.4.35.4/net/ipv4/route.c Index: linux-2.4.35.4/net/ipv4/route.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/ipv4/route.c 2007-12-15 05:19:36.670510772 +0100 --- linux-2.4.35.4.orig/net/ipv4/route.c
+++ linux-2.4.35.4/net/ipv4/route.c 2007-12-15 05:20:13.116587715 +0100 +++ linux-2.4.35.4/net/ipv4/route.c
@@ -919,6 +919,7 @@ @@ -919,6 +919,7 @@ void ip_rt_redirect(u32 old_gw, u32 dadd
/* Gateway is different ... */ /* Gateway is different ... */
rt->rt_gateway = new_gw; rt->rt_gateway = new_gw;
@ -1040,7 +1040,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
/* Redirect received -> path was valid */ /* Redirect received -> path was valid */
dst_confirm(&rth->u.dst); dst_confirm(&rth->u.dst);
@@ -1343,6 +1344,7 @@ @@ -1343,6 +1344,7 @@ static int ip_route_input_mc(struct sk_b
rth->key.fwmark = skb->nfmark; rth->key.fwmark = skb->nfmark;
#endif #endif
rth->key.src = saddr; rth->key.src = saddr;
@ -1048,7 +1048,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
rth->rt_src = saddr; rth->rt_src = saddr;
#ifdef CONFIG_IP_ROUTE_NAT #ifdef CONFIG_IP_ROUTE_NAT
rth->rt_dst_map = daddr; rth->rt_dst_map = daddr;
@@ -1356,6 +1358,7 @@ @@ -1356,6 +1358,7 @@ static int ip_route_input_mc(struct sk_b
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->key.oif = 0; rth->key.oif = 0;
@ -1056,7 +1056,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
rth->rt_gateway = daddr; rth->rt_gateway = daddr;
rth->rt_spec_dst= spec_dst; rth->rt_spec_dst= spec_dst;
rth->rt_type = RTN_MULTICAST; rth->rt_type = RTN_MULTICAST;
@@ -1395,7 +1398,7 @@ @@ -1395,7 +1398,7 @@ e_inval:
*/ */
int ip_route_input_slow(struct sk_buff *skb, u32 daddr, u32 saddr, int ip_route_input_slow(struct sk_buff *skb, u32 daddr, u32 saddr,
@ -1065,7 +1065,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
{ {
struct rt_key key; struct rt_key key;
struct fib_result res; struct fib_result res;
@@ -1415,16 +1418,17 @@ @@ -1415,16 +1418,17 @@ int ip_route_input_slow(struct sk_buff *
goto out; goto out;
key.dst = daddr; key.dst = daddr;
@ -1086,7 +1086,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
/* Check for the most weird martians, which can be not detected /* Check for the most weird martians, which can be not detected
by fib_lookup. by fib_lookup.
@@ -1445,6 +1449,12 @@ @@ -1445,6 +1449,12 @@ int ip_route_input_slow(struct sk_buff *
if (BADCLASS(daddr) || ZERONET(daddr) || LOOPBACK(daddr)) if (BADCLASS(daddr) || ZERONET(daddr) || LOOPBACK(daddr))
goto martian_destination; goto martian_destination;
@ -1099,7 +1099,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
/* /*
* Now we are ready to route packet. * Now we are ready to route packet.
*/ */
@@ -1454,6 +1464,10 @@ @@ -1454,6 +1464,10 @@ int ip_route_input_slow(struct sk_buff *
goto no_route; goto no_route;
} }
free_res = 1; free_res = 1;
@ -1110,7 +1110,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
rt_cache_stat[smp_processor_id()].in_slow_tot++; rt_cache_stat[smp_processor_id()].in_slow_tot++;
@@ -1464,7 +1478,7 @@ @@ -1464,7 +1478,7 @@ int ip_route_input_slow(struct sk_buff *
if (1) { if (1) {
u32 src_map = saddr; u32 src_map = saddr;
@ -1119,7 +1119,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
src_map = fib_rules_policy(saddr, &res, &flags); src_map = fib_rules_policy(saddr, &res, &flags);
if (res.type == RTN_NAT) { if (res.type == RTN_NAT) {
@@ -1503,8 +1517,9 @@ @@ -1503,8 +1517,9 @@ int ip_route_input_slow(struct sk_buff *
if (res.type != RTN_UNICAST) if (res.type != RTN_UNICAST)
goto martian_destination; goto martian_destination;
@ -1130,7 +1130,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
fib_select_multipath(&key, &res); fib_select_multipath(&key, &res);
#endif #endif
out_dev = in_dev_get(FIB_RES_DEV(res)); out_dev = in_dev_get(FIB_RES_DEV(res));
@@ -1524,6 +1539,7 @@ @@ -1524,6 +1539,7 @@ int ip_route_input_slow(struct sk_buff *
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)) &&
@ -1138,7 +1138,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
(IN_DEV_SHARED_MEDIA(out_dev) || (IN_DEV_SHARED_MEDIA(out_dev) ||
inet_addr_onlink(out_dev, saddr, FIB_RES_GW(res)))) inet_addr_onlink(out_dev, saddr, FIB_RES_GW(res))))
flags |= RTCF_DOREDIRECT; flags |= RTCF_DOREDIRECT;
@@ -1550,6 +1566,7 @@ @@ -1550,6 +1566,7 @@ int ip_route_input_slow(struct sk_buff *
#endif #endif
rth->key.src = saddr; rth->key.src = saddr;
rth->rt_src = saddr; rth->rt_src = saddr;
@ -1146,7 +1146,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
rth->rt_gateway = daddr; rth->rt_gateway = daddr;
#ifdef CONFIG_IP_ROUTE_NAT #ifdef CONFIG_IP_ROUTE_NAT
rth->rt_src_map = key.src; rth->rt_src_map = key.src;
@@ -1562,6 +1579,7 @@ @@ -1562,6 +1579,7 @@ int ip_route_input_slow(struct sk_buff *
rth->u.dst.dev = out_dev->dev; rth->u.dst.dev = out_dev->dev;
dev_hold(rth->u.dst.dev); dev_hold(rth->u.dst.dev);
rth->key.oif = 0; rth->key.oif = 0;
@ -1154,7 +1154,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
rth->rt_spec_dst= spec_dst; rth->rt_spec_dst= spec_dst;
rth->u.dst.input = ip_forward; rth->u.dst.input = ip_forward;
@@ -1572,7 +1590,8 @@ @@ -1572,7 +1590,8 @@ int ip_route_input_slow(struct sk_buff *
rth->rt_flags = flags; rth->rt_flags = flags;
#ifdef CONFIG_NET_FASTROUTE #ifdef CONFIG_NET_FASTROUTE
@ -1164,7 +1164,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
struct net_device *odev = rth->u.dst.dev; struct net_device *odev = rth->u.dst.dev;
if (odev != dev && if (odev != dev &&
dev->accept_fastpath && dev->accept_fastpath &&
@@ -1595,6 +1614,8 @@ @@ -1595,6 +1614,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;
@ -1173,7 +1173,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
if (ZERONET(saddr)) if (ZERONET(saddr))
spec_dst = inet_select_addr(dev, 0, RT_SCOPE_LINK); spec_dst = inet_select_addr(dev, 0, RT_SCOPE_LINK);
@@ -1627,6 +1648,7 @@ @@ -1627,6 +1648,7 @@ local_input:
#endif #endif
rth->key.src = saddr; rth->key.src = saddr;
rth->rt_src = saddr; rth->rt_src = saddr;
@ -1181,7 +1181,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
#ifdef CONFIG_IP_ROUTE_NAT #ifdef CONFIG_IP_ROUTE_NAT
rth->rt_dst_map = key.dst; rth->rt_dst_map = key.dst;
rth->rt_src_map = key.src; rth->rt_src_map = key.src;
@@ -1639,6 +1661,7 @@ @@ -1639,6 +1661,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->key.oif = 0; rth->key.oif = 0;
@ -1189,7 +1189,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
rth->rt_gateway = daddr; rth->rt_gateway = daddr;
rth->rt_spec_dst= spec_dst; rth->rt_spec_dst= spec_dst;
rth->u.dst.input= ip_local_deliver; rth->u.dst.input= ip_local_deliver;
@@ -1704,8 +1727,9 @@ @@ -1704,8 +1727,9 @@ martian_source:
goto e_inval; goto e_inval;
} }
@ -1201,7 +1201,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
{ {
struct rtable * rth; struct rtable * rth;
unsigned hash; unsigned hash;
@@ -1719,6 +1743,7 @@ @@ -1719,6 +1743,7 @@ int ip_route_input(struct sk_buff *skb,
if (rth->key.dst == daddr && if (rth->key.dst == daddr &&
rth->key.src == saddr && rth->key.src == saddr &&
rth->key.iif == iif && rth->key.iif == iif &&
@ -1209,7 +1209,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
rth->key.oif == 0 && rth->key.oif == 0 &&
#ifdef CONFIG_IP_ROUTE_FWMARK #ifdef CONFIG_IP_ROUTE_FWMARK
rth->key.fwmark == skb->nfmark && rth->key.fwmark == skb->nfmark &&
@@ -1766,9 +1791,21 @@ @@ -1766,9 +1791,21 @@ int ip_route_input(struct sk_buff *skb,
read_unlock(&inetdev_lock); read_unlock(&inetdev_lock);
return -EINVAL; return -EINVAL;
} }
@ -1232,7 +1232,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
/* /*
* Major route resolver routine. * Major route resolver routine.
*/ */
@@ -1791,6 +1828,7 @@ @@ -1791,6 +1828,7 @@ int ip_route_output_slow(struct rtable *
key.tos = tos & IPTOS_RT_MASK; key.tos = tos & IPTOS_RT_MASK;
key.iif = loopback_dev.ifindex; key.iif = loopback_dev.ifindex;
key.oif = oldkey->oif; key.oif = oldkey->oif;
@ -1240,7 +1240,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
#ifdef CONFIG_IP_ROUTE_FWMARK #ifdef CONFIG_IP_ROUTE_FWMARK
key.fwmark = oldkey->fwmark; key.fwmark = oldkey->fwmark;
#endif #endif
@@ -1880,6 +1918,7 @@ @@ -1880,6 +1918,7 @@ int ip_route_output_slow(struct rtable *
dev_out = &loopback_dev; dev_out = &loopback_dev;
dev_hold(dev_out); dev_hold(dev_out);
key.oif = loopback_dev.ifindex; key.oif = loopback_dev.ifindex;
@ -1248,7 +1248,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
res.type = RTN_LOCAL; res.type = RTN_LOCAL;
flags |= RTCF_LOCAL; flags |= RTCF_LOCAL;
goto make_route; goto make_route;
@@ -1887,7 +1926,7 @@ @@ -1887,7 +1926,7 @@ int ip_route_output_slow(struct rtable *
if (fib_lookup(&key, &res)) { if (fib_lookup(&key, &res)) {
res.fi = NULL; res.fi = NULL;
@ -1257,7 +1257,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
/* Apparently, routing tables are wrong. Assume, /* Apparently, routing tables are wrong. Assume,
that the destination is on link. that the destination is on link.
@@ -1930,6 +1969,7 @@ @@ -1930,6 +1969,7 @@ int ip_route_output_slow(struct rtable *
dev_out = &loopback_dev; dev_out = &loopback_dev;
dev_hold(dev_out); dev_hold(dev_out);
key.oif = dev_out->ifindex; key.oif = dev_out->ifindex;
@ -1265,7 +1265,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
if (res.fi) if (res.fi)
fib_info_put(res.fi); fib_info_put(res.fi);
res.fi = NULL; res.fi = NULL;
@@ -1937,13 +1977,12 @@ @@ -1937,13 +1977,12 @@ int ip_route_output_slow(struct rtable *
goto make_route; goto make_route;
} }
@ -1282,7 +1282,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
if (!key.src) if (!key.src)
key.src = FIB_RES_PREFSRC(res); key.src = FIB_RES_PREFSRC(res);
@@ -2001,7 +2040,9 @@ @@ -2001,7 +2040,9 @@ make_route:
rth->key.tos = tos; rth->key.tos = tos;
rth->key.src = oldkey->src; rth->key.src = oldkey->src;
rth->key.iif = 0; rth->key.iif = 0;
@ -1292,7 +1292,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c
#ifdef CONFIG_IP_ROUTE_FWMARK #ifdef CONFIG_IP_ROUTE_FWMARK
rth->key.fwmark = oldkey->fwmark; rth->key.fwmark = oldkey->fwmark;
#endif #endif
@@ -2080,6 +2121,7 @@ @@ -2080,6 +2121,7 @@ int ip_route_output_key(struct rtable **
rth->key.src == key->src && rth->key.src == key->src &&
rth->key.iif == 0 && rth->key.iif == 0 &&
rth->key.oif == key->oif && rth->key.oif == key->oif &&
@ -1302,9 +1302,9 @@ Index: linux-2.4.35.4/net/ipv4/route.c
#endif #endif
Index: linux-2.4.35.4/net/netsyms.c Index: linux-2.4.35.4/net/netsyms.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/net/netsyms.c 2007-12-15 05:19:36.678511227 +0100 --- linux-2.4.35.4.orig/net/netsyms.c
+++ linux-2.4.35.4/net/netsyms.c 2007-12-15 05:20:13.120587941 +0100 +++ linux-2.4.35.4/net/netsyms.c
@@ -260,6 +260,7 @@ @@ -260,6 +260,7 @@ EXPORT_SYMBOL(inet_register_protosw);
EXPORT_SYMBOL(inet_unregister_protosw); EXPORT_SYMBOL(inet_unregister_protosw);
EXPORT_SYMBOL(ip_route_output_key); EXPORT_SYMBOL(ip_route_output_key);
EXPORT_SYMBOL(ip_route_input); EXPORT_SYMBOL(ip_route_input);

10
target/linux/generic-2.4/patches/801-usb_serial_endpoint_size.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/drivers/usb/serial/usbserial.c Index: linux-2.4.35.4/drivers/usb/serial/usbserial.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/usb/serial/usbserial.c 2007-12-15 05:19:36.542503478 +0100 --- linux-2.4.35.4.orig/drivers/usb/serial/usbserial.c
+++ linux-2.4.35.4/drivers/usb/serial/usbserial.c 2007-12-15 05:20:13.496609372 +0100 +++ linux-2.4.35.4/drivers/usb/serial/usbserial.c
@@ -331,6 +331,7 @@ @@ -331,6 +331,7 @@ static void generic_shutdown (struct us
#ifdef CONFIG_USB_SERIAL_GENERIC #ifdef CONFIG_USB_SERIAL_GENERIC
static __u16 vendor = 0x05f9; static __u16 vendor = 0x05f9;
static __u16 product = 0xffff; static __u16 product = 0xffff;
@ -10,7 +10,7 @@ Index: linux-2.4.35.4/drivers/usb/serial/usbserial.c
static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */ static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */
@@ -1557,7 +1558,11 @@ @@ -1557,7 +1558,11 @@ static void * usb_serial_probe(struct us
err("No free urbs available"); err("No free urbs available");
goto probe_error; goto probe_error;
} }
@ -22,7 +22,7 @@ Index: linux-2.4.35.4/drivers/usb/serial/usbserial.c
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);
if (!port->bulk_in_buffer) { if (!port->bulk_in_buffer) {
@@ -1921,4 +1926,7 @@ @@ -1921,4 +1926,7 @@ MODULE_PARM_DESC(vendor, "User specified
MODULE_PARM(product, "h"); MODULE_PARM(product, "h");
MODULE_PARM_DESC(product, "User specified USB idProduct"); MODULE_PARM_DESC(product, "User specified USB idProduct");

8
target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.4.35.4/drivers/usb/serial/usbserial.c Index: linux-2.4.35.4/drivers/usb/serial/usbserial.c
=================================================================== ===================================================================
--- linux-2.4.35.4.orig/drivers/usb/serial/usbserial.c 2007-12-15 05:20:13.496609372 +0100 --- linux-2.4.35.4.orig/drivers/usb/serial/usbserial.c
+++ linux-2.4.35.4/drivers/usb/serial/usbserial.c 2007-12-15 05:20:13.708621453 +0100 +++ linux-2.4.35.4/drivers/usb/serial/usbserial.c
@@ -333,7 +333,7 @@ @@ -333,7 +333,7 @@ static __u16 vendor = 0x05f9;
static __u16 product = 0xffff; static __u16 product = 0xffff;
static int maxSize = 0; static int maxSize = 0;
@ -11,7 +11,7 @@ Index: linux-2.4.35.4/drivers/usb/serial/usbserial.c
/* All of the device info needed for the Generic Serial Converter */ /* All of the device info needed for the Generic Serial Converter */
static struct usb_serial_device_type generic_device = { static struct usb_serial_device_type generic_device = {
@@ -1836,6 +1836,34 @@ @@ -1836,6 +1836,34 @@ static int __init usb_serial_init(void)
generic_device_ids[0].idVendor = vendor; generic_device_ids[0].idVendor = vendor;
generic_device_ids[0].idProduct = product; generic_device_ids[0].idProduct = product;
generic_device_ids[0].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; generic_device_ids[0].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;