generic-2.4: refresh patches

SVN-Revision: 15860

target/linux/generic-2.4/patches/001-squashfs.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/fs/Config.in
-===================================================================
---- linux-2.4.35.4.orig/fs/Config.in
-+++ linux-2.4.35.4/fs/Config.in
+--- a/fs/Config.in
++++ b/fs/Config.in
 @@ -51,6 +51,14 @@ if [ "$CONFIG_JFFS2_FS" = "y" -o "$CONFI
     int 'JFFS2 debugging verbosity (0 = quiet, 2 = noisy)' CONFIG_JFFS2_FS_DEBUG 0
  fi
@@ -17,10 +15,8 @@ Index: linux-2.4.35.4/fs/Config.in
  bool 'Virtual memory file system support (former shm fs)' CONFIG_TMPFS
  define_bool CONFIG_RAMFS y
  
-Index: linux-2.4.35.4/fs/Makefile
-===================================================================
---- linux-2.4.35.4.orig/fs/Makefile
-+++ linux-2.4.35.4/fs/Makefile
+--- a/fs/Makefile
++++ b/fs/Makefile
 @@ -65,6 +65,7 @@ subdir-$(CONFIG_REISERFS_FS)	+= reiserfs
  subdir-$(CONFIG_DEVPTS_FS)	+= devpts
  subdir-$(CONFIG_SUN_OPENPROMFS)	+= openpromfs
@@ -29,10 +25,8 @@ Index: linux-2.4.35.4/fs/Makefile
  subdir-$(CONFIG_JFS_FS)		+= jfs
  subdir-$(CONFIG_XFS_FS)		+= xfs
  
-Index: linux-2.4.35.4/fs/squashfs/inode.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/squashfs/inode.c
++++ b/fs/squashfs/inode.c
 @@ -0,0 +1,2028 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux
@@ -2062,10 +2056,8 @@ Index: linux-2.4.35.4/fs/squashfs/inode.c
 +MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem");
 +MODULE_AUTHOR("Phillip Lougher <[email protected]>");
 +MODULE_LICENSE("GPL");
-Index: linux-2.4.35.4/fs/squashfs/Makefile
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/squashfs/Makefile
++++ b/fs/squashfs/Makefile
 @@ -0,0 +1,11 @@
 +#
 +# Makefile for the linux squashfs routines.
@@ -2078,10 +2070,8 @@ Index: linux-2.4.35.4/fs/squashfs/Makefile
 +obj-m := $(O_TARGET)
 +
 +include $(TOPDIR)/Rules.make
-Index: linux-2.4.35.4/fs/squashfs/squashfs2_0.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/squashfs/squashfs2_0.c
++++ b/fs/squashfs/squashfs2_0.c
 @@ -0,0 +1,751 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux
@@ -2834,10 +2824,8 @@ Index: linux-2.4.35.4/fs/squashfs/squashfs2_0.c
 +
 +	return 1;
 +}
-Index: linux-2.4.35.4/fs/squashfs/squashfs.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/squashfs/squashfs.h
++++ b/fs/squashfs/squashfs.h
 @@ -0,0 +1,85 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux
@@ -2924,10 +2912,8 @@ Index: linux-2.4.35.4/fs/squashfs/squashfs.h
 +	return 0;
 +}
 +#endif
-Index: linux-2.4.35.4/include/linux/fs.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/fs.h
-+++ linux-2.4.35.4/include/linux/fs.h
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
 @@ -324,6 +324,7 @@ extern void set_bh_page(struct buffer_he
  #include <linux/usbdev_fs_i.h>
  #include <linux/jffs2_fs_i.h>
@@ -2960,10 +2946,8 @@ Index: linux-2.4.35.4/include/linux/fs.h
  		void			*generic_sbp;
  	} u;
  	/*
-Index: linux-2.4.35.4/include/linux/squashfs_fs.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/squashfs_fs.h
++++ b/include/linux/squashfs_fs.h
 @@ -0,0 +1,915 @@
 +#ifndef SQUASHFS_FS
 +#define SQUASHFS_FS
@@ -3880,10 +3864,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
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/squashfs_fs_i.h
++++ b/include/linux/squashfs_fs_i.h
 @@ -0,0 +1,44 @@
 +#ifndef SQUASHFS_FS_I
 +#define SQUASHFS_FS_I
@@ -3929,10 +3911,8 @@ Index: linux-2.4.35.4/include/linux/squashfs_fs_i.h
 +	} u;
 +};
 +#endif
-Index: linux-2.4.35.4/include/linux/squashfs_fs_sb.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/squashfs_fs_sb.h
++++ b/include/linux/squashfs_fs_sb.h
 @@ -0,0 +1,74 @@
 +#ifndef SQUASHFS_FS_SB
 +#define SQUASHFS_FS_SB
@@ -4008,10 +3988,8 @@ Index: linux-2.4.35.4/include/linux/squashfs_fs_sb.h
 +	int			(*read_fragment_index_table)(struct super_block *s);
 +};
 +#endif
-Index: linux-2.4.35.4/init/do_mounts.c
-===================================================================
---- linux-2.4.35.4.orig/init/do_mounts.c
-+++ linux-2.4.35.4/init/do_mounts.c
+--- a/init/do_mounts.c
++++ b/init/do_mounts.c
 @@ -15,6 +15,7 @@
  #include <linux/minix_fs.h>
  #include <linux/ext2_fs.h>
@@ -4060,10 +4038,8 @@ Index: linux-2.4.35.4/init/do_mounts.c
  	/*
  	 * Read block 1 to test for minix and ext2 superblock
  	 */
-Index: linux-2.4.35.4/lib/Config.in
-===================================================================
---- linux-2.4.35.4.orig/lib/Config.in
-+++ linux-2.4.35.4/lib/Config.in
+--- a/lib/Config.in
++++ b/lib/Config.in
 @@ -10,6 +10,7 @@ tristate 'CRC32 functions' CONFIG_CRC32
  # Do we need the compression support?
  #

target/linux/generic-2.4/patches/002-squashfs_lzma.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/fs/squashfs/inode.c
-===================================================================
---- linux-2.4.35.4.orig/fs/squashfs/inode.c
-+++ linux-2.4.35.4/fs/squashfs/inode.c
+--- a/fs/squashfs/inode.c
++++ b/fs/squashfs/inode.c
 @@ -4,6 +4,9 @@
   * Copyright (c) 2002, 2003, 2004, 2005, 2006
   * Phillip Lougher <[email protected]>
@@ -99,10 +97,8 @@ Index: linux-2.4.35.4/fs/squashfs/inode.c
  	unregister_filesystem(&squashfs_fs_type);
  }
  
-Index: linux-2.4.35.4/fs/squashfs/LzmaDecode.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/squashfs/LzmaDecode.c
++++ b/fs/squashfs/LzmaDecode.c
 @@ -0,0 +1,663 @@
 +/*
 +  LzmaDecode.c
@@ -767,10 +763,8 @@ Index: linux-2.4.35.4/fs/squashfs/LzmaDecode.c
 +  *outSizeProcessed = nowPos;
 +  return LZMA_RESULT_OK;
 +}
-Index: linux-2.4.35.4/fs/squashfs/LzmaDecode.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/squashfs/LzmaDecode.h
++++ b/fs/squashfs/LzmaDecode.h
 @@ -0,0 +1,100 @@
 +/* 
 +  LzmaDecode.h
@@ -872,10 +866,8 @@ Index: linux-2.4.35.4/fs/squashfs/LzmaDecode.h
 +    UInt32 *outSizeProcessed);
 +
 +#endif
-Index: linux-2.4.35.4/fs/squashfs/Makefile
-===================================================================
---- linux-2.4.35.4.orig/fs/squashfs/Makefile
-+++ linux-2.4.35.4/fs/squashfs/Makefile
+--- a/fs/squashfs/Makefile
++++ b/fs/squashfs/Makefile
 @@ -4,7 +4,7 @@
  
  O_TARGET := squashfs.o

target/linux/generic-2.4/patches/003-jffs2_compression.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
 @@ -17580,6 +17580,32 @@ CONFIG_JFFS2_FS_DEBUG
    If reporting bugs, please try to have available a full dump of the
    messages at debug level 1 while the misbehaviour was occurring.
@@ -35,10 +33,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help
  JFFS stats available in /proc filesystem
  CONFIG_JFFS_PROC_FS
    Enabling this option will cause statistics from mounted JFFS file systems
-Index: linux-2.4.35.4/fs/Config.in
-===================================================================
---- linux-2.4.35.4.orig/fs/Config.in
-+++ linux-2.4.35.4/fs/Config.in
+--- a/fs/Config.in
++++ b/fs/Config.in
 @@ -50,6 +50,12 @@ dep_tristate 'Journalling Flash File Sys
  if [ "$CONFIG_JFFS2_FS" = "y" -o "$CONFIG_JFFS2_FS" = "m" ] ; then
     int 'JFFS2 debugging verbosity (0 = quiet, 2 = noisy)' CONFIG_JFFS2_FS_DEBUG 0
@@ -52,20 +48,16 @@ Index: linux-2.4.35.4/fs/Config.in
  tristate 'Compressed ROM file system support' CONFIG_CRAMFS
  tristate 'Squashed file system support' CONFIG_SQUASHFS
  if [ "$CONFIG_SQUASHFS" = "y" -o "$CONFIG_SQUASHFS" = "m" ] ; then
-Index: linux-2.4.35.4/fs/jffs2/Config.in.bbc.inc
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/Config.in.bbc.inc
++++ b/fs/jffs2/Config.in.bbc.inc
 @@ -0,0 +1,5 @@
 +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 '  LZARI compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZARI $CONFIG_JFFS2_FS
 +dep_mbool '  LZHD compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZHD $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
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/Configure.help.bbc.inc
++++ b/fs/jffs2/Configure.help.bbc.inc
 @@ -0,0 +1,25 @@
 +ARMLIB compression support for BBC (EXPERIMENTAL)
 +CONFIG_JFFS2_BBC_ARMLIB
@@ -92,10 +84,8 @@ Index: linux-2.4.35.4/fs/jffs2/Configure.help.bbc.inc
 +  This enables simple LempelZiv-Storer-Szymanski compression for BBC
 +  (faster than LZHD, and, and has a not-so-good compression ratio,
 +  was included just for testing)
-Index: linux-2.4.35.4/fs/jffs2/Kconfig.bbc.inc
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/Kconfig.bbc.inc
++++ b/fs/jffs2/Kconfig.bbc.inc
 @@ -0,0 +1,40 @@
 +config JFFS2_BBC_ARMLIB
 +	bool "ARMLIB compression support for BBC (EXPERIMENTAL)"
@@ -137,10 +127,8 @@ Index: linux-2.4.35.4/fs/jffs2/Kconfig.bbc.inc
 +	  This enables simple LempelZiv-Storer-Szymanski compression for BBC
 +	  (faster than LZHD, and, and has a not-so-good compression ratio,
 +	  was included just for testing)
-Index: linux-2.4.35.4/fs/jffs2/Makefile
-===================================================================
---- linux-2.4.35.4.orig/fs/jffs2/Makefile
-+++ linux-2.4.35.4/fs/jffs2/Makefile
+--- a/fs/jffs2/Makefile
++++ b/fs/jffs2/Makefile
 @@ -10,9 +10,23 @@
  # Note 2! The CFLAGS definitions are now in the main makefile...
  
@@ -165,10 +153,8 @@ Index: linux-2.4.35.4/fs/jffs2/Makefile
  	read.o nodemgmt.o readinode.o super.o write.o scan.o gc.o \
  	symlink.o build.o erase.o background.o
  
-Index: linux-2.4.35.4/fs/jffs2/Makefile.bbc.inc
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/Makefile.bbc.inc
++++ b/fs/jffs2/Makefile.bbc.inc
 @@ -0,0 +1,12 @@
 +JFFS2_BBC_KERNEL_OBJS-y = jffs2_bbc_framework.o jffs2_bbc_fs.o
 +
@@ -182,10 +168,8 @@ Index: linux-2.4.35.4/fs/jffs2/Makefile.bbc.inc
 +
 +JFFS2_BBC_MKFS_OBJS   = jffs2_bbc_mkfs.o jffs2_bbc_framework.o jffs2_bbc_armlib_comp.o jffs2_bbc_lzo_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
-===================================================================
---- linux-2.4.35.4.orig/fs/jffs2/compr_zlib.c
-+++ linux-2.4.35.4/fs/jffs2/compr_zlib.c
+--- a/fs/jffs2/compr_zlib.c
++++ b/fs/jffs2/compr_zlib.c
 @@ -85,7 +85,7 @@ void jffs2_zlib_exit(void)
  	vfree(inflate_workspace);
  }
@@ -224,10 +208,8 @@ Index: linux-2.4.35.4/fs/jffs2/compr_zlib.c
 +		jffs2_zlib_decompress(data_in,cpage_out,srclen,destlen);
 +}
 +
-Index: linux-2.4.35.4/fs/jffs2/file.c
-===================================================================
---- linux-2.4.35.4.orig/fs/jffs2/file.c
-+++ linux-2.4.35.4/fs/jffs2/file.c
+--- a/fs/jffs2/file.c
++++ b/fs/jffs2/file.c
 @@ -35,6 +35,7 @@
   *
   */
@@ -244,10 +226,8 @@ Index: linux-2.4.35.4/fs/jffs2/file.c
  			comprtype = jffs2_compress(page_address(pg)+ (file_ofs & (PAGE_CACHE_SIZE-1)), comprbuf, &datalen, &cdatalen);
  		}
  		if (comprtype == JFFS2_COMPR_NONE) {
-Index: linux-2.4.35.4/fs/jffs2/gc.c
-===================================================================
---- linux-2.4.35.4.orig/fs/jffs2/gc.c
-+++ linux-2.4.35.4/fs/jffs2/gc.c
+--- a/fs/jffs2/gc.c
++++ b/fs/jffs2/gc.c
 @@ -35,6 +35,7 @@
   *
   */
@@ -264,10 +244,8 @@ Index: linux-2.4.35.4/fs/jffs2/gc.c
  			comprtype = jffs2_compress(writebuf, comprbuf, &datalen, &cdatalen);
  		}
  		if (comprtype) {
-Index: linux-2.4.35.4/fs/jffs2/hpatch
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/hpatch
++++ b/fs/jffs2/hpatch
 @@ -0,0 +1,191 @@
 +#!/usr/bin/perl
 +# A patch-like utility
@@ -460,10 +438,8 @@ Index: linux-2.4.35.4/fs/jffs2/hpatch
 +}
 +file_end();
 +close(CMD);
-Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_armlib_comp.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_armlib_comp.c
++++ b/fs/jffs2/jffs2_bbc_armlib_comp.c
 @@ -0,0 +1,2224 @@
 +/*
 + * JFFS2-BBC: armlib compressor plugin
@@ -2689,10 +2665,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_armlib_comp.c
 +}
 +
 +/*END OF ARMLIB*/
-Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.c
++++ b/fs/jffs2/jffs2_bbc_framework.c
 @@ -0,0 +1,1324 @@
 +/* 
 + * JFFS2-BBC: Compression Framework
@@ -4018,10 +3992,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.c
 +}
 +
 +#endif
-Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.h
++++ b/fs/jffs2/jffs2_bbc_framework.h
 @@ -0,0 +1,202 @@
 +/*
 + * JFFS2-BBC: Compression Framework - headers
@@ -4225,10 +4197,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.h
 +int jffs2_bbc_get_memory_counter(void);
 +
 +#endif
-Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.c
++++ b/fs/jffs2/jffs2_bbc_fs.c
 @@ -0,0 +1,331 @@
 +/*
 + * JFFS2-BBC: File System Extension for Linux Kernel
@@ -4561,10 +4531,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.c
 +	jffs2_bbc_compressor_deinit();
 +	remove_proc_entry("jffs2_bbc", NULL);
 +}
-Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.h
++++ b/fs/jffs2/jffs2_bbc_fs.h
 @@ -0,0 +1,30 @@
 +/*
 + * JFFS2 BBC: File System Extension for Linux Kernel - headers
@@ -4596,10 +4564,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.h
 +
 +void jffs2_bbc_proc_init(void);
 +void jffs2_bbc_proc_deinit(void);
-Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzari_comp.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzari_comp.c
++++ b/fs/jffs2/jffs2_bbc_lzari_comp.c
 @@ -0,0 +1,788 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 +
@@ -5389,10 +5355,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzari_comp.c
 +{
 +	jffs2_bbc_unregister_compressor (&jffs2_bbc_lzari);
 +}
-Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzhd_comp.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzhd_comp.c
++++ b/fs/jffs2/jffs2_bbc_lzhd_comp.c
 @@ -0,0 +1,747 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 +
@@ -6141,10 +6105,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzhd_comp.c
 +{
 +	jffs2_bbc_unregister_compressor (&jffs2_bbc_lzhd);
 +}
-Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzo_comp.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzo_comp.c
++++ b/fs/jffs2/jffs2_bbc_lzo_comp.c
 @@ -0,0 +1,2435 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 +
@@ -8581,10 +8543,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzo_comp.c
 +{
 +	jffs2_bbc_unregister_compressor (&jffs2_bbc_lzo);
 +}
-Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzss_comp.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzss_comp.c
++++ b/fs/jffs2/jffs2_bbc_lzss_comp.c
 @@ -0,0 +1,385 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 +
@@ -8971,10 +8931,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzss_comp.c
 +{
 +	jffs2_bbc_unregister_compressor (&jffs2_bbc_lzss);
 +}
-Index: linux-2.4.35.4/fs/jffs2/linux-2.4.25.hpatch
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/linux-2.4.25.hpatch
++++ b/fs/jffs2/linux-2.4.25.hpatch
 @@ -0,0 +1,97 @@
 +FMakefile
 +=BBC insertion
@@ -9073,10 +9031,8 @@ Index: linux-2.4.35.4/fs/jffs2/linux-2.4.25.hpatch
 +?{
 ++	jffs2_bbc_proc_deinit(); /**BBC**/
 ++
-Index: linux-2.4.35.4/fs/jffs2/read.c
-===================================================================
---- linux-2.4.35.4.orig/fs/jffs2/read.c
-+++ linux-2.4.35.4/fs/jffs2/read.c
+--- a/fs/jffs2/read.c
++++ b/fs/jffs2/read.c
 @@ -35,6 +35,7 @@
   *
   */
@@ -9093,10 +9049,8 @@ Index: linux-2.4.35.4/fs/jffs2/read.c
  		ret = jffs2_decompress(ri->compr, readbuf, decomprbuf, ri->csize, ri->dsize);
  		if (ret) {
  			printk(KERN_WARNING "Error: jffs2_decompress returned %d\n", ret);
-Index: linux-2.4.35.4/fs/jffs2/super.c
-===================================================================
---- linux-2.4.35.4.orig/fs/jffs2/super.c
-+++ linux-2.4.35.4/fs/jffs2/super.c
+--- a/fs/jffs2/super.c
++++ b/fs/jffs2/super.c
 @@ -35,6 +35,7 @@
   *
   */

target/linux/generic-2.4/patches/004-exec_pagesize.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/include/asm-mips/param.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/param.h
-+++ linux-2.4.35.4/include/asm-mips/param.h
+--- a/include/asm-mips/param.h
++++ b/include/asm-mips/param.h
 @@ -55,7 +55,7 @@
  #endif /* defined(__KERNEL__)  */
  #endif /* defined(HZ)  */

target/linux/generic-2.4/patches/005-mtd_flashtypes.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/drivers/mtd/chips/Config.in
-===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/chips/Config.in
-+++ linux-2.4.35.4/drivers/mtd/chips/Config.in
+--- a/drivers/mtd/chips/Config.in
++++ b/drivers/mtd/chips/Config.in
 @@ -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 AMD/Fujitsu flash chips' CONFIG_MTD_CFI_AMDSTD $CONFIG_MTD_GEN_PROBE
@@ -10,10 +8,8 @@ Index: linux-2.4.35.4/drivers/mtd/chips/Config.in
  
  dep_tristate '  Support for RAM chips in bus mapping' CONFIG_MTD_RAM $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
-===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/chips/Makefile
-+++ linux-2.4.35.4/drivers/mtd/chips/Makefile
+--- a/drivers/mtd/chips/Makefile
++++ b/drivers/mtd/chips/Makefile
 @@ -18,6 +18,7 @@ obj-$(CONFIG_MTD)		+= chipreg.o
  obj-$(CONFIG_MTD_AMDSTD)	+= amd_flash.o 
  obj-$(CONFIG_MTD_CFI)		+= cfi_probe.o
@@ -22,10 +18,8 @@ Index: linux-2.4.35.4/drivers/mtd/chips/Makefile
  obj-$(CONFIG_MTD_CFI_AMDSTD)	+= cfi_cmdset_0002.o
  obj-$(CONFIG_MTD_CFI_INTELEXT)	+= cfi_cmdset_0001.o
  obj-$(CONFIG_MTD_GEN_PROBE)	+= gen_probe.o
-Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0701.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0701.c
++++ b/drivers/mtd/chips/cfi_cmdset_0701.c
 @@ -0,0 +1,855 @@
 +/*
 + * Common Flash Interface support:
@@ -882,10 +876,8 @@ Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0701.c
 +module_init(cfi_sststd_init);
 +module_exit(cfi_sststd_exit);
 +
-Index: linux-2.4.35.4/drivers/mtd/chips/cfi_probe.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/chips/cfi_probe.c
-+++ linux-2.4.35.4/drivers/mtd/chips/cfi_probe.c
+--- a/drivers/mtd/chips/cfi_probe.c
++++ b/drivers/mtd/chips/cfi_probe.c
 @@ -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(0x98, 0x55, base, map, cfi, cfi->device_type, NULL);
@@ -904,10 +896,8 @@ Index: linux-2.4.35.4/drivers/mtd/chips/cfi_probe.c
  
  	if (!cfi->numchips) {
  		/* This is the first time we're called. Set up the CFI 
-Index: linux-2.4.35.4/drivers/mtd/chips/gen_probe.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/chips/gen_probe.c
-+++ linux-2.4.35.4/drivers/mtd/chips/gen_probe.c
+--- a/drivers/mtd/chips/gen_probe.c
++++ b/drivers/mtd/chips/gen_probe.c
 @@ -328,13 +328,18 @@ static struct mtd_info *check_cmd_set(st
  		return cfi_cmdset_0001(map, primary);
  #endif

target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch

@@ -1,7 +1,5 @@
-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
-+++ linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c
+--- a/drivers/mtd/chips/cfi_cmdset_0001.c
++++ b/drivers/mtd/chips/cfi_cmdset_0001.c
 @@ -28,10 +28,18 @@
  #include <linux/slab.h>
  #include <linux/delay.h>
@@ -80,10 +78,8 @@ Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c
  	kfree(cfi->cmdset_priv);
  	kfree(cfi->cfiq);
  	kfree(cfi);
-Index: linux-2.4.35.4/include/linux/mtd/mtd.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/mtd/mtd.h
-+++ linux-2.4.35.4/include/linux/mtd/mtd.h
+--- a/include/linux/mtd/mtd.h
++++ b/include/linux/mtd/mtd.h
 @@ -10,6 +10,7 @@
  #include <linux/version.h>
  #include <linux/types.h>

target/linux/generic-2.4/patches/009-mtd_uaccess.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/drivers/mtd/mtdchar.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/mtdchar.c
-+++ linux-2.4.35.4/drivers/mtd/mtdchar.c
+--- a/drivers/mtd/mtdchar.c
++++ b/drivers/mtd/mtdchar.c
 @@ -558,13 +558,13 @@ static void mtd_notify_add(struct mtd_in
  	sprintf(name, "%d", mtd->index);
  	devfs_rw_handle[mtd->index] = devfs_register(devfs_dir_handle, name,
@@ -18,10 +16,8 @@ Index: linux-2.4.35.4/drivers/mtd/mtdchar.c
  			&mtd_fops, NULL);
  }
  
-Index: linux-2.4.35.4/drivers/mtd/mtdblock.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/mtdblock.c
-+++ linux-2.4.35.4/drivers/mtd/mtdblock.c
+--- a/drivers/mtd/mtdblock.c
++++ b/drivers/mtd/mtdblock.c
 @@ -601,7 +601,7 @@ static void mtd_notify_add(struct mtd_in
          sprintf(name, "%d", mtd->index);
          devfs_rw_handle[mtd->index] = devfs_register(devfs_dir_handle, name,

target/linux/generic-2.4/patches/010-disable_old_squashfs_compatibility.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/fs/squashfs/Makefile
-===================================================================
---- linux-2.4.35.4.orig/fs/squashfs/Makefile
-+++ linux-2.4.35.4/fs/squashfs/Makefile
+--- a/fs/squashfs/Makefile
++++ b/fs/squashfs/Makefile
 @@ -4,7 +4,7 @@
  
  O_TARGET := squashfs.o
@@ -11,10 +9,8 @@ Index: linux-2.4.35.4/fs/squashfs/Makefile
  
  obj-m := $(O_TARGET)
  
-Index: linux-2.4.35.4/fs/squashfs/squashfs.h
-===================================================================
---- linux-2.4.35.4.orig/fs/squashfs/squashfs.h
-+++ linux-2.4.35.4/fs/squashfs/squashfs.h
+--- a/fs/squashfs/squashfs.h
++++ b/fs/squashfs/squashfs.h
 @@ -24,6 +24,9 @@
  #ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
  #undef CONFIG_SQUASHFS_1_0_COMPATIBILITY

target/linux/generic-2.4/patches/050-build_flags.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/arch/mips/Makefile
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/Makefile
-+++ linux-2.4.35.4/arch/mips/Makefile
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
 @@ -44,10 +44,10 @@ MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
  GCCFLAGS	:= -I $(TOPDIR)/include/asm/gcc
  GCCFLAGS	+= -G 0 -mno-abicalls -fno-pic -pipe
@@ -49,10 +47,8 @@ Index: linux-2.4.35.4/arch/mips/Makefile
  CFLAGS		+= $(GCCFLAGS)
  
  LD		+= -m $(ld-emul)
-Index: linux-2.4.35.4/Makefile
-===================================================================
---- linux-2.4.35.4.orig/Makefile
-+++ linux-2.4.35.4/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -17,7 +17,7 @@ HPATH   	= $(TOPDIR)/include
  FINDHPATH	= $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net $(HPATH)/math-emu
  

target/linux/generic-2.4/patches/051-parallel_build.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/arch/mips/Makefile
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/Makefile
-+++ linux-2.4.35.4/arch/mips/Makefile
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
 @@ -739,6 +739,7 @@ LINKFLAGS	+= -T arch/$(ARCH)/ld.script
  HEAD := arch/mips/kernel/head.o arch/mips/kernel/init_task.o
  

target/linux/generic-2.4/patches/051-remove_pcmcia_modinst_compat.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/Makefile
-===================================================================
---- linux-2.4.35.4.orig/Makefile
-+++ linux-2.4.35.4/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -428,18 +428,9 @@ else
  depmod_opts	:= -b $(INSTALL_MOD_PATH) -r
  endif

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

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/include/linux/netdevice.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/netdevice.h
-+++ linux-2.4.35.4/include/linux/netdevice.h
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
 @@ -295,7 +295,9 @@ struct net_device
  
  	/* List of functions to handle Wireless Extensions (instead of ioctl).
@@ -13,10 +11,8 @@ Index: linux-2.4.35.4/include/linux/netdevice.h
  
  	struct ethtool_ops *ethtool_ops;
  
-Index: linux-2.4.35.4/include/linux/wireless.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/wireless.h
-+++ linux-2.4.35.4/include/linux/wireless.h
+--- a/include/linux/wireless.h
++++ b/include/linux/wireless.h
 @@ -1,10 +1,10 @@
  /*
   * This file define a set of standard wireless extensions
@@ -472,10 +468,8 @@ Index: linux-2.4.35.4/include/linux/wireless.h
  };
  
  /*
-Index: linux-2.4.35.4/include/net/iw_handler.h
-===================================================================
---- linux-2.4.35.4.orig/include/net/iw_handler.h
-+++ linux-2.4.35.4/include/net/iw_handler.h
+--- a/include/net/iw_handler.h
++++ b/include/net/iw_handler.h
 @@ -1,10 +1,10 @@
  /*
   * This file define the new driver API for Wireless Extensions
@@ -593,10 +587,8 @@ Index: linux-2.4.35.4/include/net/iw_handler.h
  };
  
  /**************************** PROTOTYPES ****************************/
-Index: linux-2.4.35.4/net/core/dev.c
-===================================================================
---- linux-2.4.35.4.orig/net/core/dev.c
-+++ linux-2.4.35.4/net/core/dev.c
+--- a/net/core/dev.c
++++ b/net/core/dev.c
 @@ -2426,7 +2426,7 @@ int dev_ioctl(unsigned int cmd, void *ar
  				/* Follow me in net/core/wireless.c */
  				ret = wireless_process_ioctl(&ifr, cmd);
@@ -606,10 +598,8 @@ Index: linux-2.4.35.4/net/core/dev.c
  				    copy_to_user(arg, &ifr, sizeof(struct ifreq)))
  					return -EFAULT;
  				return ret;
-Index: linux-2.4.35.4/net/core/wireless.c
-===================================================================
---- linux-2.4.35.4.orig/net/core/wireless.c
-+++ linux-2.4.35.4/net/core/wireless.c
+--- a/net/core/wireless.c
++++ b/net/core/wireless.c
 @@ -2,7 +2,7 @@
   * This file implement the Wireless Extensions APIs.
   *

target/linux/generic-2.4/patches/106-mppe_mppc.patch

@@ -4,10 +4,8 @@ Microsoft Point-to-Point Encryption / Compression support
 
   http://www.polbox.com/h/hs001/linux-2.4.29-mppe-mppc-1.3.patch.gz
 
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
 @@ -9974,6 +9974,28 @@ CONFIG_PPP_BSDCOMP
    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.
@@ -37,10 +35,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help
  PPP over Ethernet
  CONFIG_PPPOE
    Support for PPP over Ethernet.
-Index: linux-2.4.35.4/crypto/Config.in
-===================================================================
---- linux-2.4.35.4.orig/crypto/Config.in
-+++ linux-2.4.35.4/crypto/Config.in
+--- a/crypto/Config.in
++++ b/crypto/Config.in
 @@ -11,7 +11,9 @@ if [ "$CONFIG_INET_AH" = "y" -o \
       "$CONFIG_INET6_AH" = "y" -o \
       "$CONFIG_INET6_AH" = "m" -o \
@@ -102,10 +98,8 @@ Index: linux-2.4.35.4/crypto/Config.in
    if [ "$CONFIG_INET_IPCOMP" = "y" -o \
         "$CONFIG_INET_IPCOMP" = "m" -o \
         "$CONFIG_INET6_IPCOMP" = "y" -o \
-Index: linux-2.4.35.4/drivers/net/Config.in
-===================================================================
---- linux-2.4.35.4.orig/drivers/net/Config.in
-+++ linux-2.4.35.4/drivers/net/Config.in
+--- a/drivers/net/Config.in
++++ b/drivers/net/Config.in
 @@ -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 Deflate compression' CONFIG_PPP_DEFLATE $CONFIG_PPP
@@ -114,10 +108,8 @@ Index: linux-2.4.35.4/drivers/net/Config.in
     if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
        dep_tristate '  PPP over Ethernet (EXPERIMENTAL)' CONFIG_PPPOE $CONFIG_PPP
     fi
-Index: linux-2.4.35.4/drivers/net/Makefile
-===================================================================
---- linux-2.4.35.4.orig/drivers/net/Makefile
-+++ linux-2.4.35.4/drivers/net/Makefile
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
 @@ -166,6 +166,7 @@ obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
  obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
  obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o
@@ -126,10 +118,8 @@ Index: linux-2.4.35.4/drivers/net/Makefile
  obj-$(CONFIG_PPPOE) += pppox.o pppoe.o
  
  obj-$(CONFIG_SLIP) += slip.o
-Index: linux-2.4.35.4/drivers/net/ppp_generic.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/net/ppp_generic.c
-+++ linux-2.4.35.4/drivers/net/ppp_generic.c
+--- a/drivers/net/ppp_generic.c
++++ b/drivers/net/ppp_generic.c
 @@ -19,7 +19,7 @@
   * PPP driver, written by Michael Callahan and Al Longyear, and
   * subsequently hacked by Paul Mackerras.
@@ -263,10 +253,8 @@ Index: linux-2.4.35.4/drivers/net/ppp_generic.c
  	init_ppp_file(&ppp->file, INTERFACE);
  	ppp->file.hdrlen = PPP_HDRLEN - 2;	/* don't count proto bytes */
  	for (i = 0; i < NUM_NP; ++i)
-Index: linux-2.4.35.4/drivers/net/ppp_mppe_mppc.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/drivers/net/ppp_mppe_mppc.c
++++ b/drivers/net/ppp_mppe_mppc.c
 @@ -0,0 +1,1312 @@
 +/*
 + * ppp_mppe_mppc.c - MPPC/MPPE "compressor/decompressor" module.
@@ -1580,10 +1568,8 @@ Index: linux-2.4.35.4/drivers/net/ppp_mppe_mppc.c
 +MODULE_AUTHOR("Jan Dubiec <[email protected]>");
 +MODULE_DESCRIPTION("MPPE/MPPC encryption/compression module for Linux");
 +MODULE_LICENSE("Dual BSD/GPL");
-Index: linux-2.4.35.4/include/linux/ppp-comp.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/ppp-comp.h
-+++ linux-2.4.35.4/include/linux/ppp-comp.h
+--- a/include/linux/ppp-comp.h
++++ b/include/linux/ppp-comp.h
 @@ -28,7 +28,7 @@
   */
  

target/linux/generic-2.4/patches/107-cifs.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
 @@ -17995,6 +17995,34 @@ CONFIG_UNIXWARE_DISKLABEL
  
    If you don't know what all this is about, say N.
@@ -37,10 +35,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help
  SMB file system support (to mount Windows shares etc.)
  CONFIG_SMB_FS
    SMB (Server Message Block) is the protocol Windows for Workgroups
-Index: linux-2.4.35.4/Documentation/filesystems/00-INDEX
-===================================================================
---- linux-2.4.35.4.orig/Documentation/filesystems/00-INDEX
-+++ linux-2.4.35.4/Documentation/filesystems/00-INDEX
+--- a/Documentation/filesystems/00-INDEX
++++ b/Documentation/filesystems/00-INDEX
 @@ -10,6 +10,8 @@ befs.txt
  	- info for the BeOS file system (BFS)
  bfs.txt
@@ -50,10 +46,8 @@ Index: linux-2.4.35.4/Documentation/filesystems/00-INDEX
  coda.txt
  	- description of the CODA filesystem.
  cramfs.txt
-Index: linux-2.4.35.4/Documentation/filesystems/cifs.txt
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/Documentation/filesystems/cifs.txt
++++ b/Documentation/filesystems/cifs.txt
 @@ -0,0 +1,51 @@
 +  This is the client VFS module for the Common Internet File System
 +  (CIFS) protocol which is the successor to the Server Message Block 
@@ -106,10 +100,8 @@ Index: linux-2.4.35.4/Documentation/filesystems/cifs.txt
 +  or the Samba site:
 +     
 +      http://www.samba.org
-Index: linux-2.4.35.4/fs/cifs/asn1.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/asn1.c
++++ b/fs/cifs/asn1.c
 @@ -0,0 +1,614 @@
 +/* 
 + * The ASB.1/BER parsing code is derived from ip_nat_snmp_basic.c which was in
@@ -725,10 +717,8 @@ Index: linux-2.4.35.4/fs/cifs/asn1.c
 +
 +	return 1;
 +}
-Index: linux-2.4.35.4/fs/cifs/AUTHORS
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/AUTHORS
++++ b/fs/cifs/AUTHORS
 @@ -0,0 +1,37 @@
 +Original Author
 +===============
@@ -767,10 +757,8 @@ Index: linux-2.4.35.4/fs/cifs/AUTHORS
 +
 +And thanks to the IBM LTC and Power test teams and SuSE testers for
 +finding multiple bugs during excellent stress test runs.
-Index: linux-2.4.35.4/fs/cifs/CHANGES
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/CHANGES
++++ b/fs/cifs/CHANGES
 @@ -0,0 +1,572 @@
 +Version 1.20
 +------------
@@ -1344,10 +1332,8 @@ Index: linux-2.4.35.4/fs/cifs/CHANGES
 +-----------
 +Initial drop
 +
-Index: linux-2.4.35.4/fs/cifs/cifs_debug.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifs_debug.c
++++ b/fs/cifs/cifs_debug.c
 @@ -0,0 +1,797 @@
 +/*
 + *   fs/cifs_debug.c
@@ -2146,10 +2132,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_debug.c
 +
 +
 +#endif
-Index: linux-2.4.35.4/fs/cifs/cifs_debug.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifs_debug.h
++++ b/fs/cifs/cifs_debug.h
 @@ -0,0 +1,66 @@
 +/*
 + *
@@ -2217,10 +2201,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_debug.h
 +#endif		/* _CIFS_DEBUG */
 +
 +#endif				/* _H_CIFS_DEBUG */
-Index: linux-2.4.35.4/fs/cifs/cifsencrypt.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifsencrypt.c
++++ b/fs/cifs/cifsencrypt.c
 @@ -0,0 +1,204 @@
 +/*
 + *   fs/cifs/cifsencrypt.c
@@ -2426,10 +2408,8 @@ Index: linux-2.4.35.4/fs/cifs/cifsencrypt.c
 +
 +	hmac_md5_final(v2_session_response,&context);
 +}
-Index: linux-2.4.35.4/fs/cifs/cifserr.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifserr.c
++++ b/fs/cifs/cifserr.c
 @@ -0,0 +1,70 @@
 +/*
 + *   fs/cifserr.c
@@ -2501,10 +2481,8 @@ Index: linux-2.4.35.4/fs/cifs/cifserr.c
 +{
 +	return map_cifs_error(error_class, error_code, FALSE);
 +}
-Index: linux-2.4.35.4/fs/cifs/cifsfs.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifsfs.c
++++ b/fs/cifs/cifsfs.c
 @@ -0,0 +1,769 @@
 +/*
 + *   fs/cifs/cifsfs.c
@@ -3275,10 +3253,8 @@ Index: linux-2.4.35.4/fs/cifs/cifsfs.c
 +    ("VFS to access servers complying with the SNIA CIFS Specification e.g. Samba and Windows");
 +module_init(init_cifs)
 +module_exit(exit_cifs)
-Index: linux-2.4.35.4/fs/cifs/cifsfs.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifsfs.h
++++ b/fs/cifs/cifsfs.h
 @@ -0,0 +1,97 @@
 +/*
 + *   fs/cifs/cifsfs.h
@@ -3377,10 +3353,8 @@ Index: linux-2.4.35.4/fs/cifs/cifsfs.h
 +extern ssize_t	cifs_listxattr(struct dentry *, char *, size_t);
 +#define CIFS_VERSION   "1.20"
 +#endif				/* _CIFSFS_H */
-Index: linux-2.4.35.4/fs/cifs/cifs_fs_sb.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifs_fs_sb.h
++++ b/fs/cifs/cifs_fs_sb.h
 @@ -0,0 +1,32 @@
 +/*
 + *   fs/cifs/cifs_fs_sb.h
@@ -3414,10 +3388,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_fs_sb.h
 +	mode_t	mnt_dir_mode;
 +};
 +#endif				/* _CIFS_FS_SB_H */
-Index: linux-2.4.35.4/fs/cifs/cifsglob.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifsglob.h
++++ b/fs/cifs/cifsglob.h
 @@ -0,0 +1,413 @@
 +/*
 + *   fs/cifs/cifsglob.h
@@ -3832,10 +3804,8 @@ Index: linux-2.4.35.4/fs/cifs/cifsglob.h
 +GLOBAL_EXTERN unsigned int sign_CIFS_PDUs;  /* enable smb packet signing */
 +GLOBAL_EXTERN unsigned int linuxExtEnabled;  /* enable Linux/Unix CIFS extensions */
 +
-Index: linux-2.4.35.4/fs/cifs/cifspdu.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifspdu.h
++++ b/fs/cifs/cifspdu.h
 @@ -0,0 +1,1793 @@
 +/*
 + *   fs/cifs/cifspdu.h
@@ -5630,10 +5600,8 @@ Index: linux-2.4.35.4/fs/cifs/cifspdu.h
 +#pragma pack()			/* resume default structure packing */
 +
 +#endif				/* _CIFSPDU_H */
-Index: linux-2.4.35.4/fs/cifs/cifsproto.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifsproto.h
++++ b/fs/cifs/cifsproto.h
 @@ -0,0 +1,254 @@
 +/*
 + *   fs/cifs/cifsproto.h
@@ -5889,10 +5857,8 @@ Index: linux-2.4.35.4/fs/cifs/cifsproto.h
 +		 char * EAData, size_t size,
 +		 const struct nls_table *nls_codepage);
 +#endif			/* _CIFSPROTO_H */
-Index: linux-2.4.35.4/fs/cifs/cifssmb.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifssmb.c
++++ b/fs/cifs/cifssmb.c
 @@ -0,0 +1,3016 @@
 +/*
 + *   fs/cifs/cifssmb.c
@@ -8910,10 +8876,8 @@ Index: linux-2.4.35.4/fs/cifs/cifssmb.c
 +	return rc;
 +}
 +#endif
-Index: linux-2.4.35.4/fs/cifs/cifs_unicode.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifs_unicode.c
++++ b/fs/cifs/cifs_unicode.c
 @@ -0,0 +1,87 @@
 +/*
 + *   fs/cifs/cifs_unicode.c
@@ -9002,10 +8966,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_unicode.c
 +	return i;
 +}
 +
-Index: linux-2.4.35.4/fs/cifs/cifs_unicode.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifs_unicode.h
++++ b/fs/cifs/cifs_unicode.h
 @@ -0,0 +1,353 @@
 +/*
 + * cifs_unicode:  Unicode kernel case support
@@ -9360,10 +9322,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_unicode.h
 +}
 +
 +#endif
-Index: linux-2.4.35.4/fs/cifs/cifs_uniupr.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifs_uniupr.h
++++ b/fs/cifs/cifs_uniupr.h
 @@ -0,0 +1,253 @@
 +/*
 + *   Copyright (c) International Business Machines  Corp., 2000,2002
@@ -9618,10 +9578,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_uniupr.h
 +	0, 0, 0
 +};
 +#endif
-Index: linux-2.4.35.4/fs/cifs/connect.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/connect.c
++++ b/fs/cifs/connect.c
 @@ -0,0 +1,2924 @@
 +/*
 + *   fs/cifs/connect.c
@@ -12547,10 +12505,8 @@ Index: linux-2.4.35.4/fs/cifs/connect.c
 +	return rc;
 +}
 +
-Index: linux-2.4.35.4/fs/cifs/dir.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/dir.c
++++ b/fs/cifs/dir.c
 @@ -0,0 +1,425 @@
 +/*
 + *   fs/cifs/dir.c
@@ -12977,10 +12933,8 @@ Index: linux-2.4.35.4/fs/cifs/dir.c
 +/* d_delete:       cifs_d_delete,       *//* not needed except for debugging */
 +	/* no need for d_hash, d_compare, d_release, d_iput ... yet. BB confirm this BB */
 +};
-Index: linux-2.4.35.4/fs/cifs/file.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/file.c
++++ b/fs/cifs/file.c
 @@ -0,0 +1,2185 @@
 +/*
 + *   fs/cifs/file.c
@@ -15167,10 +15121,8 @@ Index: linux-2.4.35.4/fs/cifs/file.c
 +	.sync_page = cifs_sync_page,
 +	/*.direct_IO = */
 +};
-Index: linux-2.4.35.4/fs/cifs/inode.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/inode.c
++++ b/fs/cifs/inode.c
 @@ -0,0 +1,1079 @@
 +/*
 + *   fs/cifs/inode.c
@@ -16251,10 +16203,8 @@ Index: linux-2.4.35.4/fs/cifs/inode.c
 +	/* may have to add back in if and when safe distributed caching of
 +		directories added e.g. via FindNotify */
 +}
-Index: linux-2.4.35.4/fs/cifs/link.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/link.c
++++ b/fs/cifs/link.c
 @@ -0,0 +1,328 @@
 +/*
 + *   fs/cifs/link.c
@@ -16584,10 +16534,8 @@ Index: linux-2.4.35.4/fs/cifs/link.c
 +	FreeXid(xid);
 +	return rc;
 +}
-Index: linux-2.4.35.4/fs/cifs/Makefile
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/Makefile
++++ b/fs/cifs/Makefile
 @@ -0,0 +1,10 @@
 +#
 +# Makefile for Linux CIFS VFS client 
@@ -16599,10 +16547,8 @@ Index: linux-2.4.35.4/fs/cifs/Makefile
 +obj-m := $(O_TARGET)
 +
 +include $(TOPDIR)/Rules.make
-Index: linux-2.4.35.4/fs/cifs/md4.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/md4.c
++++ b/fs/cifs/md4.c
 @@ -0,0 +1,203 @@
 +/* 
 +   Unix SMB/Netbios implementation.
@@ -16807,10 +16753,8 @@ Index: linux-2.4.35.4/fs/cifs/md4.c
 +
 +	A = B = C = D = 0;
 +}
-Index: linux-2.4.35.4/fs/cifs/md5.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/md5.c
++++ b/fs/cifs/md5.c
 @@ -0,0 +1,363 @@
 +/*
 + * This code implements the MD5 message-digest algorithm.
@@ -17175,10 +17119,8 @@ Index: linux-2.4.35.4/fs/cifs/md5.c
 +	}
 +	hmac_md5_final(digest, &ctx);
 +}
-Index: linux-2.4.35.4/fs/cifs/md5.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/md5.h
++++ b/fs/cifs/md5.h
 @@ -0,0 +1,38 @@
 +#ifndef MD5_H
 +#define MD5_H
@@ -17218,10 +17160,8 @@ Index: linux-2.4.35.4/fs/cifs/md5.h
 +void hmac_md5_final(unsigned char *digest, struct HMACMD5Context *ctx);
 +void hmac_md5(unsigned char key[16], unsigned char *data, int data_len,
 +			unsigned char *digest);
-Index: linux-2.4.35.4/fs/cifs/misc.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/misc.c
++++ b/fs/cifs/misc.c
 @@ -0,0 +1,463 @@
 +/*
 + *   fs/cifs/misc.c
@@ -17686,10 +17626,8 @@ Index: linux-2.4.35.4/fs/cifs/misc.c
 +	printk( " | %s\n", debug_line);
 +	return;
 +}
-Index: linux-2.4.35.4/fs/cifs/netmisc.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/netmisc.c
++++ b/fs/cifs/netmisc.c
 @@ -0,0 +1,905 @@
 +/*
 + *   fs/cifs/netmisc.c
@@ -18596,10 +18534,8 @@ Index: linux-2.4.35.4/fs/cifs/netmisc.c
 +	dce_time += NTFS_TIME_OFFSET;
 +	return dce_time;
 +}
-Index: linux-2.4.35.4/fs/cifs/nterr.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/nterr.c
++++ b/fs/cifs/nterr.c
 @@ -0,0 +1,687 @@
 +/* 
 + *  Unix SMB/Netbios implementation.
@@ -19288,10 +19224,8 @@ Index: linux-2.4.35.4/fs/cifs/nterr.c
 +	{"STATUS_SOME_UNMAPPED", STATUS_SOME_UNMAPPED},
 +	{NULL, 0}
 +};
-Index: linux-2.4.35.4/fs/cifs/nterr.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/nterr.h
++++ b/fs/cifs/nterr.h
 @@ -0,0 +1,556 @@
 +/* 
 +   Unix SMB/Netbios implementation.
@@ -19849,10 +19783,8 @@ Index: linux-2.4.35.4/fs/cifs/nterr.h
 +#define NT_STATUS_NO_SUCH_JOB 0xC0000000 | 0xEDE	/* scheduler */
 +
 +#endif				/* _NTERR_H */
-Index: linux-2.4.35.4/fs/cifs/ntlmssp.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/ntlmssp.h
++++ b/fs/cifs/ntlmssp.h
 @@ -0,0 +1,101 @@
 +/*
 + *   fs/cifs/ntlmssp.h
@@ -19955,10 +19887,8 @@ Index: linux-2.4.35.4/fs/cifs/ntlmssp.h
 +} AUTHENTICATE_MESSAGE, *PAUTHENTICATE_MESSAGE;
 +
 +#pragma pack()			/* resume default structure packing */
-Index: linux-2.4.35.4/fs/cifs/README
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/README
++++ b/fs/cifs/README
 @@ -0,0 +1,356 @@
 +The CIFS VFS support for Linux supports many advanced network filesystem 
 +features such as heirarchical dfs like namespace, hardlinks, locking and more.  
@@ -20316,10 +20246,8 @@ Index: linux-2.4.35.4/fs/cifs/README
 +Windows 2000 server or Samba since it does not usually send "raw NTLMSSP" 
 +(instead it sends NTLMSSP encapsulated in SPNEGO/GSSAPI, which support is not 
 +complete in the CIFS VFS yet).  
-Index: linux-2.4.35.4/fs/cifs/rfc1002pdu.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/rfc1002pdu.h
++++ b/fs/cifs/rfc1002pdu.h
 @@ -0,0 +1,79 @@
 +/*
 + *   fs/cifs/rfc1002pdu.h
@@ -20400,10 +20328,8 @@ Index: linux-2.4.35.4/fs/cifs/rfc1002pdu.h
 +
 +#pragma pack()		/* resume default structure packing */
 +                                                             
-Index: linux-2.4.35.4/fs/cifs/smbdes.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/smbdes.c
++++ b/fs/cifs/smbdes.c
 @@ -0,0 +1,408 @@
 +/* 
 +   Unix SMB/Netbios implementation.
@@ -20813,10 +20739,8 @@ Index: linux-2.4.35.4/fs/cifs/smbdes.c
 +	key2[0] = key[7];
 +	smbhash(out + 8, in + 8, key2, forw);
 +}
-Index: linux-2.4.35.4/fs/cifs/smbencrypt.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/smbencrypt.c
++++ b/fs/cifs/smbencrypt.c
 @@ -0,0 +1,295 @@
 +/* 
 +   Unix SMB/Netbios implementation.
@@ -21113,10 +21037,8 @@ Index: linux-2.4.35.4/fs/cifs/smbencrypt.c
 +{
 +	mdfour((unsigned char *) sess_key, (unsigned char *) kr, 16);
 +}
-Index: linux-2.4.35.4/fs/cifs/smberr.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/smberr.c
++++ b/fs/cifs/smberr.c
 @@ -0,0 +1,240 @@
 +/* 
 +   Unix SMB/Netbios implementation.
@@ -21358,10 +21280,8 @@ Index: linux-2.4.35.4/fs/cifs/smberr.c
 +	NTSTATUS status = map_nt_error_from_unix(error);
 +	return ntstatus_to_werror(status);
 +}
-Index: linux-2.4.35.4/fs/cifs/smberr.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/smberr.h
++++ b/fs/cifs/smberr.h
 @@ -0,0 +1,113 @@
 +/*
 + *   fs/cifs/smberr.h
@@ -21476,10 +21396,8 @@ Index: linux-2.4.35.4/fs/cifs/smberr.h
 +#define ERRpasswordExpired 2242
 +#define ERRnetlogonNotStarted 2455
 +#define ERRnosupport       0xFFFF
-Index: linux-2.4.35.4/fs/cifs/TODO
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/TODO
++++ b/fs/cifs/TODO
 @@ -0,0 +1,106 @@
 +version 1.16 May 27, 2004
 +
@@ -21587,10 +21505,8 @@ Index: linux-2.4.35.4/fs/cifs/TODO
 +4) More exhaustively test the recently added NT4 support against various
 +NT4 service pack levels.
 +
-Index: linux-2.4.35.4/fs/cifs/transport.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/cifs/transport.c
++++ b/fs/cifs/transport.c
 @@ -0,0 +1,434 @@
 +/*
 + *   fs/cifs/transport.c
@@ -22026,10 +21942,8 @@ Index: linux-2.4.35.4/fs/cifs/transport.c
 +
 +	return rc;
 +}
-Index: linux-2.4.35.4/fs/Config.in
-===================================================================
---- linux-2.4.35.4.orig/fs/Config.in
-+++ linux-2.4.35.4/fs/Config.in
+--- a/fs/Config.in
++++ b/fs/Config.in
 @@ -153,6 +153,10 @@ if [ "$CONFIG_NET" = "y" ]; then
       define_bool CONFIG_LOCKD_V4 y
     fi
@@ -22041,10 +21955,8 @@ Index: linux-2.4.35.4/fs/Config.in
     dep_tristate 'SMB file system support (to mount Windows shares etc.)' CONFIG_SMB_FS $CONFIG_INET
     if [ "$CONFIG_SMB_FS" != "n" ]; then
        bool '  Use a default NLS' CONFIG_SMB_NLS_DEFAULT
-Index: linux-2.4.35.4/fs/Makefile
-===================================================================
---- linux-2.4.35.4.orig/fs/Makefile
-+++ linux-2.4.35.4/fs/Makefile
+--- a/fs/Makefile
++++ b/fs/Makefile
 @@ -37,6 +37,7 @@ subdir-$(CONFIG_MSDOS_FS)	+= msdos
  subdir-$(CONFIG_VFAT_FS)	+= vfat
  subdir-$(CONFIG_BFS_FS)		+= bfs
@@ -22053,10 +21965,8 @@ Index: linux-2.4.35.4/fs/Makefile
  subdir-$(CONFIG_DEVFS_FS)	+= devfs
  subdir-$(CONFIG_HFSPLUS_FS)	+= hfsplus # Before hfs to find wrapped HFS+
  subdir-$(CONFIG_HFS_FS)		+= hfs
-Index: linux-2.4.35.4/fs/nls/Config.in
-===================================================================
---- linux-2.4.35.4.orig/fs/nls/Config.in
-+++ linux-2.4.35.4/fs/nls/Config.in
+--- a/fs/nls/Config.in
++++ b/fs/nls/Config.in
 @@ -11,6 +11,7 @@ fi
  
  # msdos and Joliet want NLS

target/linux/generic-2.4/patches/108-optional_aout_support.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
 @@ -4690,6 +4690,12 @@ CONFIG_BINFMT_ELF
    ld.so (check the file <file:Documentation/Changes> for location and
    latest version).
@@ -31,10 +29,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help
  
  OSF/1 v4 readv/writev compatibility
  CONFIG_OSF4_COMPAT
-Index: linux-2.4.35.4/arch/alpha/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/alpha/config.in
-+++ linux-2.4.35.4/arch/alpha/config.in
+--- a/arch/alpha/config.in
++++ b/arch/alpha/config.in
 @@ -315,6 +315,9 @@ if [ "$CONFIG_BINFMT_AOUT" != "n" ]; the
  fi
  
@@ -45,10 +41,8 @@ Index: linux-2.4.35.4/arch/alpha/config.in
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  tristate 'Kernel support for Linux/Intel ELF binaries' CONFIG_BINFMT_EM86
  source drivers/parport/Config.in
-Index: linux-2.4.35.4/arch/alpha/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/alpha/defconfig
-+++ linux-2.4.35.4/arch/alpha/defconfig
+--- a/arch/alpha/defconfig
++++ b/arch/alpha/defconfig
 @@ -72,6 +72,7 @@ CONFIG_KCORE_ELF=y
  # CONFIG_KCORE_AOUT is not set
  # CONFIG_BINFMT_AOUT is not set
@@ -57,10 +51,8 @@ Index: linux-2.4.35.4/arch/alpha/defconfig
  # CONFIG_BINFMT_MISC is not set
  # CONFIG_BINFMT_EM86 is not set
  
-Index: linux-2.4.35.4/arch/arm/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/arm/config.in
-+++ linux-2.4.35.4/arch/arm/config.in
+--- a/arch/arm/config.in
++++ b/arch/arm/config.in
 @@ -499,6 +499,9 @@ choice 'Kernel core (/proc/kcore) format
  	 A.OUT		CONFIG_KCORE_AOUT" ELF
  tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
@@ -71,10 +63,8 @@ Index: linux-2.4.35.4/arch/arm/config.in
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  dep_bool 'Power Management support (experimental)' CONFIG_PM $CONFIG_EXPERIMENTAL
  dep_tristate 'RISC OS personality' CONFIG_ARTHUR $CONFIG_CPU_32
-Index: linux-2.4.35.4/arch/arm/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/arm/defconfig
-+++ linux-2.4.35.4/arch/arm/defconfig
+--- a/arch/arm/defconfig
++++ b/arch/arm/defconfig
 @@ -83,8 +83,9 @@ CONFIG_SYSCTL=y
  CONFIG_NWFPE=y
  CONFIG_KCORE_ELF=y
@@ -86,10 +76,8 @@ Index: linux-2.4.35.4/arch/arm/defconfig
  # CONFIG_BINFMT_MISC is not set
  # CONFIG_PM is not set
  # CONFIG_ARTHUR is not set
-Index: linux-2.4.35.4/arch/cris/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/cris/config.in
-+++ linux-2.4.35.4/arch/cris/config.in
+--- a/arch/cris/config.in
++++ b/arch/cris/config.in
 @@ -31,6 +31,9 @@ bool 'BSD Process Accounting' CONFIG_BSD
  bool 'Sysctl support' CONFIG_SYSCTL
  
@@ -100,10 +88,8 @@ Index: linux-2.4.35.4/arch/cris/config.in
  
  string 'Kernel command line' CONFIG_ETRAX_CMDLINE "root=/dev/mtdblock3"
  
-Index: linux-2.4.35.4/arch/cris/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/cris/defconfig
-+++ linux-2.4.35.4/arch/cris/defconfig
+--- a/arch/cris/defconfig
++++ b/arch/cris/defconfig
 @@ -18,6 +18,7 @@ CONFIG_SYSVIPC=y
  # CONFIG_BSD_PROCESS_ACCT is not set
  # CONFIG_SYSCTL is not set
@@ -112,10 +98,8 @@ Index: linux-2.4.35.4/arch/cris/defconfig
  # CONFIG_ETRAX_KGDB is not set
  # CONFIG_ETRAX_WATCHDOG is not set
  
-Index: linux-2.4.35.4/arch/i386/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/i386/config.in
-+++ linux-2.4.35.4/arch/i386/config.in
+--- a/arch/i386/config.in
++++ b/arch/i386/config.in
 @@ -329,6 +329,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then
  fi
  tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
@@ -126,10 +110,8 @@ Index: linux-2.4.35.4/arch/i386/config.in
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER
  
-Index: linux-2.4.35.4/arch/i386/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/i386/defconfig
-+++ linux-2.4.35.4/arch/i386/defconfig
+--- a/arch/i386/defconfig
++++ b/arch/i386/defconfig
 @@ -115,9 +115,10 @@ CONFIG_SYSVIPC=y
  CONFIG_SYSCTL=y
  CONFIG_KCORE_ELF=y
@@ -143,10 +125,8 @@ Index: linux-2.4.35.4/arch/i386/defconfig
  # CONFIG_OOM_KILLER is not set
  CONFIG_PM=y
  # CONFIG_APM is not set
-Index: linux-2.4.35.4/arch/ia64/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/ia64/config.in
-+++ linux-2.4.35.4/arch/ia64/config.in
+--- a/arch/ia64/config.in
++++ b/arch/ia64/config.in
 @@ -124,6 +124,9 @@ bool 'System V IPC' CONFIG_SYSVIPC
  bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
  bool 'Sysctl support' CONFIG_SYSCTL
@@ -157,10 +137,8 @@ Index: linux-2.4.35.4/arch/ia64/config.in
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  
  if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then
-Index: linux-2.4.35.4/arch/ia64/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/ia64/defconfig
-+++ linux-2.4.35.4/arch/ia64/defconfig
+--- a/arch/ia64/defconfig
++++ b/arch/ia64/defconfig
 @@ -60,6 +60,7 @@ CONFIG_SYSVIPC=y
  # CONFIG_BSD_PROCESS_ACCT is not set
  CONFIG_SYSCTL=y
@@ -169,10 +147,8 @@ Index: linux-2.4.35.4/arch/ia64/defconfig
  # CONFIG_BINFMT_MISC is not set
  CONFIG_ACPI=y
  CONFIG_ACPI_EFI=y
-Index: linux-2.4.35.4/arch/m68k/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/m68k/config.in
-+++ linux-2.4.35.4/arch/m68k/config.in
+--- a/arch/m68k/config.in
++++ b/arch/m68k/config.in
 @@ -99,6 +99,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then
  fi
  tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
@@ -183,10 +159,8 @@ Index: linux-2.4.35.4/arch/m68k/config.in
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  
  if [ "$CONFIG_AMIGA" = "y" ]; then
-Index: linux-2.4.35.4/arch/m68k/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/m68k/defconfig
-+++ linux-2.4.35.4/arch/m68k/defconfig
+--- a/arch/m68k/defconfig
++++ b/arch/m68k/defconfig
 @@ -44,8 +44,9 @@ CONFIG_SYSVIPC=y
  CONFIG_SYSCTL=y
  CONFIG_KCORE_ELF=y
@@ -198,10 +172,8 @@ Index: linux-2.4.35.4/arch/m68k/defconfig
  # CONFIG_BINFMT_MISC is not set
  CONFIG_ZORRO=y
  # CONFIG_AMIGA_PCMCIA is not set
-Index: linux-2.4.35.4/arch/mips/config-shared.in
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/config-shared.in
-+++ linux-2.4.35.4/arch/mips/config-shared.in
+--- a/arch/mips/config-shared.in
++++ b/arch/mips/config-shared.in
 @@ -873,6 +873,9 @@ define_bool CONFIG_KCORE_ELF y
  define_bool CONFIG_KCORE_AOUT n
  define_bool CONFIG_BINFMT_AOUT n
@@ -212,10 +184,8 @@ Index: linux-2.4.35.4/arch/mips/config-shared.in
  dep_bool 'Kernel support for Linux/MIPS 32-bit binary compatibility' CONFIG_MIPS32_COMPAT $CONFIG_MIPS64
  dep_bool 'Kernel support for o32 binaries' CONFIG_MIPS32_O32 $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
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig
-+++ linux-2.4.35.4/arch/mips/defconfig
+--- a/arch/mips/defconfig
++++ b/arch/mips/defconfig
 @@ -143,6 +143,7 @@ CONFIG_KCORE_ELF=y
  # CONFIG_KCORE_AOUT is not set
  # CONFIG_BINFMT_AOUT is not set
@@ -224,10 +194,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig
  # CONFIG_MIPS32_COMPAT is not set
  # CONFIG_MIPS32_O32 is not set
  # CONFIG_MIPS32_N32 is not set
-Index: linux-2.4.35.4/arch/mips/kernel/irixelf.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/kernel/irixelf.c
-+++ linux-2.4.35.4/arch/mips/kernel/irixelf.c
+--- a/arch/mips/kernel/irixelf.c
++++ b/arch/mips/kernel/irixelf.c
 @@ -8,6 +8,7 @@
   * Copyright 1993, 1994: Eric Youngdale ([email protected]).
   */
@@ -266,10 +234,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/irixelf.c
  
  /* Called through irix_syssgi() to map an elf image given an FD,
   * a phdr ptr USER_PHDRP in userspace, and a count CNT telling how many
-Index: linux-2.4.35.4/arch/mips64/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/defconfig
-+++ linux-2.4.35.4/arch/mips64/defconfig
+--- a/arch/mips64/defconfig
++++ b/arch/mips64/defconfig
 @@ -147,6 +147,7 @@ CONFIG_KCORE_ELF=y
  # CONFIG_KCORE_AOUT is not set
  # CONFIG_BINFMT_AOUT is not set
@@ -278,10 +244,8 @@ Index: linux-2.4.35.4/arch/mips64/defconfig
  CONFIG_MIPS32_COMPAT=y
  CONFIG_MIPS32_O32=y
  # CONFIG_MIPS32_N32 is not set
-Index: linux-2.4.35.4/arch/parisc/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/parisc/config.in
-+++ linux-2.4.35.4/arch/parisc/config.in
+--- a/arch/parisc/config.in
++++ b/arch/parisc/config.in
 @@ -89,6 +89,9 @@ bool 'BSD Process Accounting' CONFIG_BSD
  bool 'Sysctl support' CONFIG_SYSCTL
  define_bool CONFIG_KCORE_ELF y
@@ -292,10 +256,8 @@ Index: linux-2.4.35.4/arch/parisc/config.in
  tristate 'Kernel support for SOM binaries' CONFIG_BINFMT_SOM
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  
-Index: linux-2.4.35.4/arch/parisc/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/parisc/defconfig
-+++ linux-2.4.35.4/arch/parisc/defconfig
+--- a/arch/parisc/defconfig
++++ b/arch/parisc/defconfig
 @@ -56,6 +56,7 @@ CONFIG_SYSVIPC=y
  CONFIG_SYSCTL=y
  CONFIG_KCORE_ELF=y
@@ -304,10 +266,8 @@ Index: linux-2.4.35.4/arch/parisc/defconfig
  CONFIG_BINFMT_SOM=y
  # CONFIG_BINFMT_MISC is not set
  # CONFIG_PM is not set
-Index: linux-2.4.35.4/arch/ppc/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/ppc/config.in
-+++ linux-2.4.35.4/arch/ppc/config.in
+--- a/arch/ppc/config.in
++++ b/arch/ppc/config.in
 @@ -384,6 +384,7 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then
  fi
  define_bool CONFIG_BINFMT_ELF y
@@ -316,10 +276,8 @@ Index: linux-2.4.35.4/arch/ppc/config.in
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER
  
-Index: linux-2.4.35.4/arch/ppc/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/ppc/defconfig
-+++ linux-2.4.35.4/arch/ppc/defconfig
+--- a/arch/ppc/defconfig
++++ b/arch/ppc/defconfig
 @@ -59,7 +59,8 @@ CONFIG_SYSVIPC=y
  CONFIG_KCORE_ELF=y
  CONFIG_BINFMT_ELF=y
@@ -330,10 +288,8 @@ Index: linux-2.4.35.4/arch/ppc/defconfig
  # CONFIG_OOM_KILLER is not set
  CONFIG_PCI_NAMES=y
  CONFIG_HOTPLUG=y
-Index: linux-2.4.35.4/arch/ppc64/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/ppc64/config.in
-+++ linux-2.4.35.4/arch/ppc64/config.in
+--- a/arch/ppc64/config.in
++++ b/arch/ppc64/config.in
 @@ -82,6 +82,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then
  fi
  
@@ -344,10 +300,8 @@ Index: linux-2.4.35.4/arch/ppc64/config.in
  
  tristate 'Kernel support for 32 bit ELF binaries' CONFIG_BINFMT_ELF32
  
-Index: linux-2.4.35.4/arch/ppc64/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/ppc64/defconfig
-+++ linux-2.4.35.4/arch/ppc64/defconfig
+--- a/arch/ppc64/defconfig
++++ b/arch/ppc64/defconfig
 @@ -56,6 +56,7 @@ CONFIG_SYSVIPC=y
  # CONFIG_BSD_PROCESS_ACCT is not set
  CONFIG_KCORE_ELF=y
@@ -356,10 +310,8 @@ Index: linux-2.4.35.4/arch/ppc64/defconfig
  CONFIG_BINFMT_ELF32=y
  # CONFIG_BINFMT_MISC is not set
  CONFIG_PCI_NAMES=y
-Index: linux-2.4.35.4/arch/s390/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/s390/config.in
-+++ linux-2.4.35.4/arch/s390/config.in
+--- a/arch/s390/config.in
++++ b/arch/s390/config.in
 @@ -58,6 +58,9 @@ bool 'BSD Process Accounting' CONFIG_BSD
  bool 'Sysctl support' CONFIG_SYSCTL
  define_bool CONFIG_KCORE_ELF y
@@ -370,10 +322,8 @@ Index: linux-2.4.35.4/arch/s390/config.in
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  bool 'Show crashed user process info' CONFIG_PROCESS_DEBUG
  bool 'Pseudo page fault support' CONFIG_PFAULT
-Index: linux-2.4.35.4/arch/s390/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/s390/defconfig
-+++ linux-2.4.35.4/arch/s390/defconfig
+--- a/arch/s390/defconfig
++++ b/arch/s390/defconfig
 @@ -46,6 +46,7 @@ CONFIG_SYSVIPC=y
  CONFIG_SYSCTL=y
  CONFIG_KCORE_ELF=y
@@ -382,10 +332,8 @@ Index: linux-2.4.35.4/arch/s390/defconfig
  # CONFIG_BINFMT_MISC is not set
  # CONFIG_PROCESS_DEBUG is not set
  CONFIG_PFAULT=y
-Index: linux-2.4.35.4/arch/s390x/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/s390x/config.in
-+++ linux-2.4.35.4/arch/s390x/config.in
+--- a/arch/s390x/config.in
++++ b/arch/s390x/config.in
 @@ -61,6 +61,9 @@ bool 'BSD Process Accounting' CONFIG_BSD
  bool 'Sysctl support' CONFIG_SYSCTL
  define_bool CONFIG_KCORE_ELF y
@@ -396,10 +344,8 @@ Index: linux-2.4.35.4/arch/s390x/config.in
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  bool 'Show crashed user process info' CONFIG_PROCESS_DEBUG
  bool 'Pseudo page fault support' CONFIG_PFAULT
-Index: linux-2.4.35.4/arch/s390x/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/s390x/defconfig
-+++ linux-2.4.35.4/arch/s390x/defconfig
+--- a/arch/s390x/defconfig
++++ b/arch/s390x/defconfig
 @@ -47,6 +47,7 @@ CONFIG_SYSVIPC=y
  CONFIG_SYSCTL=y
  CONFIG_KCORE_ELF=y
@@ -408,10 +354,8 @@ Index: linux-2.4.35.4/arch/s390x/defconfig
  # CONFIG_BINFMT_MISC is not set
  # CONFIG_PROCESS_DEBUG is not set
  CONFIG_PFAULT=y
-Index: linux-2.4.35.4/arch/sh/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/sh/config.in
-+++ linux-2.4.35.4/arch/sh/config.in
+--- a/arch/sh/config.in
++++ b/arch/sh/config.in
 @@ -283,6 +283,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then
  	 A.OUT		CONFIG_KCORE_AOUT" ELF
  fi
@@ -422,10 +366,8 @@ Index: linux-2.4.35.4/arch/sh/config.in
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  
  bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER
-Index: linux-2.4.35.4/arch/sh/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/sh/defconfig
-+++ linux-2.4.35.4/arch/sh/defconfig
+--- a/arch/sh/defconfig
++++ b/arch/sh/defconfig
 @@ -48,6 +48,7 @@ CONFIG_CF_ENABLER=y
  CONFIG_KCORE_ELF=y
  # CONFIG_KCORE_AOUT is not set
@@ -434,10 +376,8 @@ Index: linux-2.4.35.4/arch/sh/defconfig
  # CONFIG_BINFMT_MISC is not set
  
  #
-Index: linux-2.4.35.4/arch/sparc/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/sparc/config.in
-+++ linux-2.4.35.4/arch/sparc/config.in
+--- a/arch/sparc/config.in
++++ b/arch/sparc/config.in
 @@ -74,6 +74,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then
  fi
  tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
@@ -448,10 +388,8 @@ Index: linux-2.4.35.4/arch/sparc/config.in
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  bool 'SunOS binary emulation' CONFIG_SUNOS_EMUL
  bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER
-Index: linux-2.4.35.4/arch/sparc/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/sparc/defconfig
-+++ linux-2.4.35.4/arch/sparc/defconfig
+--- a/arch/sparc/defconfig
++++ b/arch/sparc/defconfig
 @@ -49,9 +49,10 @@ CONFIG_SYSVIPC=y
  # CONFIG_BSD_PROCESS_ACCT is not set
  CONFIG_SYSCTL=y
@@ -465,10 +403,8 @@ Index: linux-2.4.35.4/arch/sparc/defconfig
  CONFIG_SUNOS_EMUL=y
  # CONFIG_OOM_KILLER is not set
  
-Index: linux-2.4.35.4/arch/sparc64/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/sparc64/config.in
-+++ linux-2.4.35.4/arch/sparc64/config.in
+--- a/arch/sparc64/config.in
++++ b/arch/sparc64/config.in
 @@ -79,6 +79,9 @@ if [ "$CONFIG_SPARC32_COMPAT" != "n" ]; 
     bool '  Kernel support for 32-bit (ie. SunOS) a.out binaries' CONFIG_BINFMT_AOUT32
  fi
@@ -479,10 +415,8 @@ Index: linux-2.4.35.4/arch/sparc64/config.in
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  bool 'SunOS binary emulation' CONFIG_SUNOS_EMUL
  if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-Index: linux-2.4.35.4/arch/sparc64/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/sparc64/defconfig
-+++ linux-2.4.35.4/arch/sparc64/defconfig
+--- a/arch/sparc64/defconfig
++++ b/arch/sparc64/defconfig
 @@ -70,7 +70,8 @@ CONFIG_SPARC32_COMPAT=y
  CONFIG_BINFMT_ELF32=y
  # CONFIG_BINFMT_AOUT32 is not set
@@ -493,10 +427,8 @@ Index: linux-2.4.35.4/arch/sparc64/defconfig
  # CONFIG_SUNOS_EMUL is not set
  CONFIG_SOLARIS_EMUL=m
  # CONFIG_OOM_KILLER is not set
-Index: linux-2.4.35.4/arch/x86_64/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/x86_64/config.in
-+++ linux-2.4.35.4/arch/x86_64/config.in
+--- a/arch/x86_64/config.in
++++ b/arch/x86_64/config.in
 @@ -118,6 +118,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then
  fi
  #tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
@@ -507,10 +439,8 @@ Index: linux-2.4.35.4/arch/x86_64/config.in
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  
  bool 'Power Management support' CONFIG_PM
-Index: linux-2.4.35.4/arch/x86_64/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/x86_64/defconfig
-+++ linux-2.4.35.4/arch/x86_64/defconfig
+--- a/arch/x86_64/defconfig
++++ b/arch/x86_64/defconfig
 @@ -67,6 +67,7 @@ CONFIG_SYSVIPC=y
  CONFIG_SYSCTL=y
  CONFIG_KCORE_ELF=y
@@ -519,10 +449,8 @@ Index: linux-2.4.35.4/arch/x86_64/defconfig
  # CONFIG_BINFMT_MISC is not set
  CONFIG_PM=y
  CONFIG_IA32_EMULATION=y
-Index: linux-2.4.35.4/fs/binfmt_elf.c
-===================================================================
---- linux-2.4.35.4.orig/fs/binfmt_elf.c
-+++ linux-2.4.35.4/fs/binfmt_elf.c
+--- a/fs/binfmt_elf.c
++++ b/fs/binfmt_elf.c
 @@ -9,6 +9,7 @@
   * Copyright 1993, 1994: Eric Youngdale ([email protected]).
   */
@@ -699,10 +627,8 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c
  
  /*
   * Note that some platforms still use traditional core dumps and not
-Index: linux-2.4.35.4/fs/exec.c
-===================================================================
---- linux-2.4.35.4.orig/fs/exec.c
-+++ linux-2.4.35.4/fs/exec.c
+--- a/fs/exec.c
++++ b/fs/exec.c
 @@ -109,6 +109,7 @@ static inline void put_binfmt(struct lin
   */
  asmlinkage long sys_uselib(const char * library)

target/linux/generic-2.4/patches/109-ipsec_nat_traversal.patch

@@ -1,8 +1,6 @@
 packaging/utils/nattpatch 2.4
-Index: linux-2.4.35.4/include/net/sock.h
-===================================================================
---- linux-2.4.35.4.orig/include/net/sock.h
-+++ linux-2.4.35.4/include/net/sock.h
+--- a/include/net/sock.h
++++ b/include/net/sock.h
 @@ -488,7 +488,13 @@ struct tcp_opt {
  	} bictcp;
  };
@@ -28,10 +26,8 @@ Index: linux-2.4.35.4/include/net/sock.h
  
  	} tp_pinfo;
  
-Index: linux-2.4.35.4/net/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/Config.in
-+++ linux-2.4.35.4/net/Config.in
+--- a/net/Config.in
++++ b/net/Config.in
 @@ -104,4 +104,6 @@ comment 'Network testing'
  dep_tristate 'Packet Generator (USE WITH CAUTION)' CONFIG_NET_PKTGEN $CONFIG_PROC_FS
  endmenu
@@ -39,10 +35,8 @@ Index: linux-2.4.35.4/net/Config.in
 +bool 'IPSEC NAT-Traversal' CONFIG_IPSEC_NAT_TRAVERSAL
 +
  endmenu
-Index: linux-2.4.35.4/net/ipv4/udp.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/udp.c
-+++ linux-2.4.35.4/net/ipv4/udp.c
+--- a/net/ipv4/udp.c
++++ b/net/ipv4/udp.c
 @@ -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)

target/linux/generic-2.4/patches/110-netdev_random_core.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
 @@ -10675,6 +10675,20 @@ CONFIG_TUN
  
    If you don't know what to use this for, you don't need it.
@@ -23,10 +21,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help
  Ethertap network tap (OBSOLETE)
  CONFIG_ETHERTAP
    If you say Y here (and have said Y to "Kernel/User network link
-Index: linux-2.4.35.4/drivers/net/Config.in
-===================================================================
---- linux-2.4.35.4.orig/drivers/net/Config.in
-+++ linux-2.4.35.4/drivers/net/Config.in
+--- a/drivers/net/Config.in
++++ b/drivers/net/Config.in
 @@ -8,6 +8,7 @@ tristate 'Dummy net driver support' CONF
  tristate 'Bonding driver support' CONFIG_BONDING
  tristate 'EQL (serial line load balancing) support' CONFIG_EQUALIZER
@@ -35,10 +31,8 @@ Index: linux-2.4.35.4/drivers/net/Config.in
  if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
     tristate 'Ethertap network tap (OBSOLETE)' CONFIG_ETHERTAP
  fi
-Index: linux-2.4.35.4/include/asm-alpha/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-alpha/signal.h
-+++ linux-2.4.35.4/include/asm-alpha/signal.h
+--- a/include/asm-alpha/signal.h
++++ b/include/asm-alpha/signal.h
 @@ -121,8 +121,15 @@ typedef unsigned long sigset_t;
  #define SA_PROBE		SA_ONESHOT
  #define SA_SAMPLE_RANDOM	SA_RESTART
@@ -55,10 +49,8 @@ Index: linux-2.4.35.4/include/asm-alpha/signal.h
  #define SIG_BLOCK          1	/* for blocking signals */
  #define SIG_UNBLOCK        2	/* for unblocking signals */
  #define SIG_SETMASK        3	/* for setting the signal mask */
-Index: linux-2.4.35.4/include/asm-arm/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-arm/signal.h
-+++ linux-2.4.35.4/include/asm-arm/signal.h
+--- a/include/asm-arm/signal.h
++++ b/include/asm-arm/signal.h
 @@ -125,8 +125,15 @@ typedef unsigned long sigset_t;
  #define SA_PROBE		0x80000000
  #define SA_SAMPLE_RANDOM	0x10000000
@@ -75,10 +67,8 @@ Index: linux-2.4.35.4/include/asm-arm/signal.h
  #define SIG_BLOCK          0	/* for blocking signals */
  #define SIG_UNBLOCK        1	/* for unblocking signals */
  #define SIG_SETMASK        2	/* for setting the signal mask */
-Index: linux-2.4.35.4/include/asm-cris/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-cris/signal.h
-+++ linux-2.4.35.4/include/asm-cris/signal.h
+--- a/include/asm-cris/signal.h
++++ b/include/asm-cris/signal.h
 @@ -120,8 +120,15 @@ typedef unsigned long sigset_t;
  #define SA_PROBE		SA_ONESHOT
  #define SA_SAMPLE_RANDOM	SA_RESTART
@@ -95,10 +85,8 @@ Index: linux-2.4.35.4/include/asm-cris/signal.h
  #define SIG_BLOCK          0	/* for blocking signals */
  #define SIG_UNBLOCK        1	/* for unblocking signals */
  #define SIG_SETMASK        2	/* for setting the signal mask */
-Index: linux-2.4.35.4/include/asm-i386/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-i386/signal.h
-+++ linux-2.4.35.4/include/asm-i386/signal.h
+--- a/include/asm-i386/signal.h
++++ b/include/asm-i386/signal.h
 @@ -119,8 +119,15 @@ typedef unsigned long sigset_t;
  #define SA_PROBE		SA_ONESHOT
  #define SA_SAMPLE_RANDOM	SA_RESTART
@@ -115,10 +103,8 @@ Index: linux-2.4.35.4/include/asm-i386/signal.h
  #define SIG_BLOCK          0	/* for blocking signals */
  #define SIG_UNBLOCK        1	/* for unblocking signals */
  #define SIG_SETMASK        2	/* for setting the signal mask */
-Index: linux-2.4.35.4/include/asm-ia64/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-ia64/signal.h
-+++ linux-2.4.35.4/include/asm-ia64/signal.h
+--- a/include/asm-ia64/signal.h
++++ b/include/asm-ia64/signal.h
 @@ -117,6 +117,12 @@
  #define SA_SHIRQ		0x04000000
  #define SA_PERCPU_IRQ		0x02000000
@@ -132,10 +118,8 @@ Index: linux-2.4.35.4/include/asm-ia64/signal.h
  #endif /* __KERNEL__ */
  
  #define SIG_BLOCK          0	/* for blocking signals */
-Index: linux-2.4.35.4/include/asm-m68k/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-m68k/signal.h
-+++ linux-2.4.35.4/include/asm-m68k/signal.h
+--- a/include/asm-m68k/signal.h
++++ b/include/asm-m68k/signal.h
 @@ -116,8 +116,15 @@ typedef unsigned long sigset_t;
  #define SA_PROBE		SA_ONESHOT
  #define SA_SAMPLE_RANDOM	SA_RESTART
@@ -152,10 +136,8 @@ Index: linux-2.4.35.4/include/asm-m68k/signal.h
  #define SIG_BLOCK          0	/* for blocking signals */
  #define SIG_UNBLOCK        1	/* for unblocking signals */
  #define SIG_SETMASK        2	/* for setting the signal mask */
-Index: linux-2.4.35.4/include/asm-mips/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/signal.h
-+++ linux-2.4.35.4/include/asm-mips/signal.h
+--- a/include/asm-mips/signal.h
++++ b/include/asm-mips/signal.h
 @@ -111,6 +111,12 @@ typedef unsigned long old_sigset_t;		/* 
  #define SA_SAMPLE_RANDOM	SA_RESTART
  #define SA_SHIRQ		0x02000000
@@ -169,10 +151,8 @@ Index: linux-2.4.35.4/include/asm-mips/signal.h
  #endif /* __KERNEL__ */
  
  #define SIG_BLOCK	1	/* for blocking signals */
-Index: linux-2.4.35.4/include/asm-mips64/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips64/signal.h
-+++ linux-2.4.35.4/include/asm-mips64/signal.h
+--- a/include/asm-mips64/signal.h
++++ b/include/asm-mips64/signal.h
 @@ -119,6 +119,12 @@ typedef unsigned int old_sigset_t32;
  #define SA_SAMPLE_RANDOM	SA_RESTART
  #define SA_SHIRQ		0x02000000
@@ -186,10 +166,8 @@ Index: linux-2.4.35.4/include/asm-mips64/signal.h
  #endif /* __KERNEL__ */
  
  #define SIG_BLOCK	1	/* for blocking signals */
-Index: linux-2.4.35.4/include/asm-parisc/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-parisc/signal.h
-+++ linux-2.4.35.4/include/asm-parisc/signal.h
+--- a/include/asm-parisc/signal.h
++++ b/include/asm-parisc/signal.h
 @@ -100,6 +100,12 @@
  #define SA_SAMPLE_RANDOM	SA_RESTART
  #define SA_SHIRQ		0x04000000
@@ -203,10 +181,8 @@ Index: linux-2.4.35.4/include/asm-parisc/signal.h
  #endif /* __KERNEL__ */
  
  #define SIG_BLOCK          0	/* for blocking signals */
-Index: linux-2.4.35.4/include/asm-ppc/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-ppc/signal.h
-+++ linux-2.4.35.4/include/asm-ppc/signal.h
+--- a/include/asm-ppc/signal.h
++++ b/include/asm-ppc/signal.h
 @@ -111,6 +111,13 @@ typedef struct {
  #define SA_PROBE		SA_ONESHOT
  #define SA_SAMPLE_RANDOM	SA_RESTART
@@ -221,10 +197,8 @@ Index: linux-2.4.35.4/include/asm-ppc/signal.h
  #endif /* __KERNEL__ */
  
  #define SIG_BLOCK          0	/* for blocking signals */
-Index: linux-2.4.35.4/include/asm-s390/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-s390/signal.h
-+++ linux-2.4.35.4/include/asm-s390/signal.h
+--- a/include/asm-s390/signal.h
++++ b/include/asm-s390/signal.h
 @@ -129,8 +129,15 @@ typedef unsigned long sigset_t;
  #define SA_SHIRQ                0x04000000
  #define SA_DOPATHGROUP          0x00100000
@@ -241,10 +215,8 @@ Index: linux-2.4.35.4/include/asm-s390/signal.h
  #define SIG_BLOCK          0    /* for blocking signals */
  #define SIG_UNBLOCK        1    /* for unblocking signals */
  #define SIG_SETMASK        2    /* for setting the signal mask */
-Index: linux-2.4.35.4/include/asm-s390x/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-s390x/signal.h
-+++ linux-2.4.35.4/include/asm-s390x/signal.h
+--- a/include/asm-s390x/signal.h
++++ b/include/asm-s390x/signal.h
 @@ -129,8 +129,15 @@ typedef unsigned long sigset_t;
  #define SA_SHIRQ                0x04000000
  #define SA_DOPATHGROUP          0x00100000
@@ -261,10 +233,8 @@ Index: linux-2.4.35.4/include/asm-s390x/signal.h
  #define SIG_BLOCK          0    /* for blocking signals */
  #define SIG_UNBLOCK        1    /* for unblocking signals */
  #define SIG_SETMASK        2    /* for setting the signal mask */
-Index: linux-2.4.35.4/include/asm-sh/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-sh/signal.h
-+++ linux-2.4.35.4/include/asm-sh/signal.h
+--- a/include/asm-sh/signal.h
++++ b/include/asm-sh/signal.h
 @@ -107,8 +107,15 @@ typedef struct {
  #define SA_PROBE		SA_ONESHOT
  #define SA_SAMPLE_RANDOM	SA_RESTART
@@ -281,10 +251,8 @@ Index: linux-2.4.35.4/include/asm-sh/signal.h
  #define SIG_BLOCK          0	/* for blocking signals */
  #define SIG_UNBLOCK        1	/* for unblocking signals */
  #define SIG_SETMASK        2	/* for setting the signal mask */
-Index: linux-2.4.35.4/include/asm-sparc/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-sparc/signal.h
-+++ linux-2.4.35.4/include/asm-sparc/signal.h
+--- a/include/asm-sparc/signal.h
++++ b/include/asm-sparc/signal.h
 @@ -176,8 +176,15 @@ struct sigstack {
  #define SA_PROBE SA_ONESHOT
  #define SA_SAMPLE_RANDOM SA_RESTART
@@ -301,10 +269,8 @@ Index: linux-2.4.35.4/include/asm-sparc/signal.h
  /* Type of a signal handler.  */
  #ifdef __KERNEL__
  typedef void (*__sighandler_t)(int, int, struct sigcontext *, char *);
-Index: linux-2.4.35.4/include/asm-sparc64/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-sparc64/signal.h
-+++ linux-2.4.35.4/include/asm-sparc64/signal.h
+--- a/include/asm-sparc64/signal.h
++++ b/include/asm-sparc64/signal.h
 @@ -192,8 +192,15 @@ struct sigstack {
  #define SA_PROBE SA_ONESHOT
  #define SA_SAMPLE_RANDOM SA_RESTART

target/linux/generic-2.4/patches/112-bridging_performance.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/net/core/dev.c
-===================================================================
---- linux-2.4.35.4.orig/net/core/dev.c
-+++ linux-2.4.35.4/net/core/dev.c
+--- a/net/core/dev.c
++++ b/net/core/dev.c
 @@ -1289,6 +1289,19 @@ int netif_rx(struct sk_buff *skb)
  	local_irq_save(flags);
  

target/linux/generic-2.4/patches/113-even_more_gcc4_stuff.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/kernel/mips_ksyms.c
-+++ linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c
+--- a/arch/mips/kernel/mips_ksyms.c
++++ b/arch/mips/kernel/mips_ksyms.c
 @@ -30,6 +30,10 @@
  #include <asm/floppy.h>
  #endif
@@ -27,10 +25,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c
  /* Networking helper routines. */
  EXPORT_SYMBOL(csum_partial_copy);
  
-Index: linux-2.4.35.4/arch/mips/lib/Makefile
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/lib/Makefile
-+++ linux-2.4.35.4/arch/mips/lib/Makefile
+--- a/arch/mips/lib/Makefile
++++ b/arch/mips/lib/Makefile
 @@ -9,7 +9,8 @@ L_TARGET = lib.a
  obj-y				+= csum_partial.o csum_partial_copy.o \
  				   promlib.o rtc-std.o rtc-no.o memcpy.o \
@@ -41,10 +37,8 @@ Index: linux-2.4.35.4/arch/mips/lib/Makefile
  
  export-objs			:= rtc-std.o rtc-no.o
  
-Index: linux-2.4.35.4/arch/mips/lib/ashldi3.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/arch/mips/lib/ashldi3.c
++++ b/arch/mips/lib/ashldi3.c
 @@ -0,0 +1,62 @@
 +/* ashrdi3.c extracted from gcc-2.95.2/libgcc2.c which is: */
 +/* Copyright (C) 1989, 92-98, 1999 Free Software Foundation, Inc.
@@ -108,10 +102,8 @@ Index: linux-2.4.35.4/arch/mips/lib/ashldi3.c
 +
 +  return w.ll;
 +}
-Index: linux-2.4.35.4/arch/mips/lib/ashrdi3.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/arch/mips/lib/ashrdi3.c
++++ b/arch/mips/lib/ashrdi3.c
 @@ -0,0 +1,63 @@
 +/* ashrdi3.c extracted from gcc-2.7.2/libgcc2.c which is: */
 +/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
@@ -176,10 +168,8 @@ Index: linux-2.4.35.4/arch/mips/lib/ashrdi3.c
 +
 +  return w.ll;
 +}
-Index: linux-2.4.35.4/arch/mips/lib/lshrdi3.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/arch/mips/lib/lshrdi3.c
++++ b/arch/mips/lib/lshrdi3.c
 @@ -0,0 +1,62 @@
 +/* lshrdi3.c extracted from gcc-2.7.2/libgcc2.c which is: */
 +/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
@@ -243,10 +233,8 @@ Index: linux-2.4.35.4/arch/mips/lib/lshrdi3.c
 +
 +  return w.ll;
 +}
-Index: linux-2.4.35.4/arch/mips/lib/muldi3.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/arch/mips/lib/muldi3.c
++++ b/arch/mips/lib/muldi3.c
 @@ -0,0 +1,63 @@
 +/* muldi3.c extracted from gcc-2.7.2.3/libgcc2.c and 
 +			   gcc-2.7.2.3/longlong.h which is: */
@@ -311,10 +299,8 @@ Index: linux-2.4.35.4/arch/mips/lib/muldi3.c
 +
 +  return w.ll;
 +}
-Index: linux-2.4.35.4/fs/cifs/cifsfs.c
-===================================================================
---- linux-2.4.35.4.orig/fs/cifs/cifsfs.c
-+++ linux-2.4.35.4/fs/cifs/cifsfs.c
+--- a/fs/cifs/cifsfs.c
++++ b/fs/cifs/cifsfs.c
 @@ -50,8 +50,6 @@
  static struct quotactl_ops cifs_quotactl_ops;
  #endif
@@ -324,10 +310,8 @@ Index: linux-2.4.35.4/fs/cifs/cifsfs.c
  int cifsFYI = 0;
  int cifsERROR = 1;
  int traceSMB = 0;
-Index: linux-2.4.35.4/include/asm-mips/uaccess.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/uaccess.h
-+++ linux-2.4.35.4/include/asm-mips/uaccess.h
+--- a/include/asm-mips/uaccess.h
++++ b/include/asm-mips/uaccess.h
 @@ -149,7 +149,7 @@ static inline int verify_area(int type, 
   * Returns zero on success, or -EFAULT on error.
   */

target/linux/generic-2.4/patches/114-sched_use_tsc.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/arch/mips/kernel/time.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/kernel/time.c
-+++ linux-2.4.35.4/arch/mips/kernel/time.c
+--- a/arch/mips/kernel/time.c
++++ b/arch/mips/kernel/time.c
 @@ -151,6 +151,27 @@ void (*mips_timer_ack)(void);
  unsigned int (*mips_hpt_read)(void);
  void (*mips_hpt_init)(unsigned int);
@@ -36,10 +34,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/time.c
  EXPORT_SYMBOL(rtc_get_time);
 +EXPORT_SYMBOL(get_htscl);
 +EXPORT_SYMBOL(get_tscll);
-Index: linux-2.4.35.4/include/asm-mips/timex.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/timex.h
-+++ linux-2.4.35.4/include/asm-mips/timex.h
+--- a/include/asm-mips/timex.h
++++ b/include/asm-mips/timex.h
 @@ -31,6 +31,19 @@ static inline cycles_t get_cycles (void)
  	return read_c0_count();
  }
@@ -60,10 +56,8 @@ Index: linux-2.4.35.4/include/asm-mips/timex.h
  #define vxtime_lock()		do {} while (0)
  #define vxtime_unlock()		do {} while (0)
  
-Index: linux-2.4.35.4/include/net/pkt_sched.h
-===================================================================
---- linux-2.4.35.4.orig/include/net/pkt_sched.h
-+++ linux-2.4.35.4/include/net/pkt_sched.h
+--- a/include/net/pkt_sched.h
++++ b/include/net/pkt_sched.h
 @@ -5,7 +5,11 @@
  #define PSCHED_JIFFIES 		2
  #define PSCHED_CPU 		3

target/linux/generic-2.4/patches/115-branch_emul_fix.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/arch/mips/kernel/branch.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/kernel/branch.c
-+++ linux-2.4.35.4/arch/mips/kernel/branch.c
+--- a/arch/mips/kernel/branch.c
++++ b/arch/mips/kernel/branch.c
 @@ -170,7 +170,7 @@ int __compute_return_epc(struct pt_regs 
  		bit = (insn.i_format.rt >> 2);
  		bit += (bit != 0);

target/linux/generic-2.4/patches/116-bridge_ioctls.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/include/linux/sockios.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/sockios.h
-+++ linux-2.4.35.4/include/linux/sockios.h
+--- a/include/linux/sockios.h
++++ b/include/linux/sockios.h
 @@ -68,6 +68,11 @@
  
  #define SIOCGIFBR	0x8940		/* Bridging support		*/

target/linux/generic-2.4/patches/201-hfc_usb_backport.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/drivers/Makefile
-===================================================================
---- linux-2.4.35.4.orig/drivers/Makefile
-+++ linux-2.4.35.4/drivers/Makefile
+--- a/drivers/Makefile
++++ b/drivers/Makefile
 @@ -38,7 +38,7 @@ subdir-$(CONFIG_FUSION)		+= message/fusi
  subdir-$(CONFIG_MD)		+= md
  subdir-$(CONFIG_IEEE1394)	+= ieee1394
@@ -11,10 +9,8 @@ Index: linux-2.4.35.4/drivers/Makefile
  subdir-$(CONFIG_ATM)		+= atm
  subdir-$(CONFIG_FC4)		+= fc4
  
-Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_usb.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c
+--- a/drivers/isdn/hisax/hfc_usb.c
++++ b/drivers/isdn/hisax/hfc_usb.c
 @@ -1,13 +1,11 @@
 -/* $Id: hfc_usb.c,v 2.3 2001/07/06 21:30:11 werner Exp $
 +/*

target/linux/generic-2.4/patches/202-pl2303_backport.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/drivers/usb/serial/pl2303.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/usb/serial/pl2303.c
-+++ linux-2.4.35.4/drivers/usb/serial/pl2303.c
+--- a/drivers/usb/serial/pl2303.c
++++ b/drivers/usb/serial/pl2303.c
 @@ -78,6 +78,11 @@ static struct usb_device_id id_table [] 
  	{ USB_DEVICE(RADIOSHACK_VENDOR_ID, RADIOSHACK_PRODUCT_ID) },
  	{ USB_DEVICE(DCU10_VENDOR_ID, DCU10_PRODUCT_ID) },
@@ -14,10 +12,8 @@ Index: linux-2.4.35.4/drivers/usb/serial/pl2303.c
  	{ }					/* Terminating entry */
  };
  
-Index: linux-2.4.35.4/drivers/usb/serial/pl2303.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/usb/serial/pl2303.h
-+++ linux-2.4.35.4/drivers/usb/serial/pl2303.h
+--- a/drivers/usb/serial/pl2303.h
++++ b/drivers/usb/serial/pl2303.h
 @@ -41,3 +41,21 @@
  
  #define SITECOM_VENDOR_ID	0x6189

target/linux/generic-2.4/patches/203-hfsplus_fix.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/fs/hfsplus/super.c
-===================================================================
---- linux-2.4.35.4.orig/fs/hfsplus/super.c
-+++ linux-2.4.35.4/fs/hfsplus/super.c
+--- a/fs/hfsplus/super.c
++++ b/fs/hfsplus/super.c
 @@ -240,8 +240,7 @@ int hfsplus_remount(struct super_block *
  	if (!(*flags & MS_RDONLY)) {
  		struct hfsplus_vh *vhdr = HFSPLUS_SB(sb).s_vhdr;

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

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/arch/mips/kernel/signal.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/kernel/signal.c
-+++ linux-2.4.35.4/arch/mips/kernel/signal.c
+--- a/arch/mips/kernel/signal.c
++++ b/arch/mips/kernel/signal.c
 @@ -6,8 +6,10 @@
   * Copyright (C) 1991, 1992  Linus Torvalds
   * Copyright (C) 1994 - 1999  Ralf Baechle
@@ -35,10 +33,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/signal.c
  {
  	sigset_t *unewset, saveset, newset;
          size_t sigsetsize;
-Index: linux-2.4.35.4/arch/mips/kernel/syscall.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/kernel/syscall.c
-+++ linux-2.4.35.4/arch/mips/kernel/syscall.c
+--- a/arch/mips/kernel/syscall.c
++++ b/arch/mips/kernel/syscall.c
 @@ -5,6 +5,7 @@
   *
   * Copyright (C) 1995 - 2000 by Ralf Baechle
@@ -69,10 +65,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/syscall.c
  {
  	unsigned long clone_flags;
  	unsigned long newsp;
-Index: linux-2.4.35.4/arch/mips/ld.script.in
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/ld.script.in
-+++ linux-2.4.35.4/arch/mips/ld.script.in
+--- a/arch/mips/ld.script.in
++++ b/arch/mips/ld.script.in
 @@ -9,6 +9,7 @@ SECTIONS
    {
      _ftext = . ;
@@ -81,10 +75,8 @@ Index: linux-2.4.35.4/arch/mips/ld.script.in
      *(.rodata)
      *(.rodata.*)
      *(.rodata1)
-Index: linux-2.4.35.4/arch/mips64/kernel/signal.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/kernel/signal.c
-+++ linux-2.4.35.4/arch/mips64/kernel/signal.c
+--- a/arch/mips64/kernel/signal.c
++++ b/arch/mips64/kernel/signal.c
 @@ -6,8 +6,10 @@
   * Copyright (C) 1991, 1992  Linus Torvalds
   * Copyright (C) 1994 - 2000  Ralf Baechle
@@ -107,10 +99,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/signal.c
  {
  	sigset_t *unewset, saveset, newset;
          size_t sigsetsize;
-Index: linux-2.4.35.4/arch/mips64/kernel/signal32.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/kernel/signal32.c
-+++ linux-2.4.35.4/arch/mips64/kernel/signal32.c
+--- a/arch/mips64/kernel/signal32.c
++++ b/arch/mips64/kernel/signal32.c
 @@ -6,7 +6,9 @@
   * Copyright (C) 1991, 1992  Linus Torvalds
   * Copyright (C) 1994 - 2000  Ralf Baechle
@@ -143,10 +133,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/signal32.c
  {
  	sigset32_t *uset;
  	sigset_t newset, saveset;
-Index: linux-2.4.35.4/arch/mips64/kernel/syscall.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/kernel/syscall.c
-+++ linux-2.4.35.4/arch/mips64/kernel/syscall.c
+--- a/arch/mips64/kernel/syscall.c
++++ b/arch/mips64/kernel/syscall.c
 @@ -6,7 +6,9 @@
   * Copyright (C) 1995 - 2000, 2001 by Ralf Baechle
   * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
@@ -179,10 +167,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/syscall.c
  {
  	unsigned long clone_flags;
  	unsigned long newsp;
-Index: linux-2.4.35.4/include/asm-mips/ptrace.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/ptrace.h
-+++ linux-2.4.35.4/include/asm-mips/ptrace.h
+--- a/include/asm-mips/ptrace.h
++++ b/include/asm-mips/ptrace.h
 @@ -4,6 +4,7 @@
   * for more details.
   *
@@ -205,10 +191,8 @@ Index: linux-2.4.35.4/include/asm-mips/ptrace.h
  #endif /* !__ASSEMBLY__ */
  
  /* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
-Index: linux-2.4.35.4/include/asm-mips64/ptrace.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips64/ptrace.h
-+++ linux-2.4.35.4/include/asm-mips64/ptrace.h
+--- a/include/asm-mips64/ptrace.h
++++ b/include/asm-mips64/ptrace.h
 @@ -5,6 +5,7 @@
   *
   * Copyright (C) 1994, 95, 96, 97, 98, 99, 2000 by Ralf Baechle

target/linux/generic-2.4/patches/208-usb2_fix.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/drivers/usb/host/ehci-q.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/usb/host/ehci-q.c
-+++ linux-2.4.35.4/drivers/usb/host/ehci-q.c
+--- a/drivers/usb/host/ehci-q.c
++++ b/drivers/usb/host/ehci-q.c
 @@ -782,6 +782,11 @@ static void qh_link_async (struct ehci_h
  		if (!(cmd & CMD_ASE)) {
  			/* in case a clear of CMD_ASE didn't take yet */

target/linux/generic-2.4/patches/209-build_fixes.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/Makefile
-===================================================================
---- linux-2.4.35.4.orig/Makefile
-+++ linux-2.4.35.4/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -362,7 +362,7 @@ include/linux/compile.h: $(CONFIGURATION
  	@rm -f .ver1
  
@@ -20,10 +18,8 @@ Index: linux-2.4.35.4/Makefile
  	scripts/mkdep -- init/*.c > .depend
  
  ifdef CONFIG_MODVERSIONS
-Index: linux-2.4.35.4/Rules.make
-===================================================================
---- linux-2.4.35.4.orig/Rules.make
-+++ linux-2.4.35.4/Rules.make
+--- a/Rules.make
++++ b/Rules.make
 @@ -126,7 +126,7 @@ endif
  # This make dependencies quickly
  #

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

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/drivers/char/serial.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/char/serial.c
-+++ linux-2.4.35.4/drivers/char/serial.c
+--- a/drivers/char/serial.c
++++ b/drivers/char/serial.c
 @@ -5458,18 +5458,6 @@ static int __init rs_init(void)
  		       sizeof(struct rs_multiport_struct));
  #endif

target/linux/generic-2.4/patches/212-htb_time_fix.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/net/sched/sch_htb.c
-===================================================================
---- linux-2.4.35.4.orig/net/sched/sch_htb.c
-+++ linux-2.4.35.4/net/sched/sch_htb.c
+--- a/net/sched/sch_htb.c
++++ b/net/sched/sch_htb.c
 @@ -369,7 +369,7 @@ static void htb_debug_dump (struct htb_s
  		struct list_head *l;
  		list_for_each (l,q->hash+i) {

target/linux/generic-2.4/patches/213-htb_disable_hysteresis.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/net/sched/sch_htb.c
-===================================================================
---- linux-2.4.35.4.orig/net/sched/sch_htb.c
-+++ linux-2.4.35.4/net/sched/sch_htb.c
+--- a/net/sched/sch_htb.c
++++ b/net/sched/sch_htb.c
 @@ -74,7 +74,7 @@
  #define HTB_EWMAC 2	/* rate average over HTB_EWMAC*HTB_HSIZE sec */
  #define HTB_DEBUG 1	/* compile debugging support (activated by tc tool) */

target/linux/generic-2.4/patches/222-sound.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/drivers/sound/sound_core.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/sound/sound_core.c
-+++ linux-2.4.35.4/drivers/sound/sound_core.c
+--- a/drivers/sound/sound_core.c
++++ b/drivers/sound/sound_core.c
 @@ -174,9 +174,9 @@ static int sound_insert_unit(struct soun
  	}
  	

target/linux/generic-2.4/patches/224-atm_hotplug.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/include/linux/atmdev.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/atmdev.h
-+++ linux-2.4.35.4/include/linux/atmdev.h
+--- a/include/linux/atmdev.h
++++ b/include/linux/atmdev.h
 @@ -400,6 +400,7 @@ extern rwlock_t vcc_sklist_lock;
  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 */
@@ -10,10 +8,8 @@ Index: linux-2.4.35.4/include/linux/atmdev.h
  void atm_dev_deregister(struct atm_dev *dev);
  void shutdown_atm_dev(struct atm_dev *dev);
  void vcc_insert_socket(struct sock *sk);
-Index: linux-2.4.35.4/net/atm/resources.c
-===================================================================
---- linux-2.4.35.4.orig/net/atm/resources.c
-+++ linux-2.4.35.4/net/atm/resources.c
+--- a/net/atm/resources.c
++++ b/net/atm/resources.c
 @@ -10,6 +10,7 @@
  #include <linux/sonet.h>
  #include <linux/kernel.h> /* for barrier */

target/linux/generic-2.4/patches/225-string_lib_useful_exports.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/lib/string.c
-===================================================================
---- linux-2.4.35.4.orig/lib/string.c
-+++ linux-2.4.35.4/lib/string.c
+--- a/lib/string.c
++++ b/lib/string.c
 @@ -50,6 +50,7 @@ int strnicmp(const char *s1, const char 
  	}
  	return (int)c1 - (int)c2;

target/linux/generic-2.4/patches/226-atm_br2684.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/net/atm/br2684.c
-===================================================================
---- linux-2.4.35.4.orig/net/atm/br2684.c
-+++ linux-2.4.35.4/net/atm/br2684.c
+--- a/net/atm/br2684.c
++++ b/net/atm/br2684.c
 @@ -55,36 +55,55 @@ static void skb_debug(const struct sk_bu
  #define skb_debug(skb)	do {} while (0)
  #endif
@@ -486,10 +484,8 @@ Index: linux-2.4.35.4/net/atm/br2684.c
  	while (!list_empty(&br2684_devs)) {
  		brdev = list_entry_brdev(br2684_devs.next);
  		unregister_netdev(&brdev->net_dev);
-Index: linux-2.4.35.4/net/atm/common.c
-===================================================================
---- linux-2.4.35.4.orig/net/atm/common.c
-+++ linux-2.4.35.4/net/atm/common.c
+--- a/net/atm/common.c
++++ b/net/atm/common.c
 @@ -158,6 +158,7 @@ void br2684_ioctl_set(int (*hook)(struct
  }
  #ifdef CONFIG_ATM_BR2684_MODULE
@@ -498,10 +494,8 @@ Index: linux-2.4.35.4/net/atm/common.c
  #endif
  #endif
  
-Index: linux-2.4.35.4/include/linux/atmbr2684.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/atmbr2684.h
-+++ linux-2.4.35.4/include/linux/atmbr2684.h
+--- a/include/linux/atmbr2684.h
++++ b/include/linux/atmbr2684.h
 @@ -3,6 +3,7 @@
  
  #include <linux/atm.h>

target/linux/generic-2.4/patches/227-jffs2_eofdetect.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/fs/jffs2/build.c
-===================================================================
---- linux-2.4.35.4.orig/fs/jffs2/build.c
-+++ linux-2.4.35.4/fs/jffs2/build.c
+--- a/fs/jffs2/build.c
++++ b/fs/jffs2/build.c
 @@ -31,6 +31,10 @@
   * provisions above, a recipient may use your version of this file
   * under either the RHEPL or the GPL.
@@ -40,10 +38,8 @@ Index: linux-2.4.35.4/fs/jffs2/build.c
  	D1(printk(KERN_DEBUG "Scanned flash completely\n"));
  	/* Now build the data map for each inode, marking obsoleted nodes
  	   as such, and also increase nlink of any children. */
-Index: linux-2.4.35.4/fs/jffs2/scan.c
-===================================================================
---- linux-2.4.35.4.orig/fs/jffs2/scan.c
-+++ linux-2.4.35.4/fs/jffs2/scan.c
+--- a/fs/jffs2/scan.c
++++ b/fs/jffs2/scan.c
 @@ -31,6 +31,10 @@
   * provisions above, a recipient may use your version of this file
   * under either the RHEPL or the GPL.

target/linux/generic-2.4/patches/228-more_usb_fixes.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/drivers/scsi/hosts.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/scsi/hosts.c
-+++ linux-2.4.35.4/drivers/scsi/hosts.c
+--- a/drivers/scsi/hosts.c
++++ b/drivers/scsi/hosts.c
 @@ -107,8 +107,21 @@ scsi_unregister(struct Scsi_Host * sh){
      if (shn) shn->host_registered = 0;
      /* else {} : This should not happen, we should panic here... */
@@ -25,10 +23,8 @@ Index: linux-2.4.35.4/drivers/scsi/hosts.c
      kfree((char *) sh);
  }
  
-Index: linux-2.4.35.4/drivers/usb/hcd.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/usb/hcd.c
-+++ linux-2.4.35.4/drivers/usb/hcd.c
+--- a/drivers/usb/hcd.c
++++ b/drivers/usb/hcd.c
 @@ -1105,7 +1105,8 @@ static int hcd_submit_urb (struct urb *u
  		break;
  	case PIPE_BULK:
@@ -49,10 +45,8 @@ Index: linux-2.4.35.4/drivers/usb/hcd.c
  			urb->transfer_dma = pci_map_single (
  					hcd->pdev,
  					urb->transfer_buffer,
-Index: linux-2.4.35.4/drivers/usb/host/ehci-hcd.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/usb/host/ehci-hcd.c
-+++ linux-2.4.35.4/drivers/usb/host/ehci-hcd.c
+--- a/drivers/usb/host/ehci-hcd.c
++++ b/drivers/usb/host/ehci-hcd.c
 @@ -399,6 +399,27 @@ static int ehci_start (struct usb_hcd *h
  		ehci_mem_cleanup (ehci);
  		return retval;
@@ -81,10 +75,8 @@ Index: linux-2.4.35.4/drivers/usb/host/ehci-hcd.c
  	writel (INTR_MASK, &ehci->regs->intr_enable);
  	writel (ehci->periodic_dma, &ehci->regs->frame_list);
  
-Index: linux-2.4.35.4/drivers/usb/host/ehci-q.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/usb/host/ehci-q.c
-+++ linux-2.4.35.4/drivers/usb/host/ehci-q.c
+--- a/drivers/usb/host/ehci-q.c
++++ b/drivers/usb/host/ehci-q.c
 @@ -791,6 +791,8 @@ static void qh_link_async (struct ehci_h
  			writel (cmd, &ehci->regs->command);
  			ehci->hcd.state = USB_STATE_RUNNING;
@@ -94,10 +86,8 @@ Index: linux-2.4.35.4/drivers/usb/host/ehci-q.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
-+++ linux-2.4.35.4/drivers/usb/host/usb-uhci.c
+--- a/drivers/usb/host/usb-uhci.c
++++ b/drivers/usb/host/usb-uhci.c
 @@ -3034,6 +3034,21 @@ uhci_pci_probe (struct pci_dev *dev, con
  	
  	pci_set_master(dev);
@@ -120,10 +110,8 @@ Index: linux-2.4.35.4/drivers/usb/host/usb-uhci.c
  	/* Search for the IO base address.. */
  	for (i = 0; i < 6; i++) {
  
-Index: linux-2.4.35.4/drivers/usb/storage/transport.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/usb/storage/transport.c
-+++ linux-2.4.35.4/drivers/usb/storage/transport.c
+--- a/drivers/usb/storage/transport.c
++++ b/drivers/usb/storage/transport.c
 @@ -54,6 +54,22 @@
  #include <linux/sched.h>
  #include <linux/errno.h>
@@ -752,10 +740,8 @@ Index: linux-2.4.35.4/drivers/usb/storage/transport.c
  		}
  	}
  	else
-Index: linux-2.4.35.4/drivers/usb/storage/transport.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/usb/storage/transport.h
-+++ linux-2.4.35.4/drivers/usb/storage/transport.h
+--- a/drivers/usb/storage/transport.h
++++ b/drivers/usb/storage/transport.h
 @@ -127,6 +127,16 @@ struct bulk_cs_wrap {
  #define US_BULK_TRANSFER_ABORTED	3  /* transfer canceled             */
  
@@ -773,10 +759,8 @@ Index: linux-2.4.35.4/drivers/usb/storage/transport.h
   * Transport return codes
   */
  
-Index: linux-2.4.35.4/drivers/usb/storage/usb.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/usb/storage/usb.h
-+++ linux-2.4.35.4/drivers/usb/storage/usb.h
+--- a/drivers/usb/storage/usb.h
++++ b/drivers/usb/storage/usb.h
 @@ -111,6 +111,60 @@ typedef int (*trans_reset)(struct us_dat
  typedef void (*proto_cmnd)(Scsi_Cmnd*, struct us_data*);
  typedef void (*extra_data_destructor)(void *);	 /* extra data destructor   */
@@ -846,10 +830,8 @@ Index: linux-2.4.35.4/drivers/usb/storage/usb.h
  
  	/* the semaphore for sleeping the control thread */
  	struct semaphore	sema;		 /* to sleep thread on   */
-Index: linux-2.4.35.4/include/linux/usb.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/usb.h
-+++ linux-2.4.35.4/include/linux/usb.h
+--- a/include/linux/usb.h
++++ b/include/linux/usb.h
 @@ -483,6 +483,8 @@ struct usb_driver {
  #define URB_NO_INTERRUPT	0x0080	/* HINT: no non-error interrupt needed */
  					/* ... less overhead for QUEUE_BULK */

target/linux/generic-2.4/patches/230-tun_get_user_backport.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/include/linux/skbuff.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/skbuff.h
-+++ linux-2.4.35.4/include/linux/skbuff.h
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
 @@ -912,6 +912,49 @@ static inline void skb_reserve(struct sk
  	skb->tail+=len;
  }
@@ -52,10 +50,8 @@ Index: linux-2.4.35.4/include/linux/skbuff.h
  extern int ___pskb_trim(struct sk_buff *skb, unsigned int len, int realloc);
  
  static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
-Index: linux-2.4.35.4/drivers/net/tun.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/net/tun.c
-+++ linux-2.4.35.4/drivers/net/tun.c
+--- a/drivers/net/tun.c
++++ b/drivers/net/tun.c
 @@ -185,22 +185,31 @@ static __inline__ ssize_t tun_get_user(s
  {
  	struct tun_pi pi = { 0, __constant_htons(ETH_P_IP) };

target/linux/generic-2.4/patches/231-mini_fo.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/fs/Config.in
-===================================================================
---- linux-2.4.35.4.orig/fs/Config.in
-+++ linux-2.4.35.4/fs/Config.in
+--- a/fs/Config.in
++++ b/fs/Config.in
 @@ -77,6 +77,7 @@ dep_mbool '  JFS debugging' CONFIG_JFS_D
  dep_mbool '  JFS statistics' CONFIG_JFS_STATISTICS $CONFIG_JFS_FS
  
@@ -10,10 +8,8 @@ Index: linux-2.4.35.4/fs/Config.in
  
  tristate 'FreeVxFS file system support (VERITAS VxFS(TM) compatible)' CONFIG_VXFS_FS
  tristate 'NTFS file system support (read only)' CONFIG_NTFS_FS
-Index: linux-2.4.35.4/fs/Makefile
-===================================================================
---- linux-2.4.35.4.orig/fs/Makefile
-+++ linux-2.4.35.4/fs/Makefile
+--- a/fs/Makefile
++++ b/fs/Makefile
 @@ -31,6 +31,7 @@ subdir-$(CONFIG_RAMFS)		+= ramfs
  subdir-$(CONFIG_CODA_FS)	+= coda
  subdir-$(CONFIG_INTERMEZZO_FS)	+= intermezzo
@@ -22,10 +18,8 @@ Index: linux-2.4.35.4/fs/Makefile
  subdir-$(CONFIG_FAT_FS)		+= fat
  subdir-$(CONFIG_UMSDOS_FS)	+= umsdos
  subdir-$(CONFIG_MSDOS_FS)	+= msdos
-Index: linux-2.4.35.4/fs/mini_fo/aux.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/aux.c
++++ b/fs/mini_fo/aux.c
 @@ -0,0 +1,580 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
@@ -607,10 +601,8 @@ Index: linux-2.4.35.4/fs/mini_fo/aux.c
 +
 +#endif /* unused */
 +
-Index: linux-2.4.35.4/fs/mini_fo/ChangeLog
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/ChangeLog
++++ b/fs/mini_fo/ChangeLog
 @@ -0,0 +1,281 @@
 +2006-01-24  Markus Klotzbuecher  <[email protected]>
 +
@@ -893,10 +885,8 @@ Index: linux-2.4.35.4/fs/mini_fo/ChangeLog
 +	* Implementation of mini_fo_mknod and mini_fo_rename, support
 +          for device files.
 +	
-Index: linux-2.4.35.4/fs/mini_fo/dentry.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/dentry.c
++++ b/fs/mini_fo/dentry.c
 @@ -0,0 +1,244 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
@@ -1142,10 +1132,8 @@ Index: linux-2.4.35.4/fs/mini_fo/dentry.c
 +	d_delete:		mini_fo_d_delete,
 +	d_iput:		mini_fo_d_iput,
 +};
-Index: linux-2.4.35.4/fs/mini_fo/file.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/file.c
++++ b/fs/mini_fo/file.c
 @@ -0,0 +1,717 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
@@ -1864,10 +1852,8 @@ Index: linux-2.4.35.4/fs/mini_fo/file.c
 +		/* not implemented: sendpage */
 +		/* not implemented: get_unmapped_area */
 +	};
-Index: linux-2.4.35.4/fs/mini_fo/fist.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/fist.h
++++ b/fs/mini_fo/fist.h
 @@ -0,0 +1,248 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
@@ -2117,10 +2103,8 @@ Index: linux-2.4.35.4/fs/mini_fo/fist.h
 +# define FIST_IOCTL_SET_DEBUG_VALUE	_IOW(0x15, 2, int)
 +
 +#endif /* not __FIST_H_ */
-Index: linux-2.4.35.4/fs/mini_fo/inode.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/inode.c
++++ b/fs/mini_fo/inode.c
 @@ -0,0 +1,1573 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
@@ -3695,10 +3679,8 @@ Index: linux-2.4.35.4/fs/mini_fo/inode.c
 +		removexattr:    mini_fo_removexattr
 +# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
 +	};
-Index: linux-2.4.35.4/fs/mini_fo/main.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/main.c
++++ b/fs/mini_fo/main.c
 @@ -0,0 +1,414 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
@@ -4114,10 +4096,8 @@ Index: linux-2.4.35.4/fs/mini_fo/main.c
 +
 +module_init(init_mini_fo_fs)
 +module_exit(exit_mini_fo_fs)
-Index: linux-2.4.35.4/fs/mini_fo/Makefile
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/Makefile
++++ b/fs/mini_fo/Makefile
 @@ -0,0 +1,22 @@
 +#
 +# Makefile for mini_fo 2.4 and 2.6 Linux kernels
@@ -4141,10 +4121,8 @@ Index: linux-2.4.35.4/fs/mini_fo/Makefile
 +# dependencies
 +${mini_fo-objs}: mini_fo.h fist.h
 +
-Index: linux-2.4.35.4/fs/mini_fo/meta.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/meta.c
++++ b/fs/mini_fo/meta.c
 @@ -0,0 +1,1000 @@
 +/*
 + * Copyright (C) 2004, 2005 Markus Klotzbuecher <[email protected]>
@@ -5146,10 +5124,8 @@ Index: linux-2.4.35.4/fs/mini_fo/meta.c
 +	return 0;
 +}
 +
-Index: linux-2.4.35.4/fs/mini_fo/mini_fo.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/mini_fo.h
++++ b/fs/mini_fo/mini_fo.h
 @@ -0,0 +1,503 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
@@ -5654,10 +5630,8 @@ Index: linux-2.4.35.4/fs/mini_fo/mini_fo.h
 +/* ioctls */
 +
 +#endif	/* not __MINI_FO_H_ */
-Index: linux-2.4.35.4/fs/mini_fo/mini_fo-merge
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/mini_fo-merge
++++ b/fs/mini_fo/mini_fo-merge
 @@ -0,0 +1,180 @@
 +#!/bin/bash
 +#
@@ -5839,10 +5813,8 @@ Index: linux-2.4.35.4/fs/mini_fo/mini_fo-merge
 +#rm $TMP/$SKIP_DEL_LIST 
 +
 +echo "Done!"
-Index: linux-2.4.35.4/fs/mini_fo/mini_fo-overlay
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/mini_fo-overlay
++++ b/fs/mini_fo/mini_fo-overlay
 @@ -0,0 +1,130 @@
 +#!/bin/bash
 +#
@@ -5974,10 +5946,8 @@ Index: linux-2.4.35.4/fs/mini_fo/mini_fo-overlay
 +if [ $? -ne 0 ]; then
 +    echo "Error, mounting failed, maybe no permisson to mount?"
 +fi
-Index: linux-2.4.35.4/fs/mini_fo/mmap.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/mmap.c
++++ b/fs/mini_fo/mmap.c
 @@ -0,0 +1,637 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
@@ -6616,10 +6586,8 @@ Index: linux-2.4.35.4/fs/mini_fo/mmap.c
 +	print_exit_status(err);
 +	return err;
 +}
-Index: linux-2.4.35.4/fs/mini_fo/README
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/README
++++ b/fs/mini_fo/README
 @@ -0,0 +1,163 @@
 +README for the mini_fo overlay file system
 +=========================================
@@ -6784,10 +6752,8 @@ Index: linux-2.4.35.4/fs/mini_fo/README
 +2 of the License, or (at your option) any later version.
 +
 +
-Index: linux-2.4.35.4/fs/mini_fo/RELEASE_NOTES
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/RELEASE_NOTES
++++ b/fs/mini_fo/RELEASE_NOTES
 @@ -0,0 +1,111 @@
 +Release:	mini_fo-0.6.1 (v0-6-1)
 +Date:		21.09.2005
@@ -6900,10 +6866,8 @@ Index: linux-2.4.35.4/fs/mini_fo/RELEASE_NOTES
 +original state. I hope to fix this someday. Please note that this does
 +not effect the special hard links '.' and '..', that are handled
 +seperately by the lower fs.
-Index: linux-2.4.35.4/fs/mini_fo/state.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/state.c
++++ b/fs/mini_fo/state.c
 @@ -0,0 +1,620 @@
 +/*
 + * Copyright (C) 2005 Markus Klotzbuecher <[email protected]>
@@ -7525,10 +7489,8 @@ Index: linux-2.4.35.4/fs/mini_fo/state.c
 +	return err;
 +}
 +
-Index: linux-2.4.35.4/fs/mini_fo/super.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/super.c
++++ b/fs/mini_fo/super.c
 @@ -0,0 +1,259 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok

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

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_ipp2p.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_ipp2p.h
++++ b/include/linux/netfilter_ipv4/ipt_ipp2p.h
 @@ -0,0 +1,31 @@
 +#ifndef __IPT_IPP2P_H
 +#define __IPT_IPP2P_H
@@ -34,10 +32,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_ipp2p.h
 +#define IPP2P_MUTE		(1 << 14)
 +#define IPP2P_WASTE		(1 << 15)
 +#define IPP2P_XDCC		(1 << 16)
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
 @@ -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 '  recent match support' CONFIG_IP_NF_MATCH_RECENT $CONFIG_IP_NF_IPTABLES
@@ -46,10 +42,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
   
    dep_tristate '  DSCP match support' CONFIG_IP_NF_MATCH_DSCP $CONFIG_IP_NF_IPTABLES
   
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
 @@ -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_MARK) += ipt_mark.o
@@ -58,10 +52,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
  
  obj-$(CONFIG_IP_NF_MATCH_PKTTYPE) += ipt_pkttype.o
  obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_ipp2p.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_ipp2p.c
++++ b/net/ipv4/netfilter/ipt_ipp2p.c
 @@ -0,0 +1,868 @@
 +#if defined(MODVERSIONS)
 +#include <linux/modversions.h>

target/linux/generic-2.4/patches/602-netfilter_layer7_2.21.patch

@@ -1,6 +1,6 @@
 --- a/Documentation/Configure.help
 +++ b/Documentation/Configure.help
-@@ -29207,6 +29207,18 @@
+@@ -29207,6 +29207,18 @@ CONFIG_SOUND_WM97XX
    
    If unsure, say N.
  
@@ -21,7 +21,7 @@
  #   capitalize: AppleTalk, Ethernet, DOS, DMA, FAT, FTP, Internet,
 --- a/include/linux/netfilter_ipv4/ip_conntrack.h
 +++ b/include/linux/netfilter_ipv4/ip_conntrack.h
-@@ -207,6 +207,17 @@
+@@ -207,6 +207,17 @@ struct ip_conntrack
  	} nat;
  #endif /* CONFIG_IP_NF_NAT_NEEDED */
  
@@ -70,7 +70,7 @@
 +#endif /* _IPT_LAYER7_H */
 --- a/net/ipv4/netfilter/Config.in
 +++ b/net/ipv4/netfilter/Config.in
-@@ -44,6 +44,9 @@
+@@ -44,6 +44,9 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; 
    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
      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
@@ -82,7 +82,7 @@
    dep_tristate '  Packet filtering' CONFIG_IP_NF_FILTER $CONFIG_IP_NF_IPTABLES 
 --- a/net/ipv4/netfilter/Makefile
 +++ b/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_UNCLEAN) += ipt_unclean.o
  obj-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss.o
@@ -92,7 +92,7 @@
  obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
 --- a/net/ipv4/netfilter/ip_conntrack_core.c
 +++ b/net/ipv4/netfilter/ip_conntrack_core.c
-@@ -346,6 +346,14 @@
+@@ -346,6 +346,14 @@ destroy_conntrack(struct nf_conntrack *n
  		}
  		kfree(ct->master);
  	}
@@ -109,7 +109,7 @@
  	if (master)
 --- a/net/ipv4/netfilter/ip_conntrack_standalone.c
 +++ b/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, "use=%u ",
  		       atomic_read(&conntrack->ct_general.use));

target/linux/generic-2.4/patches/603-netfilter_nat_pptp.patch

@@ -1,7 +1,5 @@
-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
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
+--- a/include/linux/netfilter_ipv4/ip_conntrack.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack.h
 @@ -50,16 +50,19 @@ enum ip_conntrack_status {
  
  #include <linux/netfilter_ipv4/ip_conntrack_tcp.h>
@@ -56,10 +54,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
  };
  #endif
  
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
 @@ -0,0 +1,313 @@
 +/* PPTP constants and structs */
 +#ifndef _CONNTRACK_PPTP_H
@@ -374,10 +370,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
 +
 +#endif /* __KERNEL__ */
 +#endif /* _CONNTRACK_PPTP_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
 @@ -0,0 +1,123 @@
 +#ifndef _CONNTRACK_PROTO_GRE_H
 +#define _CONNTRACK_PROTO_GRE_H
@@ -502,10 +496,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
 +#endif /* __KERNEL__ */
 +
 +#endif /* _CONNTRACK_PROTO_GRE_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
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
+--- a/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
 @@ -14,7 +14,7 @@
  union ip_conntrack_manip_proto
  {
@@ -564,10 +556,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
  
  #define CTINFO2DIR(ctinfo) ((ctinfo) >= IP_CT_IS_REPLY ? IP_CT_DIR_REPLY : IP_CT_DIR_ORIGINAL)
  
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat_pptp.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat_pptp.h
++++ b/include/linux/netfilter_ipv4/ip_nat_pptp.h
 @@ -0,0 +1,11 @@
 +/* PPTP constants and structs */
 +#ifndef _NAT_PPTP_H
@@ -580,10 +570,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat_pptp.h
 +};
 +
 +#endif /* _NAT_PPTP_H */
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
 @@ -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 '  TFTP protocol support' CONFIG_IP_NF_TFTP $CONFIG_IP_NF_CONNTRACK
@@ -614,10 +602,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
        if [ "$CONFIG_IP_NF_AMANDA" = "m" ]; then
          define_tristate CONFIG_IP_NF_NAT_AMANDA m
        else
-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
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
+--- a/net/ipv4/netfilter/ip_conntrack_core.c
++++ b/net/ipv4/netfilter/ip_conntrack_core.c
 @@ -143,6 +143,8 @@ ip_ct_get_tuple(const struct iphdr *iph,
  	tuple->dst.ip = iph->daddr;
  	tuple->dst.protonum = iph->protocol;
@@ -667,10 +653,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
  		    && LIST_FIND(&ip_conntrack_expect_list, expect_clash,
  			         struct ip_conntrack_expect *, newtuple, &expect->mask)) {
  			/* Force NAT to find an unused tuple */
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp_priv.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp_priv.h
++++ b/net/ipv4/netfilter/ip_conntrack_pptp_priv.h
 @@ -0,0 +1,24 @@
 +#ifndef _IP_CT_PPTP_PRIV_H
 +#define _IP_CT_PPTP_PRIV_H
@@ -696,10 +680,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp_priv.h
 +};
 +
 +#endif
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c
++++ b/net/ipv4/netfilter/ip_conntrack_proto_gre.c
 @@ -0,0 +1,333 @@
 +/*
 + * ip_conntrack_proto_gre.c - Version 1.2 
@@ -1034,10 +1016,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c
 +
 +module_init(init);
 +module_exit(fini);
-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
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c
+--- a/net/ipv4/netfilter/ip_nat_core.c
++++ b/net/ipv4/netfilter/ip_nat_core.c
 @@ -424,7 +424,7 @@ get_unique_tuple(struct ip_conntrack_tup
  	*tuple = *orig_tuple;
  	while ((rptr = find_best_ips_proto_fast(tuple, mr, conntrack, hooknum))
@@ -1059,10 +1039,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c
  #endif
  
  		/* We now have two tuples (SRCIP/SRCPT/DSTIP/DSTPT):
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_pptp.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_pptp.c
++++ b/net/ipv4/netfilter/ip_nat_pptp.c
 @@ -0,0 +1,482 @@
 +/*
 + * ip_nat_pptp.c	- Version 1.5
@@ -1546,10 +1524,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_pptp.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_proto_gre.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_proto_gre.c
++++ b/net/ipv4/netfilter/ip_nat_proto_gre.c
 @@ -0,0 +1,202 @@
 +/*
 + * ip_nat_proto_gre.c - Version 1.2
@@ -1753,10 +1729,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_proto_gre.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
 @@ -36,23 +36,32 @@ obj-$(CONFIG_IP_NF_AMANDA) += ip_conntra
  ifdef CONFIG_IP_NF_AMANDA
  	export-objs += ip_conntrack_amanda.o
@@ -1792,10 +1766,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
  
  # generic IP tables 
  obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp.c
++++ b/net/ipv4/netfilter/ip_conntrack_pptp.c
 @@ -0,0 +1,635 @@
 +/*
 + * ip_conntrack_pptp.c	- Version 1.9

target/linux/generic-2.4/patches/604-netfilter_maxconn.patch

@@ -1,7 +1,5 @@
-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
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
+--- a/net/ipv4/netfilter/ip_conntrack_core.c
++++ b/net/ipv4/netfilter/ip_conntrack_core.c
 @@ -1410,7 +1410,7 @@ void ip_conntrack_cleanup(void)
  	nf_unregister_sockopt(&so_getorigdst);
  }

target/linux/generic-2.4/patches/605-netfilter_TTL.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
 @@ -3209,6 +3209,15 @@ CONFIG_IP_NF_TARGET_LOG
    If you want to compile it as a module, say M here and read
    <file:Documentation/modules.txt>.  If unsure, say `N'.
@@ -18,10 +16,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help
  ipchains (2.2-style) support
  CONFIG_IP_NF_COMPAT_IPCHAINS
    This option places ipchains (with masquerading and redirection
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_TTL.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_TTL.h
++++ b/include/linux/netfilter_ipv4/ipt_TTL.h
 @@ -0,0 +1,21 @@
 +/* TTL modification module for IP tables
 + * (C) 2000 by Harald Welte <[email protected]> */
@@ -44,10 +40,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_TTL.h
 +
 +
 +#endif
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
 @@ -125,6 +125,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; 
      dep_tristate '    MARK target support' CONFIG_IP_NF_TARGET_MARK $CONFIG_IP_NF_MANGLE
    fi
@@ -56,10 +50,8 @@ 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 '  TCPMSS target support' CONFIG_IP_NF_TARGET_TCPMSS $CONFIG_IP_NF_IPTABLES
  fi
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_TTL.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_TTL.c
++++ b/net/ipv4/netfilter/ipt_TTL.c
 @@ -0,0 +1,110 @@
 +/* TTL modification target for IP tables
 + * (C) 2000 by Harald Welte <[email protected]>
@@ -171,10 +163,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_TTL.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
 @@ -109,6 +109,7 @@ obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) +=
  obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
  obj-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += ip_nat_snmp_basic.o

target/linux/generic-2.4/patches/606-netfilter_NETMAP.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
 @@ -3086,6 +3086,17 @@ CONFIG_IP_NF_TARGET_REDIRECT
    If you want to compile it as a module, say M here and read
    <file:Documentation/modules.txt>.  If unsure, say `N'.
@@ -20,10 +18,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help
  Packet mangling
  CONFIG_IP_NF_MANGLE
    This option adds a `mangle' table to iptables: see the man page for
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
 @@ -65,6 +65,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; 
        define_bool CONFIG_IP_NF_NAT_NEEDED y
        dep_tristate '    MASQUERADE target support' CONFIG_IP_NF_TARGET_MASQUERADE $CONFIG_IP_NF_NAT
@@ -32,10 +28,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
        if [ "$CONFIG_IP_NF_PPTP" = "m" ]; then
          define_tristate CONFIG_IP_NF_NAT_PPTP m
        else
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_NETMAP.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_NETMAP.c
++++ b/net/ipv4/netfilter/ipt_NETMAP.c
 @@ -0,0 +1,112 @@
 +/* NETMAP - static NAT mapping of IP network addresses (1:1).
 +   The mapping can be applied to source (POSTROUTING),
@@ -149,10 +143,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_NETMAP.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
 @@ -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_MASQUERADE) += ipt_MASQUERADE.o

target/linux/generic-2.4/patches/607-netfilter_connmark.patch

@@ -1,7 +1,5 @@
-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
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
+--- a/include/linux/netfilter_ipv4/ip_conntrack.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack.h
 @@ -226,6 +226,9 @@ struct ip_conntrack
  		unsigned int app_data_len;
  	} layer7;
@@ -12,10 +10,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
  };
  
  /* get master conntrack via master expectation */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CONNMARK.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CONNMARK.h
++++ b/include/linux/netfilter_ipv4/ipt_CONNMARK.h
 @@ -0,0 +1,25 @@
 +#ifndef _IPT_CONNMARK_H_target
 +#define _IPT_CONNMARK_H_target
@@ -42,10 +38,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CONNMARK.h
 +};
 +
 +#endif /*_IPT_CONNMARK_H_target*/
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connmark.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connmark.h
++++ b/include/linux/netfilter_ipv4/ipt_connmark.h
 @@ -0,0 +1,18 @@
 +#ifndef _IPT_CONNMARK_H
 +#define _IPT_CONNMARK_H
@@ -65,10 +59,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connmark.h
 +};
 +
 +#endif /*_IPT_CONNMARK_H*/
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
 @@ -6,7 +6,8 @@ comment '  IP: Netfilter Configuration'
  
  tristate 'Connection tracking (required for masq/NAT)' CONFIG_IP_NF_CONNTRACK
@@ -99,10 +91,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
    dep_tristate '  LOG target support' CONFIG_IP_NF_TARGET_LOG $CONFIG_IP_NF_IPTABLES
    dep_tristate '  TTL target support' CONFIG_IP_NF_TARGET_TTL $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
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
 @@ -93,6 +93,7 @@ obj-$(CONFIG_IP_NF_MATCH_LENGTH) += ipt_
  
  obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
@@ -119,10 +109,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
  obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
  obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
  obj-$(CONFIG_IP_NF_TARGET_TCPMSS) += ipt_TCPMSS.o
-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
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
+--- a/net/ipv4/netfilter/ip_conntrack_core.c
++++ b/net/ipv4/netfilter/ip_conntrack_core.c
 @@ -754,6 +754,9 @@ init_conntrack(const struct ip_conntrack
  		__set_bit(IPS_EXPECTED_BIT, &conntrack->status);
  		conntrack->master = expected;
@@ -133,10 +121,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
  		LIST_DELETE(&ip_conntrack_expect_list, expected);
  		expected->expectant->expecting--;
  		nf_conntrack_get(&master_ct(conntrack)->infos[0]);
-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
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
+--- a/net/ipv4/netfilter/ip_conntrack_standalone.c
++++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
 @@ -107,6 +107,9 @@ print_conntrack(char *buffer, struct ip_
  		len += sprintf(buffer + len, "[ASSURED] ");
  	len += sprintf(buffer + len, "use=%u ",
@@ -147,10 +133,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
  
  	#if defined(CONFIG_IP_NF_MATCH_LAYER7) || defined(CONFIG_IP_NF_MATCH_LAYER7_MODULE)
  	if(conntrack->layer7.app_proto)
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_CONNMARK.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_CONNMARK.c
++++ b/net/ipv4/netfilter/ipt_CONNMARK.c
 @@ -0,0 +1,118 @@
 +/* This kernel module is used to modify the connection mark values, or
 + * to optionally restore the skb nfmark from the connection mark
@@ -270,10 +254,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_CONNMARK.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_connmark.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_connmark.c
++++ b/net/ipv4/netfilter/ipt_connmark.c
 @@ -0,0 +1,83 @@
 +/* This kernel module matches connection mark values set by the
 + * CONNMARK target

target/linux/generic-2.4/patches/608-netfilter_ipset.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
 @@ -3220,6 +3220,75 @@ CONFIG_IP_NF_TARGET_LOG
    If you want to compile it as a module, say M here and read
    <file:Documentation/modules.txt>.  If unsure, say `N'.
@@ -78,10 +76,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help
  TTL target support
  CONFIG_IP_NF_TARGET_TTL
    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
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set.h
++++ b/include/linux/netfilter_ipv4/ip_set.h
 @@ -0,0 +1,489 @@
 +#ifndef _IP_SET_H
 +#define _IP_SET_H
@@ -572,10 +568,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set.h
 +#endif				/* __KERNEL__ */
 +
 +#endif /*_IP_SET_H*/
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iphash.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iphash.h
++++ b/include/linux/netfilter_ipv4/ip_set_iphash.h
 @@ -0,0 +1,30 @@
 +#ifndef __IP_SET_IPHASH_H
 +#define __IP_SET_IPHASH_H
@@ -607,10 +601,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iphash.h
 +};
 +
 +#endif	/* __IP_SET_IPHASH_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipmap.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipmap.h
++++ b/include/linux/netfilter_ipv4/ip_set_ipmap.h
 @@ -0,0 +1,56 @@
 +#ifndef __IP_SET_IPMAP_H
 +#define __IP_SET_IPMAP_H
@@ -668,10 +660,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipmap.h
 +}
 +	
 +#endif /* __IP_SET_IPMAP_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iptree.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iptree.h
++++ b/include/linux/netfilter_ipv4/ip_set_iptree.h
 @@ -0,0 +1,39 @@
 +#ifndef __IP_SET_IPTREE_H
 +#define __IP_SET_IPTREE_H
@@ -712,10 +702,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iptree.h
 +};
 +
 +#endif	/* __IP_SET_IPTREE_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_jhash.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_jhash.h
++++ b/include/linux/netfilter_ipv4/ip_set_jhash.h
 @@ -0,0 +1,148 @@
 +#ifndef _LINUX_IPSET_JHASH_H
 +#define _LINUX_IPSET_JHASH_H
@@ -865,10 +853,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_jhash.h
 +}
 +
 +#endif /* _LINUX_IPSET_JHASH_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_macipmap.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_macipmap.h
++++ b/include/linux/netfilter_ipv4/ip_set_macipmap.h
 @@ -0,0 +1,38 @@
 +#ifndef __IP_SET_MACIPMAP_H
 +#define __IP_SET_MACIPMAP_H
@@ -908,10 +894,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_macipmap.h
 +};
 +
 +#endif	/* __IP_SET_MACIPMAP_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_malloc.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_malloc.h
++++ b/include/linux/netfilter_ipv4/ip_set_malloc.h
 @@ -0,0 +1,27 @@
 +#ifndef _IP_SET_MALLOC_H
 +#define _IP_SET_MALLOC_H
@@ -940,10 +924,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_malloc.h
 +#endif				/* __KERNEL__ */
 +
 +#endif /*_IP_SET_MALLOC_H*/
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_nethash.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_nethash.h
++++ b/include/linux/netfilter_ipv4/ip_set_nethash.h
 @@ -0,0 +1,55 @@
 +#ifndef __IP_SET_NETHASH_H
 +#define __IP_SET_NETHASH_H
@@ -1000,10 +982,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_nethash.h
 +}
 +
 +#endif	/* __IP_SET_NETHASH_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_portmap.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_portmap.h
++++ b/include/linux/netfilter_ipv4/ip_set_portmap.h
 @@ -0,0 +1,25 @@
 +#ifndef __IP_SET_PORTMAP_H
 +#define __IP_SET_PORTMAP_H
@@ -1030,10 +1010,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_portmap.h
 +};
 +
 +#endif /* __IP_SET_PORTMAP_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_prime.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_prime.h
++++ b/include/linux/netfilter_ipv4/ip_set_prime.h
 @@ -0,0 +1,34 @@
 +#ifndef __IP_SET_PRIME_H
 +#define __IP_SET_PRIME_H
@@ -1069,10 +1047,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_prime.h
 +}
 +
 +#endif /* __IP_SET_PRIME_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_set.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_set.h
++++ b/include/linux/netfilter_ipv4/ipt_set.h
 @@ -0,0 +1,21 @@
 +#ifndef _IPT_SET_H
 +#define _IPT_SET_H
@@ -1095,10 +1071,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_set.h
 +};
 +
 +#endif /*_IPT_SET_H*/
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
 @@ -22,6 +22,20 @@ tristate 'IP tables support (required fo
  if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; then
  # The simple matches.
@@ -1120,10 +1094,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
    dep_tristate '  MAC address match support' CONFIG_IP_NF_MATCH_MAC $CONFIG_IP_NF_IPTABLES
    dep_tristate '  Packet type match support' CONFIG_IP_NF_MATCH_PKTTYPE $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
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set.c
++++ b/net/ipv4/netfilter/ip_set.c
 @@ -0,0 +1,2002 @@
 +/* Copyright (C) 2000-2002 Joakim Axelsson <[email protected]>
 + *                         Patrick Schaaf <[email protected]>
@@ -3127,10 +3099,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_iphash.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_iphash.c
++++ b/net/ipv4/netfilter/ip_set_iphash.c
 @@ -0,0 +1,379 @@
 +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <[email protected]>
 + *
@@ -3511,10 +3481,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_iphash.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_ipmap.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_ipmap.c
++++ b/net/ipv4/netfilter/ip_set_ipmap.c
 @@ -0,0 +1,314 @@
 +/* Copyright (C) 2000-2002 Joakim Axelsson <[email protected]>
 + *                         Patrick Schaaf <[email protected]>
@@ -3830,10 +3798,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_ipmap.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_iptree.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_iptree.c
++++ b/net/ipv4/netfilter/ip_set_iptree.c
 @@ -0,0 +1,511 @@
 +/* Copyright (C) 2005 Jozsef Kadlecsik <[email protected]>
 + *
@@ -4346,10 +4312,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_iptree.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_macipmap.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_macipmap.c
++++ b/net/ipv4/netfilter/ip_set_macipmap.c
 @@ -0,0 +1,340 @@
 +/* Copyright (C) 2000-2002 Joakim Axelsson <[email protected]>
 + *                         Patrick Schaaf <[email protected]>
@@ -4691,10 +4655,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_macipmap.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_nethash.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_nethash.c
++++ b/net/ipv4/netfilter/ip_set_nethash.c
 @@ -0,0 +1,450 @@
 +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <[email protected]>
 + *
@@ -5146,10 +5108,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_nethash.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_portmap.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_portmap.c
++++ b/net/ipv4/netfilter/ip_set_portmap.c
 @@ -0,0 +1,321 @@
 +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <[email protected]>
 + *
@@ -5472,10 +5432,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_portmap.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_set.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_set.c
++++ b/net/ipv4/netfilter/ipt_set.c
 @@ -0,0 +1,114 @@
 +/* Copyright (C) 2000-2002 Joakim Axelsson <[email protected]>
 + *                         Patrick Schaaf <[email protected]>
@@ -5591,10 +5549,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_set.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_SET.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_SET.c
++++ b/net/ipv4/netfilter/ipt_SET.c
 @@ -0,0 +1,127 @@
 +/* Copyright (C) 2000-2002 Joakim Axelsson <[email protected]>
 + *                         Patrick Schaaf <[email protected]>
@@ -5723,10 +5679,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_SET.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
 @@ -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_LIMIT) += ipt_limit.o

target/linux/generic-2.4/patches/609-netfilter_string.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_string.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_string.h
++++ b/include/linux/netfilter_ipv4/ipt_string.h
 @@ -0,0 +1,18 @@
 +#ifndef _IPT_STRING_H
 +#define _IPT_STRING_H
@@ -21,10 +19,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_string.h
 +};
 +
 +#endif /*_IPT_STRING_H*/
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
 @@ -63,6 +63,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; 
    fi
    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
@@ -33,10 +29,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
      dep_tristate '  Owner match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_OWNER $CONFIG_IP_NF_IPTABLES
      dep_tristate '  Layer 7 match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_LAYER7 $CONFIG_IP_NF_CONNTRACK
      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
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_string.c
++++ b/net/ipv4/netfilter/ipt_string.c
 @@ -0,0 +1,99 @@
 +/* String matching match for iptables
 + * 
@@ -137,10 +131,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_string.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
 @@ -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_CONNTRACK) += ipt_conntrack.o
@@ -149,10 +141,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
  obj-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss.o
  obj-$(CONFIG_IP_NF_MATCH_LAYER7) += ipt_layer7.o
  
-Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.c
++++ b/net/ipv4/netfilter/textsearch/textsearch.c
 @@ -0,0 +1,305 @@
 +/*
 + * lib/textsearch.c	Generic text search interface
@@ -459,10 +449,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.c
 +	kfree(conf);
 +}
 +
-Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.h
++++ b/net/ipv4/netfilter/textsearch/textsearch.h
 @@ -0,0 +1,182 @@
 +#ifndef __LINUX_TEXTSEARCH_H
 +#define __LINUX_TEXTSEARCH_H
@@ -646,10 +634,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.h
 +#endif /* __KERNEL__ */
 +
 +#endif
-Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_bm.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_bm.c
++++ b/net/ipv4/netfilter/textsearch/ts_bm.c
 @@ -0,0 +1,190 @@
 +/*
 + * lib/ts_bm.c		Boyer-Moore text search implementation
@@ -841,10 +827,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_bm.c
 +{
 +	textsearch_unregister(&bm_ops);
 +}
-Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_kmp.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_kmp.c
++++ b/net/ipv4/netfilter/textsearch/ts_kmp.c
 @@ -0,0 +1,141 @@
 +/*
 + * lib/ts_kmp.c		Knuth-Morris-Pratt text search implementation

target/linux/generic-2.4/patches/610-netfilter_connbytes.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
 @@ -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 '  TFTP protocol support' CONFIG_IP_NF_TFTP $CONFIG_IP_NF_CONNTRACK
@@ -11,10 +9,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
    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
  fi
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
 @@ -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_STATE) += ipt_state.o
@@ -23,10 +19,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
  obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += ipt_conntrack.o
  obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt_unclean.o
  obj-$(CONFIG_IP_NF_MATCH_STRING) += ipt_string.o
-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
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_amanda.c
+--- a/net/ipv4/netfilter/ip_conntrack_amanda.c
++++ b/net/ipv4/netfilter/ip_conntrack_amanda.c
 @@ -75,7 +75,7 @@ static int help(const struct iphdr *iph,
  
  	/* increase the UDP timeout of the master connection as replies from
@@ -36,10 +30,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_amanda.c
  	
  	/* Search for "CONNECT " string */
  	do {
-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
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+--- a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
++++ b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
 @@ -211,7 +211,7 @@ static int tcp_packet(struct ip_conntrac
  			set_bit(IPS_ASSURED_BIT, &conntrack->status);
  
@@ -49,10 +41,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
  	}
  
  	return NF_ACCEPT;
-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
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_udp.c
+--- a/net/ipv4/netfilter/ip_conntrack_proto_udp.c
++++ b/net/ipv4/netfilter/ip_conntrack_proto_udp.c
 @@ -47,16 +47,16 @@ static unsigned int udp_print_conntrack(
  /* Returns verdict for packet, and may modify conntracktype */
  static int udp_packet(struct ip_conntrack *conntrack,
@@ -73,10 +63,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_udp.c
  
  	return NF_ACCEPT;
  }
-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
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
+--- a/net/ipv4/netfilter/ip_conntrack_standalone.c
++++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
 @@ -79,6 +79,18 @@ print_expect(char *buffer, const struct 
  	return len;
  }
@@ -121,10 +109,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
  EXPORT_SYMBOL(ip_ct_find_proto);
  EXPORT_SYMBOL(__ip_ct_find_proto);
  EXPORT_SYMBOL(ip_ct_find_helper);
-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
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_generic.c
+--- a/net/ipv4/netfilter/ip_conntrack_proto_generic.c
++++ b/net/ipv4/netfilter/ip_conntrack_proto_generic.c
 @@ -41,9 +41,9 @@ static unsigned int generic_print_conntr
  /* Returns verdict for packet, or -1 for invalid. */
  static int established(struct ip_conntrack *conntrack,
@@ -137,10 +123,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_generic.c
  	return NF_ACCEPT;
  }
  
-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
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
+--- a/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
++++ b/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
 @@ -82,7 +82,7 @@ static int icmp_packet(struct ip_conntra
  			ct->timeout.function((unsigned long)ct);
  	} else {
@@ -150,10 +134,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
  	}
  
  	return NF_ACCEPT;
-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
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
+--- a/net/ipv4/netfilter/ip_conntrack_core.c
++++ b/net/ipv4/netfilter/ip_conntrack_core.c
 @@ -1196,22 +1196,40 @@ void ip_conntrack_helper_unregister(stru
  
  	MOD_DEC_USE_COUNT;
@@ -198,10 +180,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
  	}
  	WRITE_UNLOCK(&ip_conntrack_lock);
  }
-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
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
+--- a/include/linux/netfilter_ipv4/ip_conntrack.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack.h
 @@ -164,6 +164,12 @@ struct ip_conntrack_expect
  	union ip_conntrack_expect_help help;
  };
@@ -241,10 +221,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
  
  /* These are for NAT.  Icky. */
  /* Call me when a conntrack is destroyed. */
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_connbytes.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_connbytes.c
++++ b/net/ipv4/netfilter/ipt_connbytes.c
 @@ -0,0 +1,163 @@
 +/* Kernel module to match connection tracking byte counter.
 + * GPL (C) 2002 Martin Devera ([email protected]).
@@ -409,10 +387,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_connbytes.c
 +module_init(init);
 +module_exit(fini);
 +MODULE_LICENSE("GPL");
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connbytes.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connbytes.h
++++ b/include/linux/netfilter_ipv4/ipt_connbytes.h
 @@ -0,0 +1,25 @@
 +#ifndef _IPT_CONNBYTES_H
 +#define _IPT_CONNBYTES_H
@@ -439,10 +415,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connbytes.h
 +};
 +
 +#endif
-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
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c
+--- a/net/ipv4/netfilter/ip_conntrack_proto_gre.c
++++ b/net/ipv4/netfilter/ip_conntrack_proto_gre.c
 @@ -237,16 +237,16 @@ static unsigned int gre_print_conntrack(
  /* Returns verdict for packet, and may modify conntrack */
  static int gre_packet(struct ip_conntrack *ct,

target/linux/generic-2.4/patches/611-netfilter_condition.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
 @@ -2979,6 +2979,14 @@ CONFIG_IP_NF_MATCH_TOS
    If you want to compile it as a module, say M here and read
    <file:Documentation/modules.txt>.  If unsure, say `N'.
@@ -32,10 +30,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help
  Multiple port match support
  CONFIG_IP6_NF_MATCH_MULTIPORT
    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
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_condition.h
++++ b/include/linux/netfilter_ipv4/ipt_condition.h
 @@ -0,0 +1,11 @@
 +#ifndef __IPT_CONDITION_MATCH__
 +#define __IPT_CONDITION_MATCH__
@@ -48,10 +44,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_condition.h
 +};
 +
 +#endif
-Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_condition.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_condition.h
++++ b/include/linux/netfilter_ipv6/ip6t_condition.h
 @@ -0,0 +1,11 @@
 +#ifndef __IP6T_CONDITION_MATCH__
 +#define __IP6T_CONDITION_MATCH__
@@ -64,10 +58,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_condition.h
 +};
 +
 +#endif
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
 @@ -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 '  Multiple port match support' CONFIG_IP_NF_MATCH_MULTIPORT $CONFIG_IP_NF_IPTABLES
@@ -76,10 +68,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 '  ECN match support' CONFIG_IP_NF_MATCH_ECN $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
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
 @@ -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_OWNER) += ipt_owner.o
@@ -88,10 +78,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
  
  obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
  
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_condition.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_condition.c
++++ b/net/ipv4/netfilter/ipt_condition.c
 @@ -0,0 +1,256 @@
 +/*-------------------------------------------*\
 +|          Netfilter Condition Module         |
@@ -349,10 +337,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_condition.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv6/netfilter/Config.in
+--- a/net/ipv6/netfilter/Config.in
++++ b/net/ipv6/netfilter/Config.in
 @@ -17,6 +17,7 @@ tristate 'IP6 tables support (required f
  if [ "$CONFIG_IP6_NF_IPTABLES" != "n" ]; then
  # The simple matches.
@@ -361,10 +347,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in
    dep_tristate '  MAC address match support' CONFIG_IP6_NF_MATCH_MAC $CONFIG_IP6_NF_IPTABLES
    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
      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
-===================================================================
---- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv6/netfilter/Makefile
+--- a/net/ipv6/netfilter/Makefile
++++ b/net/ipv6/netfilter/Makefile
 @@ -14,6 +14,7 @@ export-objs := ip6_tables.o
  # Link order matters here.
  obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o
@@ -373,10 +357,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile
  obj-$(CONFIG_IP6_NF_MATCH_MARK) += ip6t_mark.o
  obj-$(CONFIG_IP6_NF_MATCH_LENGTH) += ip6t_length.o
  obj-$(CONFIG_IP6_NF_MATCH_MAC) += ip6t_mac.o
-Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_condition.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_condition.c
++++ b/net/ipv6/netfilter/ip6t_condition.c
 @@ -0,0 +1,254 @@
 +/*-------------------------------------------*\
 +|    Netfilter Condition Module for IPv6      |

target/linux/generic-2.4/patches/612-netfilter_quota.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
 @@ -2888,6 +2888,13 @@ CONFIG_IP_NF_MATCH_LIMIT
    If you want to compile it as a module, say M here and read
    <file:Documentation/modules.txt>.  If unsure, say `N'.
@@ -16,10 +14,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help
  skb->pkt_type packet match support
  CONFIG_IP_NF_MATCH_PKTTYPE
    This patch allows you to match packet in accrodance
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_quota.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_quota.h
++++ b/include/linux/netfilter_ipv4/ipt_quota.h
 @@ -0,0 +1,12 @@
 +#ifndef _IPT_QUOTA_H
 +#define _IPT_QUOTA_H
@@ -33,10 +29,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_quota.h
 +};
 +
 +#endif /*_IPT_QUOTA_H*/
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
 @@ -24,6 +24,7 @@ tristate 'IP tables support (required fo
  if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; then
  # The simple matches.
@@ -45,10 +39,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
    if [ "$CONFIG_IP_NF_SET" != "n" ]; then
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
 @@ -74,6 +74,7 @@ obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o
  # matches
  obj-$(CONFIG_IP_NF_MATCH_HELPER) += ipt_helper.o
@@ -57,10 +49,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
  obj-$(CONFIG_IP_NF_MATCH_MARK) += ipt_mark.o
  obj-$(CONFIG_IP_NF_MATCH_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
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_quota.c
++++ b/net/ipv4/netfilter/ipt_quota.c
 @@ -0,0 +1,88 @@
 +/* 
 + * netfilter module to enforce network quotas

target/linux/generic-2.4/patches/613-netfilter_nat_h323.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
 @@ -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 '  GRE protocol support' CONFIG_IP_NF_CT_PROTO_GRE $CONFIG_IP_NF_CONNTRACK
@@ -24,10 +22,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
        if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
          dep_tristate '    Basic SNMP-ALG support (EXPERIMENTAL)' CONFIG_IP_NF_NAT_SNMP_BASIC $CONFIG_IP_NF_NAT
        fi
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
 @@ -53,6 +53,10 @@ obj-$(CONFIG_IP_NF_PPTP) += ip_conntrack
  ifdef CONFIG_IP_NF_NAT_PPTP
  	export-objs += ip_conntrack_pptp.o
@@ -47,10 +43,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
  
  # generic IP tables 
  obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_h323.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_h323.c
++++ b/net/ipv4/netfilter/ip_conntrack_h323.c
 @@ -0,0 +1,302 @@
 +/* 
 + * H.323 'brute force' extension for H.323 connection tracking. 
@@ -354,10 +348,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_h323.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_h323.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_h323.c
++++ b/net/ipv4/netfilter/ip_nat_h323.c
 @@ -0,0 +1,403 @@
 +/* 
 + * H.323 'brute force' extension for NAT alteration. 
@@ -762,10 +754,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_h323.c
 +
 +module_init(init);
 +module_exit(fini);
-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
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
+--- a/include/linux/netfilter_ipv4/ip_conntrack.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack.h
 @@ -71,6 +71,7 @@ union ip_conntrack_expect_proto {
  #include <linux/netfilter_ipv4/ip_conntrack_ftp.h>
  #include <linux/netfilter_ipv4/ip_conntrack_irc.h>
@@ -790,10 +780,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
  };
  
  #ifdef CONFIG_IP_NF_NAT_NEEDED
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_h323.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_h323.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack_h323.h
 @@ -0,0 +1,30 @@
 +#ifndef _IP_CONNTRACK_H323_H
 +#define _IP_CONNTRACK_H323_H

target/linux/generic-2.4/patches/614-netfilter_nat_rtsp.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
 @@ -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 '   PPTP protocol support' CONFIG_IP_NF_PPTP $CONFIG_IP_NF_CT_PROTO_GRE
@@ -24,10 +22,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
        if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
          dep_tristate '    Basic SNMP-ALG support (EXPERIMENTAL)' CONFIG_IP_NF_NAT_SNMP_BASIC $CONFIG_IP_NF_NAT
        fi
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
 @@ -57,6 +57,11 @@ obj-$(CONFIG_IP_NF_H323) += ip_conntrack
  ifdef CONFIG_IP_NF_NAT_H323
         export-objs += ip_conntrack_h323.o
@@ -48,10 +44,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
  
  # generic IP tables 
  obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c
++++ b/net/ipv4/netfilter/ip_conntrack_rtsp.c
 @@ -0,0 +1,507 @@
 +/*
 + * RTSP extension for IP connection tracking
@@ -560,10 +554,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c
++++ b/net/ipv4/netfilter/ip_nat_rtsp.c
 @@ -0,0 +1,621 @@
 +/*
 + * RTSP extension for TCP NAT alteration
@@ -1186,10 +1178,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/kernel/mips_ksyms.c
-+++ linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c
+--- a/arch/mips/kernel/mips_ksyms.c
++++ b/arch/mips/kernel/mips_ksyms.c
 @@ -52,6 +52,7 @@ EXPORT_SYMBOL(EISA_bus);
  /*
   * String functions
@@ -1198,10 +1188,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c
  EXPORT_SYMBOL_NOVERS(memcmp);
  EXPORT_SYMBOL_NOVERS(memset);
  EXPORT_SYMBOL_NOVERS(memcpy);
-Index: linux-2.4.35.4/include/linux/netfilter_helpers.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_helpers.h
++++ b/include/linux/netfilter_helpers.h
 @@ -0,0 +1,133 @@
 +/*
 + * Helpers for netfiler modules.  This file provides implementations for basic
@@ -1336,10 +1324,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_helpers.h
 +#endif /* __KERNEL__ */
 +
 +#endif /* _NETFILTER_HELPERS_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h
 @@ -0,0 +1,68 @@
 +/*
 + * RTSP extension for IP connection tracking.
@@ -1409,10 +1395,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h
 +#endif /* __KERNEL__ */
 +
 +#endif /* _IP_CONNTRACK_RTSP_H */
-Index: linux-2.4.35.4/include/linux/netfilter_mime.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_mime.h
++++ b/include/linux/netfilter_mime.h
 @@ -0,0 +1,90 @@
 +/*
 + * MIME functions for netfilter modules.  This file provides implementations
@@ -1504,10 +1488,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_mime.h
 +#endif /* __KERNEL__ */
 +
 +#endif /* _NETFILTER_MIME_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
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
+--- a/include/linux/netfilter_ipv4/ip_conntrack.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack.h
 @@ -72,6 +72,7 @@ union ip_conntrack_expect_proto {
  #include <linux/netfilter_ipv4/ip_conntrack_irc.h>
  #include <linux/netfilter_ipv4/ip_conntrack_pptp.h>

target/linux/generic-2.4/patches/615-netfilter_nat_mms.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
 @@ -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 '  H.323 (netmeeting) support' CONFIG_IP_NF_H323 $CONFIG_IP_NF_CONNTRACK
@@ -24,10 +22,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
        if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
          dep_tristate '    Basic SNMP-ALG support (EXPERIMENTAL)' CONFIG_IP_NF_NAT_SNMP_BASIC $CONFIG_IP_NF_NAT
        fi
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
 @@ -61,6 +61,10 @@ obj-$(CONFIG_IP_NF_RTSP) += ip_conntrack
  ifdef CONFIG_IP_NF_NAT_RTSP
         export-objs += ip_conntrack_rtsp.o
@@ -47,10 +43,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
  
  # generic IP tables 
  obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_mms.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_mms.c
++++ b/net/ipv4/netfilter/ip_conntrack_mms.c
 @@ -0,0 +1,292 @@
 +/* MMS extension for IP connection tracking
 + * (C) 2002 by Filip Sneppe <[email protected]>
@@ -344,10 +338,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_mms.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_mms.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_mms.c
++++ b/net/ipv4/netfilter/ip_nat_mms.c
 @@ -0,0 +1,330 @@
 +/* MMS extension for TCP NAT alteration.
 + * (C) 2002 by Filip Sneppe <[email protected]>
@@ -679,10 +671,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_mms.c
 +
 +module_init(init);
 +module_exit(fini);
-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
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
+--- a/include/linux/netfilter_ipv4/ip_conntrack.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack.h
 @@ -73,6 +73,7 @@ union ip_conntrack_expect_proto {
  #include <linux/netfilter_ipv4/ip_conntrack_pptp.h>
  #include <linux/netfilter_ipv4/ip_conntrack_h323.h>
@@ -707,10 +697,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
  };
  
  #ifdef CONFIG_IP_NF_NAT_NEEDED
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_mms.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_mms.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack_mms.h
 @@ -0,0 +1,31 @@
 +#ifndef _IP_CONNTRACK_MMS_H
 +#define _IP_CONNTRACK_MMS_H

target/linux/generic-2.4/patches/616-netfilter_imq.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
 @@ -3160,6 +3160,22 @@ CONFIG_IP_NF_TARGET_TOS
    If you want to compile it as a module, say M here and read
    <file:Documentation/modules.txt>.  If unsure, say `N'.
@@ -46,10 +44,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help
  SLIP (serial line) support
  CONFIG_SLIP
    Say Y if you intend to use SLIP or CSLIP (compressed SLIP) to
-Index: linux-2.4.35.4/drivers/net/Config.in
-===================================================================
---- linux-2.4.35.4.orig/drivers/net/Config.in
-+++ linux-2.4.35.4/drivers/net/Config.in
+--- a/drivers/net/Config.in
++++ b/drivers/net/Config.in
 @@ -7,6 +7,11 @@ source drivers/net/arcnet/Config.in
  tristate 'Dummy net driver support' CONFIG_DUMMY
  tristate 'Bonding driver support' CONFIG_BONDING
@@ -62,10 +58,8 @@ Index: linux-2.4.35.4/drivers/net/Config.in
  tristate 'Universal TUN/TAP device driver support' CONFIG_TUN
  bool 'Allow Net Devices to contribute to /dev/random' CONFIG_NET_RANDOM
  if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-Index: linux-2.4.35.4/drivers/net/Makefile
-===================================================================
---- linux-2.4.35.4.orig/drivers/net/Makefile
-+++ linux-2.4.35.4/drivers/net/Makefile
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
 @@ -176,6 +176,7 @@ endif
  
  obj-$(CONFIG_STRIP) += strip.o
@@ -74,10 +68,8 @@ Index: linux-2.4.35.4/drivers/net/Makefile
  obj-$(CONFIG_DE600) += de600.o
  obj-$(CONFIG_DE620) += de620.o
  obj-$(CONFIG_AT1500) += lance.o
-Index: linux-2.4.35.4/drivers/net/imq.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/drivers/net/imq.c
++++ b/drivers/net/imq.c
 @@ -0,0 +1,321 @@
 +/*
 + *             Pseudo-driver for the intermediate queue device.
@@ -400,10 +392,8 @@ Index: linux-2.4.35.4/drivers/net/imq.c
 +module_init(imq_init_module);
 +module_exit(imq_cleanup_module);
 +MODULE_LICENSE("GPL");
-Index: linux-2.4.35.4/include/linux/imq.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/imq.h
++++ b/include/linux/imq.h
 @@ -0,0 +1,9 @@
 +#ifndef _IMQ_H
 +#define _IMQ_H
@@ -414,10 +404,8 @@ Index: linux-2.4.35.4/include/linux/imq.h
 +#define IMQ_F_ENQUEUE	0x80
 +
 +#endif /* _IMQ_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_IMQ.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_IMQ.h
++++ b/include/linux/netfilter_ipv4/ipt_IMQ.h
 @@ -0,0 +1,8 @@
 +#ifndef _IPT_IMQ_H
 +#define _IPT_IMQ_H
@@ -427,10 +415,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_IMQ.h
 +};
 +
 +#endif /* _IPT_IMQ_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_IMQ.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_IMQ.h
++++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h
 @@ -0,0 +1,8 @@
 +#ifndef _IP6T_IMQ_H
 +#define _IP6T_IMQ_H
@@ -440,10 +426,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_IMQ.h
 +};
 +
 +#endif /* _IP6T_IMQ_H */
-Index: linux-2.4.35.4/include/linux/skbuff.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/skbuff.h
-+++ linux-2.4.35.4/include/linux/skbuff.h
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
 @@ -93,6 +93,9 @@ struct nf_ct_info {
  	struct nf_conntrack *master;
  };
@@ -473,10 +457,8 @@ Index: linux-2.4.35.4/include/linux/skbuff.h
  };
  
  #ifdef __KERNEL__
-Index: linux-2.4.35.4/net/core/skbuff.c
-===================================================================
---- linux-2.4.35.4.orig/net/core/skbuff.c
-+++ linux-2.4.35.4/net/core/skbuff.c
+--- a/net/core/skbuff.c
++++ b/net/core/skbuff.c
 @@ -202,6 +202,10 @@ struct sk_buff *alloc_skb(unsigned int s
  	/* Set up other state */
  	skb->len = 0;
@@ -521,10 +503,8 @@ Index: linux-2.4.35.4/net/core/skbuff.c
  }
  
  /**
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
 @@ -171,6 +171,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; 
      dep_tristate '    DSCP target support' CONFIG_IP_NF_TARGET_DSCP $CONFIG_IP_NF_MANGLE
   
@@ -533,10 +513,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
    fi
    if [ "$CONFIG_IP_NF_CONNTRACK_MARK" != "n" ]; then
      dep_tristate '  CONNMARK target support' CONFIG_IP_NF_TARGET_CONNMARK $CONFIG_IP_NF_IPTABLES
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
 @@ -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_DSCP) += ipt_DSCP.o
@@ -545,10 +523,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
  obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
  obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
  obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_IMQ.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_IMQ.c
++++ b/net/ipv4/netfilter/ipt_IMQ.c
 @@ -0,0 +1,78 @@
 +/* This target marks packets to be enqueued to an imq device */
 +#include <linux/module.h>
@@ -628,10 +604,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_IMQ.c
 +module_init(init);
 +module_exit(fini);
 +MODULE_LICENSE("GPL");
-Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv6/netfilter/Config.in
+--- a/net/ipv6/netfilter/Config.in
++++ b/net/ipv6/netfilter/Config.in
 @@ -72,6 +72,7 @@ if [ "$CONFIG_IP6_NF_IPTABLES" != "n" ];
    if [ "$CONFIG_IP6_NF_MANGLE" != "n" ]; then
  #    dep_tristate '    TOS target support' CONFIG_IP6_NF_TARGET_TOS $CONFIG_IP_NF_MANGLE
@@ -640,10 +614,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in
    fi
    #dep_tristate '  LOG target support' CONFIG_IP6_NF_TARGET_LOG $CONFIG_IP6_NF_IPTABLES
  fi
-Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv6/netfilter/Makefile
+--- a/net/ipv6/netfilter/Makefile
++++ b/net/ipv6/netfilter/Makefile
 @@ -29,6 +29,7 @@ obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t
  obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
  obj-$(CONFIG_IP6_NF_MANGLE) += ip6table_mangle.o
@@ -652,10 +624,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile
  obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
  obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o
  obj-$(CONFIG_IP6_NF_MATCH_HL) += ip6t_hl.o
-Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_IMQ.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_IMQ.c
++++ b/net/ipv6/netfilter/ip6t_IMQ.c
 @@ -0,0 +1,78 @@
 +/* This target marks packets to be enqueued to an imq device */
 +#include <linux/module.h>
@@ -735,10 +705,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_IMQ.c
 +module_init(init);
 +module_exit(fini);
 +MODULE_LICENSE("GPL");
-Index: linux-2.4.35.4/net/sched/sch_generic.c
-===================================================================
---- linux-2.4.35.4.orig/net/sched/sch_generic.c
-+++ linux-2.4.35.4/net/sched/sch_generic.c
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
 @@ -29,6 +29,9 @@
  #include <linux/skbuff.h>
  #include <linux/rtnetlink.h>

target/linux/generic-2.4/patches/618-netfilter_multiport_backport.patch

@@ -1,7 +1,5 @@
-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
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_multiport.h
+--- a/include/linux/netfilter_ipv4/ipt_multiport.h
++++ b/include/linux/netfilter_ipv4/ipt_multiport.h
 @@ -11,11 +11,12 @@ enum ipt_multiport_flags
  
  #define IPT_MULTI_PORTS	15
@@ -17,10 +15,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_multiport.h
 +	u_int8_t invert;			/* Invert flag */
  };
  #endif /*_IPT_MULTIPORT_H*/
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_multiport.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/ipt_multiport.c
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_multiport.c
+--- a/net/ipv4/netfilter/ipt_multiport.c
++++ b/net/ipv4/netfilter/ipt_multiport.c
 @@ -1,5 +1,14 @@
  /* 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. */

target/linux/generic-2.4/patches/619-netfilter_classify.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CLASSIFY.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CLASSIFY.h
++++ b/include/linux/netfilter_ipv4/ipt_CLASSIFY.h
 @@ -0,0 +1,8 @@
 +#ifndef _IPT_CLASSIFY_H
 +#define _IPT_CLASSIFY_H
@@ -11,11 +9,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CLASSIFY.h
 +};
 +
 +#endif /*_IPT_CLASSIFY_H */
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
-@@ -172,6 +172,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; 
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
+@@ -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 '    MARK target support' CONFIG_IP_NF_TARGET_MARK $CONFIG_IP_NF_MANGLE
@@ -23,10 +19,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
      dep_tristate '    IMQ target support' CONFIG_IP_NF_TARGET_IMQ $CONFIG_IP_NF_MANGLE
    fi
    if [ "$CONFIG_IP_NF_CONNTRACK_MARK" != "n" ]; then
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_CLASSIFY.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_CLASSIFY.c
++++ b/net/ipv4/netfilter/ipt_CLASSIFY.c
 @@ -0,0 +1,82 @@
 +/*
 + * This is a module which is used for setting the skb->priority field
@@ -110,11 +104,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_CLASSIFY.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
-@@ -134,6 +134,7 @@ obj-$(CONFIG_IP_NF_MATCH_LAYER7) += ipt_
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
+@@ -133,6 +133,7 @@ obj-$(CONFIG_IP_NF_MATCH_LAYER7) += ipt_
  
  # targets
  obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o

target/linux/generic-2.4/patches/620-netfilter_iprange.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
 @@ -2986,6 +2986,14 @@ CONFIG_IP_NF_MATCH_TOS
    If you want to compile it as a module, say M here and read
    <file:Documentation/modules.txt>.  If unsure, say `N'.
@@ -17,10 +15,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help
  Condition variable match support
  CONFIG_IP_NF_MATCH_CONDITION
    This option allows you to match firewall rules against condition
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_iprange.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_iprange.h
++++ b/include/linux/netfilter_ipv4/ipt_iprange.h
 @@ -0,0 +1,23 @@
 +#ifndef _IPT_IPRANGE_H
 +#define _IPT_IPRANGE_H
@@ -45,10 +41,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_iprange.h
 +};
 +
 +#endif /* _IPT_IPRANGE_H */
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
 @@ -27,6 +27,7 @@ tristate 'IP tables support (required fo
  if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; then
  # The simple matches.
@@ -57,10 +51,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
    dep_tristate '  quota match support' CONFIG_IP_NF_MATCH_QUOTA $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
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_iprange.c
++++ b/net/ipv4/netfilter/ipt_iprange.c
 @@ -0,0 +1,101 @@
 +/*
 + * iptables module to match IP address ranges
@@ -163,10 +155,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_iprange.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
 @@ -90,6 +90,7 @@ obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o
  # matches
  obj-$(CONFIG_IP_NF_MATCH_HELPER) += ipt_helper.o

target/linux/generic-2.4/patches/621-netfilter_random.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
 @@ -2914,6 +2914,15 @@ CONFIG_IP_NF_MATCH_MAC
    If you want to compile it as a module, say M here and read
    <file:Documentation/modules.txt>.  If unsure, say `N'.
@@ -41,10 +39,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help
  length match support
  CONFIG_IP6_NF_MATCH_LENGTH
    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
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_random.h
++++ b/include/linux/netfilter_ipv4/ipt_random.h
 @@ -0,0 +1,11 @@
 +#ifndef _IPT_RAND_H
 +#define _IPT_RAND_H
@@ -57,10 +53,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_random.h
 +};
 +
 +#endif /*_IPT_RAND_H*/
-Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_random.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_random.h
++++ b/include/linux/netfilter_ipv6/ip6t_random.h
 @@ -0,0 +1,11 @@
 +#ifndef _IP6T_RAND_H
 +#define _IP6T_RAND_H
@@ -73,10 +67,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_random.h
 +};
 +
 +#endif /*_IP6T_RAND_H*/
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
 @@ -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 '  Multiple port match support' CONFIG_IP_NF_MATCH_MULTIPORT $CONFIG_IP_NF_IPTABLES
@@ -85,10 +77,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
    dep_tristate '  condition match support' CONFIG_IP_NF_MATCH_CONDITION $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
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_random.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_random.c
++++ b/net/ipv4/netfilter/ipt_random.c
 @@ -0,0 +1,96 @@
 +/*
 +  This is a module which is used for a "random" match support.
@@ -186,12 +176,10 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_random.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
-@@ -115,6 +115,8 @@ obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos
- obj-$(CONFIG_IP_NF_MATCH_TIME) += ipt_time.o
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
+@@ -114,6 +114,8 @@ obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_o
+ obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o
  obj-$(CONFIG_IP_NF_MATCH_CONDITION) += ipt_condition.o
  
 +obj-$(CONFIG_IP_NF_MATCH_RANDOM) += ipt_random.o
@@ -199,10 +187,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_ECN) += ipt_ecn.o
-Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv6/netfilter/Config.in
+--- a/net/ipv6/netfilter/Config.in
++++ b/net/ipv6/netfilter/Config.in
 @@ -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 '  condition match support' CONFIG_IP6_NF_MATCH_CONDITION $CONFIG_IP6_NF_IPTABLES
@@ -211,10 +197,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in
    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
      dep_tristate '  Routing header match support (EXPERIMENTAL)' CONFIG_IP6_NF_MATCH_RT $CONFIG_IP6_NF_IPTABLES
    fi
-Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_random.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_random.c
++++ b/net/ipv6/netfilter/ip6t_random.c
 @@ -0,0 +1,97 @@
 +/*
 +  This is a module which is used for a "random" match support.
@@ -313,10 +297,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_random.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv6/netfilter/Makefile
+--- a/net/ipv6/netfilter/Makefile
++++ b/net/ipv6/netfilter/Makefile
 @@ -32,6 +32,7 @@ obj-$(CONFIG_IP6_NF_TARGET_MARK) += ip6t
  obj-$(CONFIG_IP6_NF_TARGET_IMQ) += ip6t_IMQ.o
  obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o

target/linux/generic-2.4/patches/622-tc_esfq.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
 @@ -11153,6 +11153,24 @@ CONFIG_NET_SCH_HFSC
    whenever you want).  If you want to compile it as a module, say M
    here and read <file:Documentation/modules.txt>.
@@ -27,10 +25,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help
  CSZ packet scheduler
  CONFIG_NET_SCH_CSZ
    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
-===================================================================
---- linux-2.4.35.4.orig/include/linux/pkt_sched.h
-+++ linux-2.4.35.4/include/linux/pkt_sched.h
+--- a/include/linux/pkt_sched.h
++++ b/include/linux/pkt_sched.h
 @@ -173,8 +173,36 @@ struct tc_sfq_qopt
   *
   *	The only reason for this is efficiency, it is possible
@@ -68,10 +64,8 @@ Index: linux-2.4.35.4/include/linux/pkt_sched.h
  /* RED section */
  
  enum
-Index: linux-2.4.35.4/net/sched/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/sched/Config.in
-+++ linux-2.4.35.4/net/sched/Config.in
+--- a/net/sched/Config.in
++++ b/net/sched/Config.in
 @@ -12,6 +12,7 @@ fi
  tristate '  The simplest PRIO pseudoscheduler' CONFIG_NET_SCH_PRIO
  tristate '  RED queue' CONFIG_NET_SCH_RED
@@ -80,10 +74,8 @@ Index: linux-2.4.35.4/net/sched/Config.in
  tristate '  TEQL queue' CONFIG_NET_SCH_TEQL
  tristate '  TBF queue' CONFIG_NET_SCH_TBF
  tristate '  GRED queue' CONFIG_NET_SCH_GRED
-Index: linux-2.4.35.4/net/sched/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/sched/Makefile
-+++ linux-2.4.35.4/net/sched/Makefile
+--- a/net/sched/Makefile
++++ b/net/sched/Makefile
 @@ -19,6 +19,7 @@ obj-$(CONFIG_NET_SCH_HPFQ)	+= sch_hpfq.o
  obj-$(CONFIG_NET_SCH_HFSC)	+= sch_hfsc.o
  obj-$(CONFIG_NET_SCH_HTB)	+= sch_htb.o
@@ -92,10 +84,8 @@ Index: linux-2.4.35.4/net/sched/Makefile
  obj-$(CONFIG_NET_SCH_RED)	+= sch_red.o
  obj-$(CONFIG_NET_SCH_TBF)	+= sch_tbf.o
  obj-$(CONFIG_NET_SCH_PRIO)	+= sch_prio.o
-Index: linux-2.4.35.4/net/sched/sch_esfq.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/sched/sch_esfq.c
++++ b/net/sched/sch_esfq.c
 @@ -0,0 +1,649 @@
 +/*
 + * net/sched/sch_esfq.c	Extended Stochastic Fairness Queueing discipline.

target/linux/generic-2.4/patches/623-netfilter_ipset_porthash.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h
++++ b/include/linux/netfilter_ipv4/ip_set_ipporthash.h
 @@ -0,0 +1,34 @@
 +#ifndef __IP_SET_IPPORTHASH_H
 +#define __IP_SET_IPPORTHASH_H

target/linux/generic-2.4/patches/624-netfilter_ip6t_reject.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_REJECT.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_REJECT.c
++++ b/net/ipv6/netfilter/ip6t_REJECT.c
 @@ -0,0 +1,301 @@
 +/*
 + * This is a module which is used for rejecting packets.
@@ -304,10 +302,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_REJECT.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_REJECT.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/netfilter_ipv6/ip6t_REJECT.h
-+++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_REJECT.h
+--- a/include/linux/netfilter_ipv6/ip6t_REJECT.h
++++ b/include/linux/netfilter_ipv6/ip6t_REJECT.h
 @@ -2,15 +2,17 @@
  #define _IP6T_REJECT_H
  
@@ -332,10 +328,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_REJECT.h
  
 -#endif /*_IPT_REJECT_H*/
 +#endif /*_IP6T_REJECT_H*/
-Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv6/netfilter/Makefile
+--- a/net/ipv6/netfilter/Makefile
++++ b/net/ipv6/netfilter/Makefile
 @@ -34,5 +34,7 @@ obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.
  obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o
  obj-$(CONFIG_IP6_NF_MATCH_RANDOM) += ip6t_random.o
@@ -344,10 +338,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile
 +
  
  include $(TOPDIR)/Rules.make
-Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv6/netfilter/Config.in
+--- a/net/ipv6/netfilter/Config.in
++++ b/net/ipv6/netfilter/Config.in
 @@ -61,6 +61,9 @@ if [ "$CONFIG_IP6_NF_IPTABLES" != "n" ];
    if [ "$CONFIG_IP6_NF_FILTER" != "n" ]; then
      dep_tristate '    LOG target support' CONFIG_IP6_NF_TARGET_LOG $CONFIG_IP6_NF_FILTER

target/linux/generic-2.4/patches/700-multiple_default_gateways.patch

@@ -1,7 +1,5 @@
-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
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat.h
+--- a/include/linux/netfilter_ipv4/ip_nat.h
++++ b/include/linux/netfilter_ipv4/ip_nat.h
 @@ -121,5 +121,13 @@ extern int ip_nat_used_tuple(const struc
  extern u_int16_t ip_nat_cheat_check(u_int32_t oldvalinv,
  				    u_int32_t newval,
@@ -16,10 +14,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat.h
 +
  #endif /*__KERNEL__*/
  #endif
-Index: linux-2.4.35.4/include/linux/rtnetlink.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/rtnetlink.h
-+++ linux-2.4.35.4/include/linux/rtnetlink.h
+--- a/include/linux/rtnetlink.h
++++ b/include/linux/rtnetlink.h
 @@ -234,6 +234,8 @@ struct rtnexthop
  #define RTNH_F_DEAD		1	/* Nexthop is dead (used by multipath)	*/
  #define RTNH_F_PERVASIVE	2	/* Do recursive gateway lookup	*/
@@ -29,10 +25,8 @@ Index: linux-2.4.35.4/include/linux/rtnetlink.h
  
  /* Macros to handle hexthops */
  
-Index: linux-2.4.35.4/include/net/ip_fib.h
-===================================================================
---- linux-2.4.35.4.orig/include/net/ip_fib.h
-+++ linux-2.4.35.4/include/net/ip_fib.h
+--- a/include/net/ip_fib.h
++++ b/include/net/ip_fib.h
 @@ -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)
@@ -58,10 +52,8 @@ Index: linux-2.4.35.4/include/net/ip_fib.h
 +extern rwlock_t fib_nhflags_lock;
  
  #endif  /* _NET_FIB_H */
-Index: linux-2.4.35.4/include/net/route.h
-===================================================================
---- linux-2.4.35.4.orig/include/net/route.h
-+++ linux-2.4.35.4/include/net/route.h
+--- a/include/net/route.h
++++ b/include/net/route.h
 @@ -49,6 +49,8 @@ struct rt_key
  {
  	__u32			dst;
@@ -95,10 +87,8 @@ Index: linux-2.4.35.4/include/net/route.h
  static inline void ip_rt_put(struct rtable * rt)
  {
  	if (rt)
-Index: linux-2.4.35.4/net/ipv4/fib_frontend.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/fib_frontend.c
-+++ linux-2.4.35.4/net/ipv4/fib_frontend.c
+--- a/net/ipv4/fib_frontend.c
++++ b/net/ipv4/fib_frontend.c
 @@ -54,6 +54,8 @@
  struct fib_table *local_table;
  struct fib_table *main_table;
@@ -197,10 +187,8 @@ Index: linux-2.4.35.4/net/ipv4/fib_frontend.c
  		rt_cache_flush(-1);
  		break;
  	case NETDEV_DOWN:
-Index: linux-2.4.35.4/net/ipv4/fib_hash.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/fib_hash.c
-+++ linux-2.4.35.4/net/ipv4/fib_hash.c
+--- a/net/ipv4/fib_hash.c
++++ b/net/ipv4/fib_hash.c
 @@ -71,6 +71,7 @@ struct fib_node
  	struct fib_info		*fn_info;
  #define FIB_INFO(f)	((f)->fn_info)
@@ -414,10 +402,8 @@ Index: linux-2.4.35.4/net/ipv4/fib_hash.c
  	new_f->fn_key = key;
  #ifdef CONFIG_IP_ROUTE_TOS
  	new_f->fn_tos = tos;
-Index: linux-2.4.35.4/net/ipv4/fib_rules.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/fib_rules.c
-+++ linux-2.4.35.4/net/ipv4/fib_rules.c
+--- a/net/ipv4/fib_rules.c
++++ b/net/ipv4/fib_rules.c
 @@ -307,6 +307,11 @@ static void fib_rules_attach(struct net_
  	}
  }
@@ -443,10 +429,8 @@ Index: linux-2.4.35.4/net/ipv4/fib_rules.c
  		struct fib_table *tb;
  		if ((tb = fib_get_table(res->r->r_table)) != NULL)
  			tb->tb_select_default(tb, key, res);
-Index: linux-2.4.35.4/net/ipv4/fib_semantics.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/fib_semantics.c
-+++ linux-2.4.35.4/net/ipv4/fib_semantics.c
+--- a/net/ipv4/fib_semantics.c
++++ b/net/ipv4/fib_semantics.c
 @@ -48,6 +48,7 @@
  static struct fib_info 	*fib_info_list;
  static rwlock_t fib_info_lock = RW_LOCK_UNLOCKED;
@@ -802,10 +786,8 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c
  	spin_unlock_bh(&fib_multipath_lock);
  }
  #endif
-Index: linux-2.4.35.4/net/ipv4/ip_nat_dumb.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/ip_nat_dumb.c
-+++ linux-2.4.35.4/net/ipv4/ip_nat_dumb.c
+--- a/net/ipv4/ip_nat_dumb.c
++++ b/net/ipv4/ip_nat_dumb.c
 @@ -124,6 +124,7 @@ ip_do_nat(struct sk_buff *skb)
  					key.dst = ciph->saddr;
  					key.iif = skb->dev->ifindex;
@@ -814,10 +796,8 @@ Index: linux-2.4.35.4/net/ipv4/ip_nat_dumb.c
  #ifdef CONFIG_IP_ROUTE_TOS
  					key.tos = RT_TOS(ciph->tos);
  #endif
-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
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_fw_compat_masq.c
+--- a/net/ipv4/netfilter/ip_fw_compat_masq.c
++++ b/net/ipv4/netfilter/ip_fw_compat_masq.c
 @@ -41,6 +41,10 @@ do_masquerade(struct sk_buff **pskb, con
  	enum ip_conntrack_info ctinfo;
  	struct ip_conntrack *ct;
@@ -895,10 +875,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_fw_compat_masq.c
  }
  
  void
-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
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c
+--- a/net/ipv4/netfilter/ip_nat_core.c
++++ b/net/ipv4/netfilter/ip_nat_core.c
 @@ -994,6 +994,60 @@ icmp_reply_translation(struct sk_buff *s
  	return NF_ACCEPT;
  }
@@ -960,10 +938,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c
  int __init ip_nat_init(void)
  {
  	size_t i;
-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
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_standalone.c
+--- a/net/ipv4/netfilter/ip_nat_standalone.c
++++ b/net/ipv4/netfilter/ip_nat_standalone.c
 @@ -245,6 +245,9 @@ ip_nat_local_fn(unsigned int hooknum,
  /* Before packet filtering, change destination */
  static struct nf_hook_ops ip_nat_in_ops
@@ -1000,10 +976,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_standalone.c
   cleanup_inops:
  	nf_unregister_hook(&ip_nat_in_ops);
   cleanup_nat:
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_MASQUERADE.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/ipt_MASQUERADE.c
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_MASQUERADE.c
+--- a/net/ipv4/netfilter/ipt_MASQUERADE.c
++++ b/net/ipv4/netfilter/ipt_MASQUERADE.c
 @@ -87,7 +87,8 @@ masquerade_target(struct sk_buff **pskb,
  	key.dst = (*pskb)->nh.iph->daddr;
  	key.src = 0; /* Unknown: that's what we're trying to establish */
@@ -1028,10 +1002,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_MASQUERADE.c
  
  	newsrc = rt->rt_src;
  	DEBUGP("newsrc = %u.%u.%u.%u\n", NIPQUAD(newsrc));
-Index: linux-2.4.35.4/net/ipv4/route.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/route.c
-+++ linux-2.4.35.4/net/ipv4/route.c
+--- a/net/ipv4/route.c
++++ b/net/ipv4/route.c
 @@ -919,6 +919,7 @@ void ip_rt_redirect(u32 old_gw, u32 dadd
  
  				/* Gateway is different ... */
@@ -1300,10 +1272,8 @@ Index: linux-2.4.35.4/net/ipv4/route.c
  #ifdef CONFIG_IP_ROUTE_FWMARK
  		    rth->key.fwmark == key->fwmark &&
  #endif
-Index: linux-2.4.35.4/net/netsyms.c
-===================================================================
---- linux-2.4.35.4.orig/net/netsyms.c
-+++ linux-2.4.35.4/net/netsyms.c
+--- a/net/netsyms.c
++++ b/net/netsyms.c
 @@ -260,6 +260,7 @@ EXPORT_SYMBOL(inet_register_protosw);
  EXPORT_SYMBOL(inet_unregister_protosw);
  EXPORT_SYMBOL(ip_route_output_key);

target/linux/generic-2.4/patches/801-usb_serial_endpoint_size.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/drivers/usb/serial/usbserial.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/usb/serial/usbserial.c
-+++ linux-2.4.35.4/drivers/usb/serial/usbserial.c
+--- a/drivers/usb/serial/usbserial.c
++++ b/drivers/usb/serial/usbserial.c
 @@ -331,6 +331,7 @@ static void generic_shutdown		(struct us
  #ifdef CONFIG_USB_SERIAL_GENERIC
  static __u16	vendor	= 0x05f9;

target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch

@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/drivers/usb/serial/usbserial.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/usb/serial/usbserial.c
-+++ linux-2.4.35.4/drivers/usb/serial/usbserial.c
+--- a/drivers/usb/serial/usbserial.c
++++ b/drivers/usb/serial/usbserial.c
 @@ -333,7 +333,7 @@ static __u16	vendor	= 0x05f9;
  static __u16	product	= 0xffff;
  static int	maxSize = 0;

target/linux/generic-2.4/patches/803-mii_ioctl.patch

@@ -1,6 +1,5 @@
-diff -urN linux-2.4.35.4/include/linux/mii.h linux-2.4.35.4.new/include/linux/mii.h
---- linux-2.4.35.4/include/linux/mii.h	2007-11-17 18:23:15.000000000 +0100
-+++ linux-2.4.35.4.new/include/linux/mii.h	2009-03-15 17:32:45.000000000 +0100
+--- a/include/linux/mii.h
++++ b/include/linux/mii.h
 @@ -9,7 +9,6 @@
  #define __LINUX_MII_H__
  
@@ -29,7 +28,7 @@ diff -urN linux-2.4.35.4/include/linux/mii.h linux-2.4.35.4.new/include/linux/mi
  
  struct mii_if_info {
  	int phy_id;
-@@ -119,9 +131,6 @@
+@@ -119,9 +131,6 @@ struct mii_if_info {
  	void (*mdio_write) (struct net_device *dev, int phy_id, int location, int val);
  };
  
@@ -39,7 +38,7 @@ diff -urN linux-2.4.35.4/include/linux/mii.h linux-2.4.35.4.new/include/linux/mi
  extern int mii_link_ok (struct mii_if_info *mii);
  extern int mii_nway_restart (struct mii_if_info *mii);
  extern int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd);
-@@ -136,15 +145,6 @@
+@@ -136,15 +145,6 @@ extern int generic_mii_ioctl(struct mii_
  
  
  
@@ -55,7 +54,7 @@ diff -urN linux-2.4.35.4/include/linux/mii.h linux-2.4.35.4.new/include/linux/mi
  static inline struct mii_ioctl_data *if_mii(struct ifreq *rq)
  {
  	return (struct mii_ioctl_data *) &rq->ifr_ifru;
-@@ -202,5 +202,5 @@
+@@ -202,5 +202,5 @@ static inline unsigned int mii_duplex (u
  	return 0;
  }