qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-25 11:55:30 +02:00
Code

refresh generic 2.6.25 patches to match upstream style

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11296 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
kaloz 2008-05-30 16:30:51 +00:00
parent 1854938e6e
commit 48983d35d7
59 changed files with 2003 additions and 3309 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/fs/Kconfig
===================================================================
--- linux-2.6.25.4.orig/fs/Kconfig
+++ linux-2.6.25.4/fs/Kconfig
@@ -1367,6 +1367,71 @@ config CRAMFS
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1367,6 +1367,71 @@
If unsure, say N.
@ -74,11 +72,9 @@ Index: linux-2.6.25.4/fs/Kconfig
config VXFS_FS
tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
depends on BLOCK
Index: linux-2.6.25.4/fs/Makefile
===================================================================
--- linux-2.6.25.4.orig/fs/Makefile
+++ linux-2.6.25.4/fs/Makefile
@@ -73,6 +73,7 @@ obj-$(CONFIG_JBD) += jbd/
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -73,6 +73,7 @@
obj-$(CONFIG_JBD2) += jbd2/
obj-$(CONFIG_EXT2_FS) += ext2/
obj-$(CONFIG_CRAMFS) += cramfs/
@ -86,10 +82,8 @@ Index: linux-2.6.25.4/fs/Makefile
obj-y += ramfs/
obj-$(CONFIG_HUGETLBFS) += hugetlbfs/
obj-$(CONFIG_CODA_FS) += coda/
Index: linux-2.6.25.4/fs/squashfs/inode.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/fs/squashfs/inode.c
+++ b/fs/squashfs/inode.c
@@ -0,0 +1,2122 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@ -2213,10 +2207,8 @@ Index: linux-2.6.25.4/fs/squashfs/inode.c
+MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem");
+MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>");
+MODULE_LICENSE("GPL");
Index: linux-2.6.25.4/fs/squashfs/Makefile
===================================================================
--- /dev/null
+++ linux-2.6.25.4/fs/squashfs/Makefile
+++ b/fs/squashfs/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the linux squashfs routines.
@ -2225,10 +2217,8 @@ Index: linux-2.6.25.4/fs/squashfs/Makefile
+obj-$(CONFIG_SQUASHFS) += squashfs.o
+squashfs-y += inode.o
+squashfs-y += squashfs2_0.o
Index: linux-2.6.25.4/fs/squashfs/squashfs2_0.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/fs/squashfs/squashfs2_0.c
+++ b/fs/squashfs/squashfs2_0.c
@@ -0,0 +1,758 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@ -2988,10 +2978,8 @@ Index: linux-2.6.25.4/fs/squashfs/squashfs2_0.c
+
+ return 1;
+}
Index: linux-2.6.25.4/fs/squashfs/squashfs.h
===================================================================
--- /dev/null
+++ linux-2.6.25.4/fs/squashfs/squashfs.h
+++ b/fs/squashfs/squashfs.h
@@ -0,0 +1,86 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@ -3079,10 +3067,8 @@ Index: linux-2.6.25.4/fs/squashfs/squashfs.h
+ return 0;
+}
+#endif
Index: linux-2.6.25.4/include/linux/magic.h
===================================================================
--- linux-2.6.25.4.orig/include/linux/magic.h
+++ linux-2.6.25.4/include/linux/magic.h
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -35,6 +35,9 @@
#define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs"
#define REISER2FS_JR_SUPER_MAGIC_STRING "ReIsEr3Fs"
@ -3093,10 +3079,8 @@ Index: linux-2.6.25.4/include/linux/magic.h
#define SMB_SUPER_MAGIC 0x517B
#define USBDEVICE_SUPER_MAGIC 0x9fa2
#define CGROUP_SUPER_MAGIC 0x27e0eb
Index: linux-2.6.25.4/include/linux/squashfs_fs.h
===================================================================
--- /dev/null
+++ linux-2.6.25.4/include/linux/squashfs_fs.h
+++ b/include/linux/squashfs_fs.h
@@ -0,0 +1,911 @@
+#ifndef SQUASHFS_FS
+#define SQUASHFS_FS
@ -4009,10 +3993,8 @@ Index: linux-2.6.25.4/include/linux/squashfs_fs.h
+
+#endif
+#endif
Index: linux-2.6.25.4/include/linux/squashfs_fs_i.h
===================================================================
--- /dev/null
+++ linux-2.6.25.4/include/linux/squashfs_fs_i.h
+++ b/include/linux/squashfs_fs_i.h
@@ -0,0 +1,45 @@
+#ifndef SQUASHFS_FS_I
+#define SQUASHFS_FS_I
@ -4059,10 +4041,8 @@ Index: linux-2.6.25.4/include/linux/squashfs_fs_i.h
+ struct inode vfs_inode;
+};
+#endif
Index: linux-2.6.25.4/include/linux/squashfs_fs_sb.h
===================================================================
--- /dev/null
+++ linux-2.6.25.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
@ -4138,10 +4118,8 @@ Index: linux-2.6.25.4/include/linux/squashfs_fs_sb.h
+ int (*read_fragment_index_table)(struct super_block *s);
+};
+#endif
Index: linux-2.6.25.4/init/do_mounts_rd.c
===================================================================
--- linux-2.6.25.4.orig/init/do_mounts_rd.c
+++ linux-2.6.25.4/init/do_mounts_rd.c
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@ -5,6 +5,7 @@
#include <linux/ext2_fs.h>
#include <linux/romfs_fs.h>
@ -4150,7 +4128,7 @@ Index: linux-2.6.25.4/init/do_mounts_rd.c
#include <linux/initrd.h>
#include <linux/string.h>
@@ -39,6 +40,7 @@ static int __init crd_load(int in_fd, in
@@ -39,6 +40,7 @@
* numbers could not be found.
*
* We currently check for the following magic numbers:
@ -4158,7 +4136,7 @@ Index: linux-2.6.25.4/init/do_mounts_rd.c
* minix
* ext2
* romfs
@@ -53,6 +55,7 @@ identify_ramdisk_image(int fd, int start
@@ -53,6 +55,7 @@
struct ext2_super_block *ext2sb;
struct romfs_super_block *romfsb;
struct cramfs_super *cramfsb;
@ -4166,7 +4144,7 @@ Index: linux-2.6.25.4/init/do_mounts_rd.c
int nblocks = -1;
unsigned char *buf;
@@ -64,6 +67,7 @@ identify_ramdisk_image(int fd, int start
@@ -64,6 +67,7 @@
ext2sb = (struct ext2_super_block *) buf;
romfsb = (struct romfs_super_block *) buf;
cramfsb = (struct cramfs_super *) buf;
@ -4174,7 +4152,7 @@ Index: linux-2.6.25.4/init/do_mounts_rd.c
memset(buf, 0xe5, size);
/*
@@ -101,6 +105,15 @@ identify_ramdisk_image(int fd, int start
@@ -101,6 +105,15 @@
goto done;
}

16
target/linux/generic-2.6/patches-2.6.25/002-lzma_decompress.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.25.4/include/linux/LzmaDecode.h
===================================================================
--- /dev/null
+++ linux-2.6.25.4/include/linux/LzmaDecode.h
+++ b/include/linux/LzmaDecode.h
@@ -0,0 +1,100 @@
+/*
+ LzmaDecode.h
@ -103,10 +101,8 @@ Index: linux-2.6.25.4/include/linux/LzmaDecode.h
+ UInt32 *outSizeProcessed);
+
+#endif
Index: linux-2.6.25.4/lib/LzmaDecode.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/lib/LzmaDecode.c
+++ b/lib/LzmaDecode.c
@@ -0,0 +1,663 @@
+/*
+ LzmaDecode.c
@ -771,11 +767,9 @@ Index: linux-2.6.25.4/lib/LzmaDecode.c
+ *outSizeProcessed = nowPos;
+ return LZMA_RESULT_OK;
+}
Index: linux-2.6.25.4/lib/Makefile
===================================================================
--- linux-2.6.25.4.orig/lib/Makefile
+++ linux-2.6.25.4/lib/Makefile
@@ -14,7 +14,7 @@ lib-$(CONFIG_SMP) += cpumask.o
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -14,7 +14,7 @@
lib-y += kobject.o kref.o klist.o
obj-y += div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \

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

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

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/Makefile
===================================================================
--- linux-2.6.25.4.orig/Makefile
+++ linux-2.6.25.4/Makefile
@@ -533,6 +533,9 @@ endif
--- a/Makefile
+++ b/Makefile
@@ -533,6 +533,9 @@
NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
CHECKFLAGS += $(NOSTDINC_FLAGS)

8
target/linux/generic-2.6/patches-2.6.25/005-squashfs_fix.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.25.4/fs/squashfs/inode.c
===================================================================
--- linux-2.6.25.4.orig/fs/squashfs/inode.c
+++ linux-2.6.25.4/fs/squashfs/inode.c
--- a/fs/squashfs/inode.c
+++ b/fs/squashfs/inode.c
@@ -33,6 +33,7 @@
#include <linux/fs.h>
#include <linux/smp_lock.h>
@ -10,7 +8,7 @@ Index: linux-2.6.25.4/fs/squashfs/inode.c
#include <linux/squashfs_fs_sb.h>
#include <linux/squashfs_fs_i.h>
#include <linux/buffer_head.h>
@@ -2125,7 +2126,7 @@ static void squashfs_destroy_inode(struc
@@ -2125,7 +2126,7 @@
}

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/include/asm-mips/system.h
===================================================================
--- linux-2.6.25.4.orig/include/asm-mips/system.h
+++ linux-2.6.25.4/include/asm-mips/system.h
@@ -185,7 +185,7 @@ extern __u64 __xchg_u64_unsupported_on_3
--- a/include/asm-mips/system.h
+++ b/include/asm-mips/system.h
@@ -185,7 +185,7 @@
if something tries to do an invalid xchg(). */
extern void __xchg_called_with_bad_pointer(void);

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

@ -1,7 +1,5 @@
Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0002.c
===================================================================
--- linux-2.6.25.4.orig/drivers/mtd/chips/cfi_cmdset_0002.c
+++ linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0002.c
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -51,6 +51,7 @@
#define SST49LF040B 0x0050
#define SST49LF008A 0x005a
@ -10,7 +8,7 @@ Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0002.c
static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
@@ -298,12 +299,19 @@ struct mtd_info *cfi_cmdset_0002(struct
@@ -298,12 +299,19 @@
if (extp->MajorVersion != '1' ||
(extp->MinorVersion < '0' || extp->MinorVersion > '4')) {

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c
===================================================================
--- linux-2.6.25.4.orig/drivers/mtd/chips/cfi_cmdset_0001.c
+++ linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -1008,7 +1008,7 @@ static void __xipram xip_enable(struct m
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -1008,7 +1008,7 @@
static int __xipram xip_wait_for_operation(
struct map_info *map, struct flchip *chip,
@ -11,7 +9,7 @@ Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c
{
struct cfi_private *cfi = map->fldrv_priv;
struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
@@ -1017,7 +1017,7 @@ static int __xipram xip_wait_for_operati
@@ -1017,7 +1017,7 @@
flstate_t oldstate, newstate;
start = xip_currtime();
@ -20,7 +18,7 @@ Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c
if (usec == 0)
usec = 500000;
done = 0;
@@ -1127,8 +1127,8 @@ static int __xipram xip_wait_for_operati
@@ -1127,8 +1127,8 @@
#define XIP_INVAL_CACHED_RANGE(map, from, size) \
INVALIDATE_CACHED_RANGE(map, from, size)
@ -31,7 +29,7 @@ Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c
#else
@@ -1140,65 +1140,65 @@ static int __xipram xip_wait_for_operati
@@ -1140,65 +1140,65 @@
static int inval_cache_and_wait_for_operation(
struct map_info *map, struct flchip *chip,
unsigned long cmd_adr, unsigned long inval_adr, int inval_len,
@ -132,7 +130,7 @@ Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c
/* Done and happy. */
chip->state = FL_STATUS;
return 0;
@@ -1207,7 +1207,8 @@ static int inval_cache_and_wait_for_oper
@@ -1207,7 +1207,8 @@
#endif
#define WAIT_TIMEOUT(map, chip, adr, udelay) \
@ -142,7 +140,7 @@ Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c
static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len)
@@ -1438,7 +1439,7 @@ static int __xipram do_write_oneword(str
@@ -1438,7 +1439,7 @@
ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
adr, map_bankwidth(map),
@ -151,7 +149,7 @@ Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c
if (ret) {
xip_enable(map, chip, adr);
printk(KERN_ERR "%s: word write error (status timeout)\n", map->name);
@@ -1678,7 +1679,7 @@ static int __xipram do_write_buffer(stru
@@ -1678,7 +1679,7 @@
ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,
initial_adr, initial_len,
@ -160,7 +158,7 @@ Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c
if (ret) {
map_write(map, CMD(0x70), cmd_adr);
chip->state = FL_STATUS;
@@ -1813,7 +1814,7 @@ static int __xipram do_erase_oneblock(st
@@ -1813,7 +1814,7 @@
ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
adr, len,

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

@ -1,16 +1,12 @@
Index: linux-2.6.25.4/fs/squashfs/Makefile
===================================================================
--- linux-2.6.25.4.orig/fs/squashfs/Makefile
+++ linux-2.6.25.4/fs/squashfs/Makefile
--- a/fs/squashfs/Makefile
+++ b/fs/squashfs/Makefile
@@ -4,4 +4,3 @@
obj-$(CONFIG_SQUASHFS) += squashfs.o
squashfs-y += inode.o
-squashfs-y += squashfs2_0.o
Index: linux-2.6.25.4/fs/squashfs/squashfs.h
===================================================================
--- linux-2.6.25.4.orig/fs/squashfs/squashfs.h
+++ linux-2.6.25.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

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

@ -1,7 +1,5 @@
Index: linux-2.6.25.4/arch/mips/kernel/head.S
===================================================================
--- linux-2.6.25.4.orig/arch/mips/kernel/head.S
+++ linux-2.6.25.4/arch/mips/kernel/head.S
--- a/arch/mips/kernel/head.S
+++ b/arch/mips/kernel/head.S
@@ -120,6 +120,8 @@
#endif
.endm

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

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

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/mtd/Kconfig
===================================================================
--- linux-2.6.25.4.orig/drivers/mtd/Kconfig
+++ linux-2.6.25.4/drivers/mtd/Kconfig
@@ -47,6 +47,16 @@ config MTD_PARTITIONS
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -47,6 +47,16 @@
devices. Partitioning on NFTL 'devices' is a different - that's the
'normal' form of partitioning used on a block device.
@ -19,10 +17,8 @@ Index: linux-2.6.25.4/drivers/mtd/Kconfig
config MTD_REDBOOT_PARTS
tristate "RedBoot partition table parsing"
depends on MTD_PARTITIONS
Index: linux-2.6.25.4/drivers/mtd/mtdpart.c
===================================================================
--- linux-2.6.25.4.orig/drivers/mtd/mtdpart.c
+++ linux-2.6.25.4/drivers/mtd/mtdpart.c
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -20,6 +20,8 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
@ -32,7 +28,7 @@ Index: linux-2.6.25.4/drivers/mtd/mtdpart.c
/* Our partition linked list */
static LIST_HEAD(mtd_partitions);
@@ -39,7 +41,7 @@ struct mtd_part {
@@ -39,7 +41,7 @@
* the pointer to that structure with this macro.
*/
#define PART(x) ((struct mtd_part *)(x))
@ -41,7 +37,7 @@ Index: linux-2.6.25.4/drivers/mtd/mtdpart.c
/*
* MTD methods which simply translate the effective address and pass through
@@ -322,6 +324,316 @@ int del_mtd_partitions(struct mtd_info *
@@ -322,6 +324,316 @@
return 0;
}
@ -358,7 +354,7 @@ Index: linux-2.6.25.4/drivers/mtd/mtdpart.c
/*
* This function, given a master MTD object and a partition table, creates
* and registers slave MTD objects which are bound to the master according to
@@ -334,171 +646,31 @@ int add_mtd_partitions(struct mtd_info *
@@ -334,171 +646,31 @@
int nbparts)
{
struct mtd_part *slave;
@ -551,7 +547,7 @@ Index: linux-2.6.25.4/drivers/mtd/mtdpart.c
}
}
@@ -574,6 +746,32 @@ int parse_mtd_partitions(struct mtd_info
@@ -574,6 +746,32 @@
return ret;
}
@ -584,11 +580,9 @@ Index: linux-2.6.25.4/drivers/mtd/mtdpart.c
+EXPORT_SYMBOL_GPL(refresh_mtd_partitions);
EXPORT_SYMBOL_GPL(register_mtd_parser);
EXPORT_SYMBOL_GPL(deregister_mtd_parser);
Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c
===================================================================
--- linux-2.6.25.4.orig/drivers/mtd/devices/block2mtd.c
+++ linux-2.6.25.4/drivers/mtd/devices/block2mtd.c
@@ -34,6 +34,8 @@ struct block2mtd_dev {
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -34,6 +34,8 @@
struct block_device *blkdev;
struct mtd_info mtd;
struct mutex write_mutex;
@ -597,7 +591,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c
};
@@ -86,6 +88,12 @@ static int block2mtd_erase(struct mtd_in
@@ -86,6 +88,12 @@
size_t len = instr->len;
int err;
@ -610,7 +604,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c
instr->state = MTD_ERASING;
mutex_lock(&dev->write_mutex);
err = _block2mtd_erase(dev, from, len);
@@ -98,6 +106,10 @@ static int block2mtd_erase(struct mtd_in
@@ -98,6 +106,10 @@
instr->state = MTD_ERASE_DONE;
mtd_erase_callback(instr);
@ -621,7 +615,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c
return err;
}
@@ -109,10 +121,14 @@ static int block2mtd_read(struct mtd_inf
@@ -109,10 +121,14 @@
struct page *page;
int index = from >> PAGE_SHIFT;
int offset = from & (PAGE_SIZE-1);
@ -639,7 +633,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c
if (from + len > mtd->size)
len = mtd->size - from;
@@ -127,10 +143,14 @@ static int block2mtd_read(struct mtd_inf
@@ -127,10 +143,14 @@
len = len - cpylen;
page = page_read(dev->blkdev->bd_inode->i_mapping, index);
@ -658,7 +652,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c
memcpy(buf, page_address(page) + offset, cpylen);
page_cache_release(page);
@@ -141,7 +161,10 @@ static int block2mtd_read(struct mtd_inf
@@ -141,7 +161,10 @@
offset = 0;
index++;
}
@ -670,7 +664,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c
}
@@ -193,12 +216,22 @@ static int block2mtd_write(struct mtd_in
@@ -193,12 +216,22 @@
size_t *retlen, const u_char *buf)
{
struct block2mtd_dev *dev = mtd->priv;
@ -697,7 +691,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c
if (to + len > mtd->size)
len = mtd->size - to;
@@ -207,6 +240,9 @@ static int block2mtd_write(struct mtd_in
@@ -207,6 +240,9 @@
mutex_unlock(&dev->write_mutex);
if (err > 0)
err = 0;
@ -707,7 +701,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c
return err;
}
@@ -215,51 +251,29 @@ static int block2mtd_write(struct mtd_in
@@ -215,51 +251,29 @@
static void block2mtd_sync(struct mtd_info *mtd)
{
struct block2mtd_dev *dev = mtd->priv;
@ -767,7 +761,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c
if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
}
@@ -267,17 +281,96 @@ static struct block2mtd_dev *add_device(
@@ -267,17 +281,96 @@
#endif
if (IS_ERR(bdev)) {
@ -867,7 +861,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c
/* Setup the MTD structure */
/* make the name contain the block device in */
@@ -304,6 +397,7 @@ static struct block2mtd_dev *add_device(
@@ -304,6 +397,7 @@
dev->mtd.read = block2mtd_read;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;
@ -875,10 +869,8 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c
part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
part->name = dev->mtd.name;
Index: linux-2.6.25.4/drivers/mtd/mtdchar.c
===================================================================
--- linux-2.6.25.4.orig/drivers/mtd/mtdchar.c
+++ linux-2.6.25.4/drivers/mtd/mtdchar.c
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -17,6 +17,7 @@
#include <linux/mtd/mtd.h>
@ -887,7 +879,7 @@ Index: linux-2.6.25.4/drivers/mtd/mtdchar.c
#include <asm/uaccess.h>
@@ -756,6 +757,13 @@ static int mtd_ioctl(struct inode *inode
@@ -756,6 +757,13 @@
file->f_pos = 0;
break;
}
@ -901,11 +893,9 @@ Index: linux-2.6.25.4/drivers/mtd/mtdchar.c
default:
ret = -ENOTTY;
Index: linux-2.6.25.4/include/linux/mtd/mtd.h
===================================================================
--- linux-2.6.25.4.orig/include/linux/mtd/mtd.h
+++ linux-2.6.25.4/include/linux/mtd/mtd.h
@@ -98,6 +98,7 @@ struct mtd_oob_ops {
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -98,6 +98,7 @@
uint8_t *oobbuf;
};
@ -913,7 +903,7 @@ Index: linux-2.6.25.4/include/linux/mtd/mtd.h
struct mtd_info {
u_char type;
u_int32_t flags;
@@ -211,6 +212,9 @@ struct mtd_info {
@@ -211,6 +212,9 @@
struct module *owner;
int usecount;
@ -923,10 +913,8 @@ Index: linux-2.6.25.4/include/linux/mtd/mtd.h
/* If the driver is something smart, like UBI, it may need to maintain
* its own reference counting. The below functions are only for driver.
* The driver may register its callbacks. These callbacks are not
Index: linux-2.6.25.4/include/linux/mtd/partitions.h
===================================================================
--- linux-2.6.25.4.orig/include/linux/mtd/partitions.h
+++ linux-2.6.25.4/include/linux/mtd/partitions.h
--- a/include/linux/mtd/partitions.h
+++ b/include/linux/mtd/partitions.h
@@ -36,6 +36,7 @@
* erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
*/
@ -935,7 +923,7 @@ Index: linux-2.6.25.4/include/linux/mtd/partitions.h
struct mtd_partition {
char *name; /* identifier string */
u_int32_t size; /* partition size */
@@ -43,6 +44,7 @@ struct mtd_partition {
@@ -43,6 +44,7 @@
u_int32_t mask_flags; /* master MTD flags to mask out for this partition */
struct nand_ecclayout *ecclayout; /* out of band layout for this partition (NAND only)*/
struct mtd_info **mtdp; /* pointer to store the MTD object */
@ -943,7 +931,7 @@ Index: linux-2.6.25.4/include/linux/mtd/partitions.h
};
#define MTDPART_OFS_NXTBLK (-2)
@@ -52,6 +54,7 @@ struct mtd_partition {
@@ -52,6 +54,7 @@
int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
int del_mtd_partitions(struct mtd_info *);
@ -951,11 +939,9 @@ Index: linux-2.6.25.4/include/linux/mtd/partitions.h
/*
* Functions dealing with the various ways of partitioning the space
Index: linux-2.6.25.4/include/mtd/mtd-abi.h
===================================================================
--- linux-2.6.25.4.orig/include/mtd/mtd-abi.h
+++ linux-2.6.25.4/include/mtd/mtd-abi.h
@@ -95,6 +95,7 @@ struct otp_info {
--- a/include/mtd/mtd-abi.h
+++ b/include/mtd/mtd-abi.h
@@ -95,6 +95,7 @@
#define ECCGETLAYOUT _IOR('M', 17, struct nand_ecclayout)
#define ECCGETSTATS _IOR('M', 18, struct mtd_ecc_stats)
#define MTDFILEMODE _IO('M', 19)

8
target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/mtd/redboot.c
===================================================================
--- linux-2.6.25.4.orig/drivers/mtd/redboot.c
+++ linux-2.6.25.4/drivers/mtd/redboot.c
@@ -251,14 +251,21 @@ static int parse_redboot_partitions(stru
--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
@@ -251,14 +251,21 @@
#endif
names += strlen(names)+1;

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

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

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

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

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

@ -1,7 +1,5 @@
Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_ipp2p.h
===================================================================
--- /dev/null
+++ linux-2.6.25.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.6.25.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.6.25.4/net/ipv4/netfilter/ipt_ipp2p.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/net/ipv4/netfilter/ipt_ipp2p.c
+++ b/net/ipv4/netfilter/ipt_ipp2p.c
@@ -0,0 +1,856 @@
+#if defined(MODVERSIONS)
+#include <linux/modversions.h>
@ -895,11 +891,9 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_ipp2p.c
+module_exit(fini);
+
+
Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig
===================================================================
--- linux-2.6.25.4.orig/net/ipv4/netfilter/Kconfig
+++ linux-2.6.25.4/net/ipv4/netfilter/Kconfig
@@ -57,6 +57,12 @@ config IP_NF_IPTABLES
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -57,6 +57,12 @@
To compile it as a module, choose M here. If unsure, say N.
# The matches.
@ -912,11 +906,9 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig
config IP_NF_MATCH_RECENT
tristate '"recent" match support'
depends on IP_NF_IPTABLES
Index: linux-2.6.25.4/net/ipv4/netfilter/Makefile
===================================================================
--- linux-2.6.25.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.6.25.4/net/ipv4/netfilter/Makefile
@@ -47,6 +47,8 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
@@ -47,6 +47,8 @@
obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o

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

@ -1,7 +1,5 @@
Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set.h
===================================================================
--- /dev/null
+++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set.h
+++ b/include/linux/netfilter_ipv4/ip_set.h
@@ -0,0 +1,498 @@
+#ifndef _IP_SET_H
+#define _IP_SET_H
@ -501,10 +499,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set.h
+#endif /* __KERNEL__ */
+
+#endif /*_IP_SET_H*/
Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iphash.h
===================================================================
--- /dev/null
+++ linux-2.6.25.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
@ -536,10 +532,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iphash.h
+};
+
+#endif /* __IP_SET_IPHASH_H */
Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_ipmap.h
===================================================================
--- /dev/null
+++ linux-2.6.25.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
@ -597,10 +591,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_ipmap.h
+}
+
+#endif /* __IP_SET_IPMAP_H */
Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h
===================================================================
--- /dev/null
+++ linux-2.6.25.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
@ -636,10 +628,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h
+};
+
+#endif /* __IP_SET_IPPORTHASH_H */
Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iptree.h
===================================================================
--- /dev/null
+++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iptree.h
+++ b/include/linux/netfilter_ipv4/ip_set_iptree.h
@@ -0,0 +1,40 @@
+#ifndef __IP_SET_IPTREE_H
+#define __IP_SET_IPTREE_H
@ -681,10 +671,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iptree.h
+};
+
+#endif /* __IP_SET_IPTREE_H */
Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iptreemap.h
===================================================================
--- /dev/null
+++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iptreemap.h
+++ b/include/linux/netfilter_ipv4/ip_set_iptreemap.h
@@ -0,0 +1,40 @@
+#ifndef __IP_SET_IPTREEMAP_H
+#define __IP_SET_IPTREEMAP_H
@ -726,10 +714,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iptreemap.h
+};
+
+#endif /* __IP_SET_IPTREEMAP_H */
Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_jhash.h
===================================================================
--- /dev/null
+++ linux-2.6.25.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
@ -879,10 +865,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_jhash.h
+}
+
+#endif /* _LINUX_IPSET_JHASH_H */
Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_macipmap.h
===================================================================
--- /dev/null
+++ linux-2.6.25.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
@ -922,10 +906,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_macipmap.h
+};
+
+#endif /* __IP_SET_MACIPMAP_H */
Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_malloc.h
===================================================================
--- /dev/null
+++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_malloc.h
+++ b/include/linux/netfilter_ipv4/ip_set_malloc.h
@@ -0,0 +1,116 @@
+#ifndef _IP_SET_MALLOC_H
+#define _IP_SET_MALLOC_H
@ -1043,10 +1025,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_malloc.h
+#endif /* __KERNEL__ */
+
+#endif /*_IP_SET_MALLOC_H*/
Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_nethash.h
===================================================================
--- /dev/null
+++ linux-2.6.25.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
@ -1103,10 +1083,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_nethash.h
+}
+
+#endif /* __IP_SET_NETHASH_H */
Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_portmap.h
===================================================================
--- /dev/null
+++ linux-2.6.25.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
@ -1133,10 +1111,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_portmap.h
+};
+
+#endif /* __IP_SET_PORTMAP_H */
Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_set.h
===================================================================
--- /dev/null
+++ linux-2.6.25.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
@ -1159,10 +1135,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_set.h
+};
+
+#endif /*_IPT_SET_H*/
Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/net/ipv4/netfilter/ip_set.c
+++ b/net/ipv4/netfilter/ip_set.c
@@ -0,0 +1,2003 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de>
@ -3167,10 +3141,8 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set.c
+
+module_init(ip_set_init);
+module_exit(ip_set_fini);
Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_iphash.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_iphash.c
+++ b/net/ipv4/netfilter/ip_set_iphash.c
@@ -0,0 +1,429 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ *
@ -3601,10 +3573,8 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_iphash.c
+
+module_init(ip_set_iphash_init);
+module_exit(ip_set_iphash_fini);
Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_ipmap.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_ipmap.c
+++ b/net/ipv4/netfilter/ip_set_ipmap.c
@@ -0,0 +1,336 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de>
@ -3942,10 +3912,8 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_ipmap.c
+
+module_init(ip_set_ipmap_init);
+module_exit(ip_set_ipmap_fini);
Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_ipporthash.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_ipporthash.c
+++ b/net/ipv4/netfilter/ip_set_ipporthash.c
@@ -0,0 +1,581 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ *
@ -4528,10 +4496,8 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_ipporthash.c
+
+module_init(ip_set_ipporthash_init);
+module_exit(ip_set_ipporthash_fini);
Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_iptree.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_iptree.c
+++ b/net/ipv4/netfilter/ip_set_iptree.c
@@ -0,0 +1,612 @@
+/* Copyright (C) 2005 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ *
@ -5145,10 +5111,8 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_iptree.c
+
+module_init(ip_set_iptree_init);
+module_exit(ip_set_iptree_fini);
Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_iptreemap.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_iptreemap.c
+++ b/net/ipv4/netfilter/ip_set_iptreemap.c
@@ -0,0 +1,829 @@
+/* Copyright (C) 2007 Sven Wegener <sven.wegener@stealer.net>
+ *
@ -5979,10 +5943,8 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_iptreemap.c
+
+module_init(ip_set_iptreemap_init);
+module_exit(ip_set_iptreemap_fini);
Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_macipmap.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_macipmap.c
+++ b/net/ipv4/netfilter/ip_set_macipmap.c
@@ -0,0 +1,375 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de>
@ -6359,10 +6321,8 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_macipmap.c
+
+module_init(ip_set_macipmap_init);
+module_exit(ip_set_macipmap_fini);
Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_nethash.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_nethash.c
+++ b/net/ipv4/netfilter/ip_set_nethash.c
@@ -0,0 +1,497 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ *
@ -6861,10 +6821,8 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_nethash.c
+
+module_init(ip_set_nethash_init);
+module_exit(ip_set_nethash_fini);
Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_portmap.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_portmap.c
+++ b/net/ipv4/netfilter/ip_set_portmap.c
@@ -0,0 +1,346 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ *
@ -7212,10 +7170,8 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_portmap.c
+
+module_init(ip_set_portmap_init);
+module_exit(ip_set_portmap_fini);
Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_set.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/net/ipv4/netfilter/ipt_set.c
+++ b/net/ipv4/netfilter/ipt_set.c
@@ -0,0 +1,160 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de>
@ -7377,10 +7333,8 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_set.c
+
+module_init(ipt_ipset_init);
+module_exit(ipt_ipset_fini);
Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_SET.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/net/ipv4/netfilter/ipt_SET.c
+++ b/net/ipv4/netfilter/ipt_SET.c
@@ -0,0 +1,179 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de>
@ -7561,11 +7515,9 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_SET.c
+
+module_init(ipt_SET_init);
+module_exit(ipt_SET_fini);
Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig
===================================================================
--- linux-2.6.25.4.orig/net/ipv4/netfilter/Kconfig
+++ linux-2.6.25.4/net/ipv4/netfilter/Kconfig
@@ -385,5 +385,122 @@ config IP_NF_ARP_MANGLE
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -385,5 +385,122 @@
Allows altering the ARP packet payload: source and destination
hardware and network addresses.
@ -7688,11 +7640,9 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig
+
endmenu
Index: linux-2.6.25.4/net/ipv4/netfilter/Makefile
===================================================================
--- linux-2.6.25.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.6.25.4/net/ipv4/netfilter/Makefile
@@ -46,6 +46,7 @@ obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
@@ -46,6 +46,7 @@
obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o
obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
@ -7700,7 +7650,7 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/Makefile
obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
@@ -59,6 +60,18 @@ obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += i
@@ -59,6 +60,18 @@
obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o

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

@ -1,7 +1,5 @@
Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_time.h
===================================================================
--- /dev/null
+++ linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_time.h
+++ b/include/linux/netfilter_ipv4/ipt_time.h
@@ -0,0 +1,18 @@
+#ifndef __ipt_time_h_included__
+#define __ipt_time_h_included__
@ -21,10 +19,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_time.h
+
+
+#endif /* __ipt_time_h_included__ */
Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_time.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/net/ipv4/netfilter/ipt_time.c
+++ b/net/ipv4/netfilter/ipt_time.c
@@ -0,0 +1,180 @@
+/*
+ This is a module which is used for time matching
@ -206,11 +202,9 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_time.c
+ r->tm_mon=i;
+ r->tm_mday=work-__spm[i]+1;
+}
Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig
===================================================================
--- linux-2.6.25.4.orig/net/ipv4/netfilter/Kconfig
+++ linux-2.6.25.4/net/ipv4/netfilter/Kconfig
@@ -63,6 +63,22 @@ config IP_NF_MATCH_IPP2P
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -63,6 +63,22 @@
help
Module for matching traffic of various Peer-to-Peer applications
@ -233,11 +227,9 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig
config IP_NF_MATCH_RECENT
tristate '"recent" match support'
depends on IP_NF_IPTABLES
Index: linux-2.6.25.4/net/ipv4/netfilter/Makefile
===================================================================
--- linux-2.6.25.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.6.25.4/net/ipv4/netfilter/Makefile
@@ -47,6 +47,7 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
@@ -47,6 +47,7 @@
obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o

96
target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.25.4/drivers/net/imq.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/drivers/net/imq.c
+++ b/drivers/net/imq.c
@@ -0,0 +1,409 @@
+/*
+ * Pseudo-driver for the intermediate queue device.
@ -412,11 +410,9 @@ Index: linux-2.6.25.4/drivers/net/imq.c
+MODULE_AUTHOR("http://www.linuximq.net");
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
+MODULE_LICENSE("GPL");
Index: linux-2.6.25.4/drivers/net/Kconfig
===================================================================
--- linux-2.6.25.4.orig/drivers/net/Kconfig
+++ linux-2.6.25.4/drivers/net/Kconfig
@@ -117,6 +117,129 @@ config EQUALIZER
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -117,6 +117,129 @@
To compile this driver as a module, choose M here: the module
will be called eql. If unsure, say N.
@ -546,11 +542,9 @@ Index: linux-2.6.25.4/drivers/net/Kconfig
config TUN
tristate "Universal TUN/TAP device driver support"
select CRC32
Index: linux-2.6.25.4/drivers/net/Makefile
===================================================================
--- linux-2.6.25.4.orig/drivers/net/Makefile
+++ linux-2.6.25.4/drivers/net/Makefile
@@ -143,6 +143,7 @@ obj-$(CONFIG_SLHC) += slhc.o
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -143,6 +143,7 @@
obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
obj-$(CONFIG_DUMMY) += dummy.o
@ -558,10 +552,8 @@ Index: linux-2.6.25.4/drivers/net/Makefile
obj-$(CONFIG_IFB) += ifb.o
obj-$(CONFIG_MACVLAN) += macvlan.o
obj-$(CONFIG_DE600) += de600.o
Index: linux-2.6.25.4/include/linux/imq.h
===================================================================
--- /dev/null
+++ linux-2.6.25.4/include/linux/imq.h
+++ b/include/linux/imq.h
@@ -0,0 +1,9 @@
+#ifndef _IMQ_H
+#define _IMQ_H
@ -572,10 +564,8 @@ Index: linux-2.6.25.4/include/linux/imq.h
+#define IMQ_F_ENQUEUE 0x80
+
+#endif /* _IMQ_H */
Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_IMQ.h
===================================================================
--- /dev/null
+++ linux-2.6.25.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
@ -585,10 +575,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_IMQ.h
+};
+
+#endif /* _IPT_IMQ_H */
Index: linux-2.6.25.4/include/linux/netfilter_ipv6/ip6t_IMQ.h
===================================================================
--- /dev/null
+++ linux-2.6.25.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
@ -598,11 +586,9 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv6/ip6t_IMQ.h
+};
+
+#endif /* _IP6T_IMQ_H */
Index: linux-2.6.25.4/include/linux/skbuff.h
===================================================================
--- linux-2.6.25.4.orig/include/linux/skbuff.h
+++ linux-2.6.25.4/include/linux/skbuff.h
@@ -296,6 +296,10 @@ struct sk_buff {
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -296,6 +296,10 @@
struct nf_conntrack *nfct;
struct sk_buff *nfct_reasm;
#endif
@ -613,7 +599,7 @@ Index: linux-2.6.25.4/include/linux/skbuff.h
#ifdef CONFIG_BRIDGE_NETFILTER
struct nf_bridge_info *nf_bridge;
#endif
@@ -1736,6 +1740,10 @@ static inline void __nf_copy(struct sk_b
@@ -1736,6 +1740,10 @@
dst->nfct_reasm = src->nfct_reasm;
nf_conntrack_get_reasm(src->nfct_reasm);
#endif
@ -624,10 +610,8 @@ Index: linux-2.6.25.4/include/linux/skbuff.h
#ifdef CONFIG_BRIDGE_NETFILTER
dst->nf_bridge = src->nf_bridge;
nf_bridge_get(src->nf_bridge);
Index: linux-2.6.25.4/net/core/dev.c
===================================================================
--- linux-2.6.25.4.orig/net/core/dev.c
+++ linux-2.6.25.4/net/core/dev.c
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -95,6 +95,9 @@
#include <net/net_namespace.h>
#include <net/sock.h>
@ -638,7 +622,7 @@ Index: linux-2.6.25.4/net/core/dev.c
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/stat.h>
@@ -1537,7 +1540,11 @@ static int dev_gso_segment(struct sk_buf
@@ -1537,7 +1540,11 @@
int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
if (likely(!skb->next)) {
@ -651,10 +635,8 @@ Index: linux-2.6.25.4/net/core/dev.c
dev_queue_xmit_nit(skb, dev);
if (netif_needs_gso(dev, skb)) {
Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_IMQ.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/net/ipv4/netfilter/ipt_IMQ.c
+++ b/net/ipv4/netfilter/ipt_IMQ.c
@@ -0,0 +1,69 @@
+/*
+ * This target marks packets to be enqueued to an imq device
@ -725,11 +707,9 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_IMQ.c
+MODULE_AUTHOR("http://www.linuximq.net");
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
+MODULE_LICENSE("GPL");
Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig
===================================================================
--- linux-2.6.25.4.orig/net/ipv4/netfilter/Kconfig
+++ linux-2.6.25.4/net/ipv4/netfilter/Kconfig
@@ -315,6 +315,17 @@ config IP_NF_MANGLE
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -315,6 +315,17 @@
To compile it as a module, choose M here. If unsure, say N.
@ -747,11 +727,9 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig
config IP_NF_TARGET_ECN
tristate "ECN target support"
depends on IP_NF_MANGLE
Index: linux-2.6.25.4/net/ipv4/netfilter/Makefile
===================================================================
--- linux-2.6.25.4.orig/net/ipv4/netfilter/Makefile
+++ linux-2.6.25.4/net/ipv4/netfilter/Makefile
@@ -55,6 +55,7 @@ obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_i
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
@@ -55,6 +55,7 @@
obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o
@ -759,10 +737,8 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/Makefile
obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
Index: linux-2.6.25.4/net/ipv6/netfilter/ip6t_IMQ.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/net/ipv6/netfilter/ip6t_IMQ.c
+++ b/net/ipv6/netfilter/ip6t_IMQ.c
@@ -0,0 +1,69 @@
+/*
+ * This target marks packets to be enqueued to an imq device
@ -833,11 +809,9 @@ Index: linux-2.6.25.4/net/ipv6/netfilter/ip6t_IMQ.c
+MODULE_AUTHOR("http://www.linuximq.net");
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
+MODULE_LICENSE("GPL");
Index: linux-2.6.25.4/net/ipv6/netfilter/Kconfig
===================================================================
--- linux-2.6.25.4.orig/net/ipv6/netfilter/Kconfig
+++ linux-2.6.25.4/net/ipv6/netfilter/Kconfig
@@ -179,6 +179,15 @@ config IP6_NF_MANGLE
--- a/net/ipv6/netfilter/Kconfig
+++ b/net/ipv6/netfilter/Kconfig
@@ -179,6 +179,15 @@
To compile it as a module, choose M here. If unsure, say N.
@ -853,10 +827,8 @@ Index: linux-2.6.25.4/net/ipv6/netfilter/Kconfig
config IP6_NF_TARGET_HL
tristate 'HL (hoplimit) target support'
depends on IP6_NF_MANGLE
Index: linux-2.6.25.4/net/ipv6/netfilter/Makefile
===================================================================
--- linux-2.6.25.4.orig/net/ipv6/netfilter/Makefile
+++ linux-2.6.25.4/net/ipv6/netfilter/Makefile
--- a/net/ipv6/netfilter/Makefile
+++ b/net/ipv6/netfilter/Makefile
@@ -6,6 +6,7 @@
obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o
obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
@ -865,11 +837,9 @@ Index: linux-2.6.25.4/net/ipv6/netfilter/Makefile
obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o
Index: linux-2.6.25.4/net/sched/sch_generic.c
===================================================================
--- linux-2.6.25.4.orig/net/sched/sch_generic.c
+++ linux-2.6.25.4/net/sched/sch_generic.c
@@ -182,6 +182,13 @@ static inline int qdisc_restart(struct n
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -182,6 +182,13 @@
return ret;
}

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

@ -1,17 +1,13 @@
Index: linux-2.6.25.4/include/linux/netfilter/oot_conntrack.h
===================================================================
--- /dev/null
+++ linux-2.6.25.4/include/linux/netfilter/oot_conntrack.h
+++ b/include/linux/netfilter/oot_conntrack.h
@@ -0,0 +1,5 @@
+#if defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE)
+# include <linux/netfilter_ipv4/ip_conntrack.h>
+#else /* linux-2.6.20+ */
+# include <net/netfilter/nf_nat_rule.h>
+#endif
Index: linux-2.6.25.4/include/linux/netfilter/oot_trans.h
===================================================================
--- /dev/null
+++ linux-2.6.25.4/include/linux/netfilter/oot_trans.h
+++ b/include/linux/netfilter/oot_trans.h
@@ -0,0 +1,14 @@
+/* Out of tree workarounds */
+#include <linux/version.h>
@ -27,10 +23,8 @@ Index: linux-2.6.25.4/include/linux/netfilter/oot_trans.h
+# define tcp_v4_check(tcph, tcph_sz, s, d, csp) \
+ tcp_v4_check((tcph_sz), (s), (d), (csp))
+#endif
Index: linux-2.6.25.4/include/linux/netfilter/xt_CHAOS.h
===================================================================
--- /dev/null
+++ linux-2.6.25.4/include/linux/netfilter/xt_CHAOS.h
+++ b/include/linux/netfilter/xt_CHAOS.h
@@ -0,0 +1,14 @@
+#ifndef _LINUX_NETFILTER_XT_CHAOS_H
+#define _LINUX_NETFILTER_XT_CHAOS_H 1
@ -46,10 +40,8 @@ Index: linux-2.6.25.4/include/linux/netfilter/xt_CHAOS.h
+};
+
+#endif /* _LINUX_NETFILTER_XT_CHAOS_H */
Index: linux-2.6.25.4/include/linux/netfilter/xt_portscan.h
===================================================================
--- /dev/null
+++ linux-2.6.25.4/include/linux/netfilter/xt_portscan.h
+++ b/include/linux/netfilter/xt_portscan.h
@@ -0,0 +1,8 @@
+#ifndef _LINUX_NETFILTER_XT_PORTSCAN_H
+#define _LINUX_NETFILTER_XT_PORTSCAN_H 1
@ -59,10 +51,8 @@ Index: linux-2.6.25.4/include/linux/netfilter/xt_portscan.h
+};
+
+#endif /* _LINUX_NETFILTER_XT_PORTSCAN_H */
Index: linux-2.6.25.4/net/netfilter/find_match.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/net/netfilter/find_match.c
+++ b/net/netfilter/find_match.c
@@ -0,0 +1,39 @@
+/*
+ xt_request_find_match
@ -103,11 +93,9 @@ Index: linux-2.6.25.4/net/netfilter/find_match.c
+
+/* In case it goes into mainline, let this out-of-tree package compile */
+#define xt_request_find_match xt_request_find_match_lo
Index: linux-2.6.25.4/net/netfilter/Kconfig
===================================================================
--- linux-2.6.25.4.orig/net/netfilter/Kconfig
+++ linux-2.6.25.4/net/netfilter/Kconfig
@@ -276,6 +276,14 @@ config NETFILTER_XTABLES
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -276,6 +276,14 @@
# alphabetically ordered list of targets
@ -122,7 +110,7 @@ Index: linux-2.6.25.4/net/netfilter/Kconfig
config NETFILTER_XT_TARGET_CLASSIFY
tristate '"CLASSIFY" target support'
depends on NETFILTER_XTABLES
@@ -305,6 +313,14 @@ config NETFILTER_XT_TARGET_CONNMARK
@@ -305,6 +313,14 @@
<file:Documentation/kbuild/modules.txt>. The module will be called
ipt_CONNMARK.ko. If unsure, say `N'.
@ -137,7 +125,7 @@ Index: linux-2.6.25.4/net/netfilter/Kconfig
config NETFILTER_XT_TARGET_DSCP
tristate '"DSCP" and "TOS" target support'
depends on NETFILTER_XTABLES
@@ -640,6 +656,14 @@ config NETFILTER_XT_MATCH_POLICY
@@ -640,6 +656,14 @@
To compile it as a module, choose M here. If unsure, say N.
@ -152,11 +140,9 @@ Index: linux-2.6.25.4/net/netfilter/Kconfig
config NETFILTER_XT_MATCH_MULTIPORT
tristate '"multiport" Multiple port match support'
depends on NETFILTER_XTABLES
Index: linux-2.6.25.4/net/netfilter/Makefile
===================================================================
--- linux-2.6.25.4.orig/net/netfilter/Makefile
+++ linux-2.6.25.4/net/netfilter/Makefile
@@ -50,6 +50,8 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -50,6 +50,8 @@
obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o
obj-$(CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP) += xt_TCPOPTSTRIP.o
obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.o
@ -165,15 +151,13 @@ Index: linux-2.6.25.4/net/netfilter/Makefile
# matches
obj-$(CONFIG_NETFILTER_XT_MATCH_COMMENT) += xt_comment.o
@@ -83,3 +85,4 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_STRING)
@@ -83,3 +85,4 @@
obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
obj-$(CONFIG_NETFILTER_XT_MATCH_TIME) += xt_time.o
obj-$(CONFIG_NETFILTER_XT_MATCH_U32) += xt_u32.o
+obj-$(CONFIG_NETFILTER_XT_MATCH_PORTSCAN) += xt_portscan.o
Index: linux-2.6.25.4/net/netfilter/xt_CHAOS.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/net/netfilter/xt_CHAOS.c
+++ b/net/netfilter/xt_CHAOS.c
@@ -0,0 +1,200 @@
+/*
+ * CHAOS target for netfilter
@ -375,10 +359,8 @@ Index: linux-2.6.25.4/net/netfilter/xt_CHAOS.c
+MODULE_DESCRIPTION("netfilter \"CHAOS\" target");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("ipt_CHAOS");
Index: linux-2.6.25.4/net/netfilter/xt_DELUDE.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/net/netfilter/xt_DELUDE.c
+++ b/net/netfilter/xt_DELUDE.c
@@ -0,0 +1,197 @@
+/*
+ * DELUDE target
@ -577,10 +559,8 @@ Index: linux-2.6.25.4/net/netfilter/xt_DELUDE.c
+MODULE_DESCRIPTION("netfilter \"DELUDE\" target");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("ipt_DELUDE");
Index: linux-2.6.25.4/net/netfilter/xt_portscan.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/net/netfilter/xt_portscan.c
+++ b/net/netfilter/xt_portscan.c
@@ -0,0 +1,269 @@
+/*
+ * portscan match for netfilter
@ -851,11 +831,9 @@ Index: linux-2.6.25.4/net/netfilter/xt_portscan.c
+MODULE_DESCRIPTION("netfilter \"portscan\" match");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("ipt_portscan");
Index: linux-2.6.25.4/drivers/char/random.c
===================================================================
--- linux-2.6.25.4.orig/drivers/char/random.c
+++ linux-2.6.25.4/drivers/char/random.c
@@ -1563,6 +1563,8 @@ __u32 secure_tcp_sequence_number(__be32
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1563,6 +1563,8 @@
return seq;
}

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/net/netfilter/Kconfig
===================================================================
--- linux-2.6.25.4.orig/net/netfilter/Kconfig
+++ linux-2.6.25.4/net/netfilter/Kconfig
@@ -437,6 +437,23 @@ config NETFILTER_XT_TARGET_CONNSECMARK
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -437,6 +437,23 @@
To compile it as a module, choose M here. If unsure, say N.
@ -26,11 +24,9 @@ Index: linux-2.6.25.4/net/netfilter/Kconfig
config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support'
depends on NETFILTER_XTABLES && (IPV6 || IPV6=n)
Index: linux-2.6.25.4/net/netfilter/Makefile
===================================================================
--- linux-2.6.25.4.orig/net/netfilter/Makefile
+++ linux-2.6.25.4/net/netfilter/Makefile
@@ -47,6 +47,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -47,6 +47,7 @@
obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_NOTRACK.o
obj-$(CONFIG_NETFILTER_XT_TARGET_RATEEST) += xt_RATEEST.o
obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o
@ -38,10 +34,8 @@ Index: linux-2.6.25.4/net/netfilter/Makefile
obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o
obj-$(CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP) += xt_TCPOPTSTRIP.o
obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.o
Index: linux-2.6.25.4/net/netfilter/xt_TARPIT.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/net/netfilter/xt_TARPIT.c
+++ b/net/netfilter/xt_TARPIT.c
@@ -0,0 +1,279 @@
+/*
+ * Kernel module to capture and hold incoming TCP connections using

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/net/netfilter/Kconfig
===================================================================
--- linux-2.6.25.4.orig/net/netfilter/Kconfig
+++ linux-2.6.25.4/net/netfilter/Kconfig
@@ -145,7 +145,7 @@ config NF_CONNTRACK_FTP
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -145,7 +145,7 @@
config NF_CONNTRACK_H323
tristate "H.323 protocol support"
@ -11,7 +9,7 @@ Index: linux-2.6.25.4/net/netfilter/Kconfig
depends on NETFILTER_ADVANCED
help
H.323 is a VoIP signalling protocol from ITU-T. As one of the most
@@ -456,7 +456,7 @@ config NETFILTER_XT_TARGET_TARPIT
@@ -456,7 +456,7 @@
config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support'

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

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

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/include/linux/pkt_sched.h
===================================================================
--- linux-2.6.25.4.orig/include/linux/pkt_sched.h
+++ linux-2.6.25.4/include/linux/pkt_sched.h
@@ -162,8 +162,37 @@ struct tc_sfq_xstats
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -162,8 +162,37 @@
*
* The only reason for this is efficiency, it is possible
* to change these parameters in compile time.
@ -40,11 +38,9 @@ Index: linux-2.6.25.4/include/linux/pkt_sched.h
/* RED section */
enum
Index: linux-2.6.25.4/net/sched/Kconfig
===================================================================
--- linux-2.6.25.4.orig/net/sched/Kconfig
+++ linux-2.6.25.4/net/sched/Kconfig
@@ -139,6 +139,37 @@ config NET_SCH_SFQ
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -139,6 +139,37 @@
To compile this code as a module, choose M here: the
module will be called sch_sfq.
@ -82,11 +78,9 @@ Index: linux-2.6.25.4/net/sched/Kconfig
config NET_SCH_TEQL
tristate "True Link Equalizer (TEQL)"
---help---
Index: linux-2.6.25.4/net/sched/Makefile
===================================================================
--- linux-2.6.25.4.orig/net/sched/Makefile
+++ linux-2.6.25.4/net/sched/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_NET_SCH_GRED) += sch_gred.o
--- a/net/sched/Makefile
+++ b/net/sched/Makefile
@@ -23,6 +23,7 @@
obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o
obj-$(CONFIG_NET_SCH_DSMARK) += sch_dsmark.o
obj-$(CONFIG_NET_SCH_SFQ) += sch_sfq.o
@ -94,10 +88,8 @@ Index: linux-2.6.25.4/net/sched/Makefile
obj-$(CONFIG_NET_SCH_TBF) += sch_tbf.o
obj-$(CONFIG_NET_SCH_TEQL) += sch_teql.o
obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o
Index: linux-2.6.25.4/net/sched/sch_esfq.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/net/sched/sch_esfq.c
+++ b/net/sched/sch_esfq.c
@@ -0,0 +1,702 @@
+/*
+ * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline.

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/mips/Makefile
===================================================================
--- linux-2.6.25.4.orig/arch/mips/Makefile
+++ linux-2.6.25.4/arch/mips/Makefile
@@ -593,6 +593,9 @@ core-$(CONFIG_TOSHIBA_RBTX4938) += arch/
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -593,6 +593,9 @@
cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/fs/jffs2/build.c
===================================================================
--- linux-2.6.25.4.orig/fs/jffs2/build.c
+++ linux-2.6.25.4/fs/jffs2/build.c
@@ -105,6 +105,17 @@ static int jffs2_build_filesystem(struct
--- a/fs/jffs2/build.c
+++ b/fs/jffs2/build.c
@@ -105,6 +105,17 @@
dbg_fsbuild("scanned flash completely\n");
jffs2_dbg_dump_block_lists_nolock(c);
@ -20,11 +18,9 @@ Index: linux-2.6.25.4/fs/jffs2/build.c
dbg_fsbuild("pass 1 starting\n");
c->flags |= JFFS2_SB_FLAG_BUILDING;
/* Now scan the directory tree, increasing nlink according to every dirent found. */
Index: linux-2.6.25.4/fs/jffs2/scan.c
===================================================================
--- linux-2.6.25.4.orig/fs/jffs2/scan.c
+++ linux-2.6.25.4/fs/jffs2/scan.c
@@ -142,9 +142,12 @@ int jffs2_scan_medium(struct jffs2_sb_in
--- a/fs/jffs2/scan.c
+++ b/fs/jffs2/scan.c
@@ -142,9 +142,12 @@
/* reset summary info for next eraseblock scan */
jffs2_sum_reset_collected(s);
@ -40,7 +36,7 @@ Index: linux-2.6.25.4/fs/jffs2/scan.c
if (ret < 0)
goto out;
@@ -545,6 +548,17 @@ static int jffs2_scan_eraseblock (struct
@@ -545,6 +548,17 @@
return err;
}

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

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

14
target/linux/generic-2.6/patches-2.6.25/208-rtl8110sb_fix.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/net/r8169.c
===================================================================
--- linux-2.6.25.4.orig/drivers/net/r8169.c
+++ linux-2.6.25.4/drivers/net/r8169.c
@@ -1537,7 +1537,7 @@ static const struct rtl_cfg_info {
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1537,7 +1537,7 @@
.hw_start = rtl_hw_start_8169,
.region = 1,
.align = 0,
@ -11,7 +9,7 @@ Index: linux-2.6.25.4/drivers/net/r8169.c
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
.msi = 0
@@ -1546,7 +1546,7 @@ static const struct rtl_cfg_info {
@@ -1546,7 +1546,7 @@
.hw_start = rtl_hw_start_8168,
.region = 2,
.align = 8,
@ -20,7 +18,7 @@ Index: linux-2.6.25.4/drivers/net/r8169.c
TxErr | TxOK | RxOK | RxErr,
.napi_event = TxErr | TxOK | RxOK | RxOverflow,
.msi = RTL_FEATURE_MSI
@@ -1555,7 +1555,7 @@ static const struct rtl_cfg_info {
@@ -1555,7 +1555,7 @@
.hw_start = rtl_hw_start_8101,
.region = 2,
.align = 8,
@ -29,7 +27,7 @@ Index: linux-2.6.25.4/drivers/net/r8169.c
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
.msi = RTL_FEATURE_MSI
@@ -2903,10 +2903,12 @@ static irqreturn_t rtl8169_interrupt(int
@@ -2903,10 +2903,12 @@
break;
}

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/fs/Kconfig
===================================================================
--- linux-2.6.25.4.orig/fs/Kconfig
+++ linux-2.6.25.4/fs/Kconfig
@@ -1449,6 +1449,9 @@ config VXFS_FS
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1449,6 +1449,9 @@
To compile this as a module, choose M here: the module will be
called freevxfs. If unsure, say N.
@ -12,11 +10,9 @@ Index: linux-2.6.25.4/fs/Kconfig
config MINIX_FS
tristate "Minix file system support"
depends on BLOCK
Index: linux-2.6.25.4/fs/Makefile
===================================================================
--- linux-2.6.25.4.orig/fs/Makefile
+++ linux-2.6.25.4/fs/Makefile
@@ -77,6 +77,7 @@ obj-$(CONFIG_SQUASHFS) += squashfs/
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -77,6 +77,7 @@
obj-y += ramfs/
obj-$(CONFIG_HUGETLBFS) += hugetlbfs/
obj-$(CONFIG_CODA_FS) += coda/
@ -24,10 +20,8 @@ Index: linux-2.6.25.4/fs/Makefile
obj-$(CONFIG_MINIX_FS) += minix/
obj-$(CONFIG_FAT_FS) += fat/
obj-$(CONFIG_MSDOS_FS) += msdos/
Index: linux-2.6.25.4/fs/mini_fo/aux.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/fs/mini_fo/aux.c
+++ b/fs/mini_fo/aux.c
@@ -0,0 +1,577 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@ -606,10 +600,8 @@ Index: linux-2.6.25.4/fs/mini_fo/aux.c
+
+#endif /* unused */
+
Index: linux-2.6.25.4/fs/mini_fo/ChangeLog
===================================================================
--- /dev/null
+++ linux-2.6.25.4/fs/mini_fo/ChangeLog
+++ b/fs/mini_fo/ChangeLog
@@ -0,0 +1,281 @@
+2006-01-24 Markus Klotzbuecher <mk@mary.denx.de>
+
@ -892,10 +884,8 @@ Index: linux-2.6.25.4/fs/mini_fo/ChangeLog
+ * Implementation of mini_fo_mknod and mini_fo_rename, support
+ for device files.
+
Index: linux-2.6.25.4/fs/mini_fo/dentry.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/fs/mini_fo/dentry.c
+++ b/fs/mini_fo/dentry.c
@@ -0,0 +1,244 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@ -1141,10 +1131,8 @@ Index: linux-2.6.25.4/fs/mini_fo/dentry.c
+ d_delete: mini_fo_d_delete,
+ d_iput: mini_fo_d_iput,
+};
Index: linux-2.6.25.4/fs/mini_fo/file.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/fs/mini_fo/file.c
+++ b/fs/mini_fo/file.c
@@ -0,0 +1,713 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@ -1859,10 +1847,8 @@ Index: linux-2.6.25.4/fs/mini_fo/file.c
+ /* not implemented: sendpage */
+ /* not implemented: get_unmapped_area */
+ };
Index: linux-2.6.25.4/fs/mini_fo/fist.h
===================================================================
--- /dev/null
+++ linux-2.6.25.4/fs/mini_fo/fist.h
+++ b/fs/mini_fo/fist.h
@@ -0,0 +1,252 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@ -2116,10 +2102,8 @@ Index: linux-2.6.25.4/fs/mini_fo/fist.h
+# define FIST_IOCTL_SET_DEBUG_VALUE _IOW(0x15, 2, int)
+
+#endif /* not __FIST_H_ */
Index: linux-2.6.25.4/fs/mini_fo/inode.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/fs/mini_fo/inode.c
+++ b/fs/mini_fo/inode.c
@@ -0,0 +1,1564 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@ -3685,10 +3669,8 @@ Index: linux-2.6.25.4/fs/mini_fo/inode.c
+ removexattr: mini_fo_removexattr
+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
+ };
Index: linux-2.6.25.4/fs/mini_fo/main.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/fs/mini_fo/main.c
+++ b/fs/mini_fo/main.c
@@ -0,0 +1,423 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@ -4113,10 +4095,8 @@ Index: linux-2.6.25.4/fs/mini_fo/main.c
+
+module_init(init_mini_fo_fs)
+module_exit(exit_mini_fo_fs)
Index: linux-2.6.25.4/fs/mini_fo/Makefile
===================================================================
--- /dev/null
+++ linux-2.6.25.4/fs/mini_fo/Makefile
+++ b/fs/mini_fo/Makefile
@@ -0,0 +1,17 @@
+#
+# Makefile for mini_fo 2.4 and 2.6 Linux kernels
@ -4135,10 +4115,8 @@ Index: linux-2.6.25.4/fs/mini_fo/Makefile
+# dependencies
+${mini_fo-objs}: mini_fo.h fist.h
+
Index: linux-2.6.25.4/fs/mini_fo/meta.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/fs/mini_fo/meta.c
+++ b/fs/mini_fo/meta.c
@@ -0,0 +1,1000 @@
+/*
+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
@ -5140,10 +5118,8 @@ Index: linux-2.6.25.4/fs/mini_fo/meta.c
+ return 0;
+}
+
Index: linux-2.6.25.4/fs/mini_fo/mini_fo.h
===================================================================
--- /dev/null
+++ linux-2.6.25.4/fs/mini_fo/mini_fo.h
+++ b/fs/mini_fo/mini_fo.h
@@ -0,0 +1,510 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@ -5655,10 +5631,8 @@ Index: linux-2.6.25.4/fs/mini_fo/mini_fo.h
+/* ioctls */
+
+#endif /* not __MINI_FO_H_ */
Index: linux-2.6.25.4/fs/mini_fo/mini_fo-merge
===================================================================
--- /dev/null
+++ linux-2.6.25.4/fs/mini_fo/mini_fo-merge
+++ b/fs/mini_fo/mini_fo-merge
@@ -0,0 +1,180 @@
+#!/bin/bash
+#
@ -5840,10 +5814,8 @@ Index: linux-2.6.25.4/fs/mini_fo/mini_fo-merge
+#rm $TMP/$SKIP_DEL_LIST
+
+echo "Done!"
Index: linux-2.6.25.4/fs/mini_fo/mini_fo-overlay
===================================================================
--- /dev/null
+++ linux-2.6.25.4/fs/mini_fo/mini_fo-overlay
+++ b/fs/mini_fo/mini_fo-overlay
@@ -0,0 +1,130 @@
+#!/bin/bash
+#
@ -5975,10 +5947,8 @@ Index: linux-2.6.25.4/fs/mini_fo/mini_fo-overlay
+if [ $? -ne 0 ]; then
+ echo "Error, mounting failed, maybe no permisson to mount?"
+fi
Index: linux-2.6.25.4/fs/mini_fo/mmap.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/fs/mini_fo/mmap.c
+++ b/fs/mini_fo/mmap.c
@@ -0,0 +1,637 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@ -6617,10 +6587,8 @@ Index: linux-2.6.25.4/fs/mini_fo/mmap.c
+ print_exit_status(err);
+ return err;
+}
Index: linux-2.6.25.4/fs/mini_fo/README
===================================================================
--- /dev/null
+++ linux-2.6.25.4/fs/mini_fo/README
+++ b/fs/mini_fo/README
@@ -0,0 +1,163 @@
+README for the mini_fo overlay file system
+=========================================
@ -6785,10 +6753,8 @@ Index: linux-2.6.25.4/fs/mini_fo/README
+2 of the License, or (at your option) any later version.
+
+
Index: linux-2.6.25.4/fs/mini_fo/RELEASE_NOTES
===================================================================
--- /dev/null
+++ linux-2.6.25.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
@ -6901,10 +6867,8 @@ Index: linux-2.6.25.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.6.25.4/fs/mini_fo/state.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/fs/mini_fo/state.c
+++ b/fs/mini_fo/state.c
@@ -0,0 +1,620 @@
+/*
+ * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
@ -7526,10 +7490,8 @@ Index: linux-2.6.25.4/fs/mini_fo/state.c
+ return err;
+}
+
Index: linux-2.6.25.4/fs/mini_fo/super.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/fs/mini_fo/super.c
+++ b/fs/mini_fo/super.c
@@ -0,0 +1,281 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok

40
target/linux/generic-2.6/patches-2.6.25/210-mini_fo_2.6.25_fixes.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/fs/mini_fo/main.c
===================================================================
--- linux-2.6.25.4.orig/fs/mini_fo/main.c
+++ linux-2.6.25.4/fs/mini_fo/main.c
@@ -79,6 +79,7 @@ mini_fo_tri_interpose(dentry_t *hidden_d
--- a/fs/mini_fo/main.c
+++ b/fs/mini_fo/main.c
@@ -79,6 +79,7 @@
* of the new inode's fields
*/
@ -10,7 +8,7 @@ Index: linux-2.6.25.4/fs/mini_fo/main.c
/*
* original: inode = iget(sb, hidden_inode->i_ino);
*/
@@ -87,6 +88,13 @@ mini_fo_tri_interpose(dentry_t *hidden_d
@@ -87,6 +88,13 @@
err = -EACCES; /* should be impossible??? */
goto out;
}
@ -24,7 +22,7 @@ Index: linux-2.6.25.4/fs/mini_fo/main.c
/*
* interpose the inode if not already interposed
@@ -184,9 +192,9 @@ mini_fo_parse_options(super_block_t *sb,
@@ -184,9 +192,9 @@
hidden_root = ERR_PTR(err);
goto out;
}
@ -37,7 +35,7 @@ Index: linux-2.6.25.4/fs/mini_fo/main.c
} else if(!strncmp("sto=", options, 4)) {
/* parse the storage dir */
@@ -204,9 +212,9 @@ mini_fo_parse_options(super_block_t *sb,
@@ -204,9 +212,9 @@
hidden_root2 = ERR_PTR(err);
goto out;
}
@ -50,11 +48,9 @@ Index: linux-2.6.25.4/fs/mini_fo/main.c
stohs2(sb) = hidden_root2->d_sb;
/* validate storage dir, this is done in
Index: linux-2.6.25.4/fs/mini_fo/mini_fo.h
===================================================================
--- linux-2.6.25.4.orig/fs/mini_fo/mini_fo.h
+++ linux-2.6.25.4/fs/mini_fo/mini_fo.h
@@ -302,6 +302,10 @@ extern int mini_fo_tri_interpose(dentry_
--- a/fs/mini_fo/mini_fo.h
+++ b/fs/mini_fo/mini_fo.h
@@ -302,6 +302,10 @@
extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
dentry_t *src_dentry, struct vfsmount *src_mnt);
@ -65,7 +61,7 @@ Index: linux-2.6.25.4/fs/mini_fo/mini_fo.h
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
@@ -501,6 +505,29 @@ static inline void double_unlock(struct
@@ -501,6 +505,29 @@
#endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
#endif /* __KERNEL__ */
@ -95,11 +91,9 @@ Index: linux-2.6.25.4/fs/mini_fo/mini_fo.h
/*
* Definitions for user and kernel code
*/
Index: linux-2.6.25.4/fs/mini_fo/super.c
===================================================================
--- linux-2.6.25.4.orig/fs/mini_fo/super.c
+++ linux-2.6.25.4/fs/mini_fo/super.c
@@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
--- a/fs/mini_fo/super.c
+++ b/fs/mini_fo/super.c
@@ -262,10 +262,31 @@
}
#endif
@ -131,11 +125,9 @@ Index: linux-2.6.25.4/fs/mini_fo/super.c
#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
write_inode: mini_fo_write_inode,
#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
Index: linux-2.6.25.4/fs/mini_fo/aux.c
===================================================================
--- linux-2.6.25.4.orig/fs/mini_fo/aux.c
+++ linux-2.6.25.4/fs/mini_fo/aux.c
@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb,
--- a/fs/mini_fo/aux.c
+++ b/fs/mini_fo/aux.c
@@ -164,11 +164,11 @@
err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
/* validate */

14
target/linux/generic-2.6/patches-2.6.25/211-mini_fo_2.6.25_dentry_open_war.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/fs/mini_fo/meta.c
===================================================================
--- linux-2.6.25.4.orig/fs/mini_fo/meta.c
+++ linux-2.6.25.4/fs/mini_fo/meta.c
@@ -442,6 +442,11 @@ int meta_write_d_entry(dentry_t *dentry,
--- a/fs/mini_fo/meta.c
+++ b/fs/mini_fo/meta.c
@@ -442,6 +442,11 @@
S_IRUSR | S_IWUSR);
#endif
}
@ -14,7 +12,7 @@ Index: linux-2.6.25.4/fs/mini_fo/meta.c
/* open META-file for writing */
meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
if(!meta_file || IS_ERR(meta_file)) {
@@ -535,6 +540,11 @@ int meta_write_r_entry(dentry_t *dentry,
@@ -535,6 +540,11 @@
meta_dentry, S_IRUSR | S_IWUSR);
#endif
}
@ -26,7 +24,7 @@ Index: linux-2.6.25.4/fs/mini_fo/meta.c
/* open META-file for writing */
meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
if(!meta_file || IS_ERR(meta_file)) {
@@ -671,14 +681,16 @@ int meta_sync_d_list(dentry_t *dentry, i
@@ -671,14 +681,16 @@
}
}
@ -46,7 +44,7 @@ Index: linux-2.6.25.4/fs/mini_fo/meta.c
dput(meta_dentry);
err = -1;
goto out;
@@ -811,14 +823,16 @@ int meta_sync_r_list(dentry_t *dentry, i
@@ -811,14 +823,16 @@
}
}

12
target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/lib/kobject_uevent.c
===================================================================
--- linux-2.6.25.4.orig/lib/kobject_uevent.c
+++ linux-2.6.25.4/lib/kobject_uevent.c
@@ -27,7 +27,8 @@ u64 uevent_seqnum;
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -27,7 +27,8 @@
char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
static DEFINE_SPINLOCK(sequence_lock);
#if defined(CONFIG_NET)
@ -12,7 +10,7 @@ Index: linux-2.6.25.4/lib/kobject_uevent.c
#endif
/* the strings here must match the enum in include/linux/kobject.h */
@@ -40,6 +41,18 @@ static const char *kobject_actions[] = {
@@ -40,6 +41,18 @@
[KOBJ_OFFLINE] = "offline",
};
@ -31,7 +29,7 @@ Index: linux-2.6.25.4/lib/kobject_uevent.c
/**
* kobject_action_type - translate action string to numeric type
*
@@ -192,9 +205,7 @@ int kobject_uevent_env(struct kobject *k
@@ -192,9 +205,7 @@
kobj->state_remove_uevent_sent = 1;
/* we will send an event, so request a new sequence number */

8
target/linux/generic-2.6/patches-2.6.25/220-sound_kconfig.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/sound/core/Kconfig
===================================================================
--- linux-2.6.25.4.orig/sound/core/Kconfig
+++ linux-2.6.25.4/sound/core/Kconfig
@@ -9,7 +9,7 @@ config SND_PCM
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -9,7 +9,7 @@
depends on SND
config SND_HWDEP

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/leds/Kconfig
===================================================================
--- linux-2.6.25.4.orig/drivers/leds/Kconfig
+++ linux-2.6.25.4/drivers/leds/Kconfig
@@ -181,4 +181,8 @@ config LEDS_TRIGGER_HEARTBEAT
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -181,4 +181,8 @@
load average.
If unsure, say Y.
@ -11,11 +9,9 @@ Index: linux-2.6.25.4/drivers/leds/Kconfig
+ depends on LEDS_TRIGGERS
+
endif # NEW_LEDS
Index: linux-2.6.25.4/drivers/leds/Makefile
===================================================================
--- linux-2.6.25.4.orig/drivers/leds/Makefile
+++ linux-2.6.25.4/drivers/leds/Makefile
@@ -26,3 +26,4 @@ obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -26,3 +26,4 @@
obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o
obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += ledtrig-ide-disk.o
obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o

16
target/linux/generic-2.6/patches-2.6.25/401-led_alix.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/leds/Kconfig
===================================================================
--- linux-2.6.25.4.orig/drivers/leds/Kconfig
+++ linux-2.6.25.4/drivers/leds/Kconfig
@@ -79,6 +79,12 @@ config LEDS_WRAP
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -79,6 +79,12 @@
help
This option enables support for the PCEngines WRAP programmable LEDs.
@ -15,11 +13,9 @@ Index: linux-2.6.25.4/drivers/leds/Kconfig
config LEDS_H1940
tristate "LED Support for iPAQ H1940 device"
depends on LEDS_CLASS && ARCH_H1940
Index: linux-2.6.25.4/drivers/leds/Makefile
===================================================================
--- linux-2.6.25.4.orig/drivers/leds/Makefile
+++ linux-2.6.25.4/drivers/leds/Makefile
@@ -14,6 +14,7 @@ obj-$(CONFIG_LEDS_S3C24XX) += leds-s3c2
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -14,6 +14,7 @@
obj-$(CONFIG_LEDS_AMS_DELTA) += leds-ams-delta.o
obj-$(CONFIG_LEDS_NET48XX) += leds-net48xx.o
obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o

16
target/linux/generic-2.6/patches-2.6.25/402-ledtrig_default_on.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/leds/Kconfig
===================================================================
--- linux-2.6.25.4.orig/drivers/leds/Kconfig
+++ linux-2.6.25.4/drivers/leds/Kconfig
@@ -191,4 +191,11 @@ config LEDS_TRIGGER_MORSE
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -191,4 +191,11 @@
tristate "LED Morse Trigger"
depends on LEDS_TRIGGERS
@ -14,11 +12,9 @@ Index: linux-2.6.25.4/drivers/leds/Kconfig
+ If unsure, say Y.
+
endif # NEW_LEDS
Index: linux-2.6.25.4/drivers/leds/Makefile
===================================================================
--- linux-2.6.25.4.orig/drivers/leds/Makefile
+++ linux-2.6.25.4/drivers/leds/Makefile
@@ -28,3 +28,4 @@ obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledt
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -28,3 +28,4 @@
obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += ledtrig-ide-disk.o
obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o
obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o

6
target/linux/generic-2.6/patches-2.6.25/403-ds1672_detect.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.25.4/drivers/rtc/rtc-ds1672.c
===================================================================
--- linux-2.6.25.4.orig/drivers/rtc/rtc-ds1672.c
+++ linux-2.6.25.4/drivers/rtc/rtc-ds1672.c
--- a/drivers/rtc/rtc-ds1672.c
+++ b/drivers/rtc/rtc-ds1672.c
@@ -13,10 +13,10 @@
#include <linux/i2c.h>
#include <linux/rtc.h>

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

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

10
target/linux/generic-2.6/patches-2.6.25/420-gpiodev.patch
View File

@ -1,6 +1,5 @@
diff -Nur linux-2.6.25/drivers/char/Kconfig linux-2.6.25-owrt/drivers/char/Kconfig
--- linux-2.6.25/drivers/char/Kconfig 2008-05-15 17:00:12.000000000 +0200
+++ linux-2.6.25-owrt/drivers/char/Kconfig 2008-05-30 11:58:39.000000000 +0200
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -955,6 +955,13 @@
If compiled as a module, it will be called cs5535_gpio.
@ -15,9 +14,8 @@ diff -Nur linux-2.6.25/drivers/char/Kconfig linux-2.6.25-owrt/drivers/char/Kconf
config GPIO_VR41XX
tristate "NEC VR4100 series General-purpose I/O Unit support"
depends on CPU_VR41XX
diff -Nur linux-2.6.25/drivers/char/Makefile linux-2.6.25-owrt/drivers/char/Makefile
--- linux-2.6.25/drivers/char/Makefile 2008-05-15 17:00:12.000000000 +0200
+++ linux-2.6.25-owrt/drivers/char/Makefile 2008-05-30 11:57:33.000000000 +0200
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -94,6 +94,7 @@
obj-$(CONFIG_PC8736x_GPIO) += pc8736x_gpio.o
obj-$(CONFIG_NSC_GPIO) += nsc_gpio.o

16
target/linux/generic-2.6/patches-2.6.25/510-Yaffs.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/fs/Kconfig
===================================================================
--- linux-2.6.25.4.orig/fs/Kconfig
+++ linux-2.6.25.4/fs/Kconfig
@@ -421,6 +421,7 @@ config FS_POSIX_ACL
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -421,6 +421,7 @@
source "fs/xfs/Kconfig"
source "fs/gfs2/Kconfig"
@ -10,11 +8,9 @@ Index: linux-2.6.25.4/fs/Kconfig
config OCFS2_FS
tristate "OCFS2 file system support"
Index: linux-2.6.25.4/fs/Makefile
===================================================================
--- linux-2.6.25.4.orig/fs/Makefile
+++ linux-2.6.25.4/fs/Makefile
@@ -121,3 +121,4 @@ obj-$(CONFIG_HPPFS) += hppfs/
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -121,3 +121,4 @@
obj-$(CONFIG_DEBUG_FS) += debugfs/
obj-$(CONFIG_OCFS2_FS) += ocfs2/
obj-$(CONFIG_GFS2_FS) += gfs2/

16
target/linux/generic-2.6/patches-2.6.25/511-yaffs_2.6.25_fix.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/fs/yaffs2/yaffs_fs.c
===================================================================
--- linux-2.6.25.4.orig/fs/yaffs2/yaffs_fs.c
+++ linux-2.6.25.4/fs/yaffs2/yaffs_fs.c
@@ -181,7 +181,13 @@ static int yaffs_statfs(struct super_blo
--- a/fs/yaffs2/yaffs_fs.c
+++ b/fs/yaffs2/yaffs_fs.c
@@ -181,7 +181,13 @@
#else
static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
#endif
@ -16,7 +14,7 @@ Index: linux-2.6.25.4/fs/yaffs2/yaffs_fs.c
static void yaffs_put_inode(struct inode *inode);
static void yaffs_delete_inode(struct inode *);
@@ -284,7 +290,9 @@ static struct file_operations yaffs_dir_
@@ -284,7 +290,9 @@
static struct super_operations yaffs_super_ops = {
.statfs = yaffs_statfs,
@ -26,7 +24,7 @@ Index: linux-2.6.25.4/fs/yaffs2/yaffs_fs.c
.put_inode = yaffs_put_inode,
.put_super = yaffs_put_super,
.delete_inode = yaffs_delete_inode,
@@ -844,11 +852,17 @@ struct inode *yaffs_get_inode(struct sup
@@ -844,11 +852,17 @@
T(YAFFS_TRACE_OS,
(KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId));
@ -44,7 +42,7 @@ Index: linux-2.6.25.4/fs/yaffs2/yaffs_fs.c
return inode;
}
@@ -1427,6 +1441,39 @@ static int yaffs_sync_fs(struct super_bl
@@ -1427,6 +1441,39 @@
}
@ -84,7 +82,7 @@ Index: linux-2.6.25.4/fs/yaffs2/yaffs_fs.c
static void yaffs_read_inode(struct inode *inode)
{
/* NB This is called as a side effect of other functions, but
@@ -1448,6 +1495,7 @@ static void yaffs_read_inode(struct inod
@@ -1448,6 +1495,7 @@
yaffs_GrossUnlock(dev);
}

16
target/linux/generic-2.6/patches-2.6.25/600-phy_extension.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/net/phy/phy.c
===================================================================
--- linux-2.6.25.4.orig/drivers/net/phy/phy.c
+++ linux-2.6.25.4/drivers/net/phy/phy.c
@@ -348,6 +348,50 @@ int phy_ethtool_gset(struct phy_device *
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -348,6 +348,50 @@
}
EXPORT_SYMBOL(phy_ethtool_gset);
@ -53,11 +51,9 @@ Index: linux-2.6.25.4/drivers/net/phy/phy.c
/**
* phy_mii_ioctl - generic PHY MII ioctl interface
* @phydev: the phy_device struct
Index: linux-2.6.25.4/include/linux/phy.h
===================================================================
--- linux-2.6.25.4.orig/include/linux/phy.h
+++ linux-2.6.25.4/include/linux/phy.h
@@ -399,6 +399,7 @@ void phy_start_machine(struct phy_device
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -399,6 +399,7 @@
void phy_stop_machine(struct phy_device *phydev);
int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);

16
target/linux/generic-2.6/patches-2.6.25/610-phy_detect.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/net/phy/mdio_bus.c
===================================================================
--- linux-2.6.25.4.orig/drivers/net/phy/mdio_bus.c
+++ linux-2.6.25.4/drivers/net/phy/mdio_bus.c
@@ -132,6 +132,9 @@ static int mdio_bus_match(struct device
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -132,6 +132,9 @@
struct phy_device *phydev = to_phy_device(dev);
struct phy_driver *phydrv = to_phy_driver(drv);
@ -12,11 +10,9 @@ Index: linux-2.6.25.4/drivers/net/phy/mdio_bus.c
return ((phydrv->phy_id & phydrv->phy_id_mask) ==
(phydev->phy_id & phydrv->phy_id_mask));
}
Index: linux-2.6.25.4/include/linux/phy.h
===================================================================
--- linux-2.6.25.4.orig/include/linux/phy.h
+++ linux-2.6.25.4/include/linux/phy.h
@@ -325,6 +325,11 @@ struct phy_driver {
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -325,6 +325,11 @@
u32 features;
u32 flags;

16
target/linux/generic-2.6/patches-2.6.25/620-phy_adm6996.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/net/phy/Kconfig
===================================================================
--- linux-2.6.25.4.orig/drivers/net/phy/Kconfig
+++ linux-2.6.25.4/drivers/net/phy/Kconfig
@@ -65,6 +65,11 @@ config REALTEK_PHY
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -65,6 +65,11 @@
---help---
Supports the Realtek 821x PHY.
@ -14,11 +12,9 @@ Index: linux-2.6.25.4/drivers/net/phy/Kconfig
config FIXED_PHY
bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
depends on PHYLIB=y
Index: linux-2.6.25.4/drivers/net/phy/Makefile
===================================================================
--- linux-2.6.25.4.orig/drivers/net/phy/Makefile
+++ linux-2.6.25.4/drivers/net/phy/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_SMSC_PHY) += smsc.o
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -12,6 +12,7 @@
obj-$(CONFIG_VITESSE_PHY) += vitesse.o
obj-$(CONFIG_BROADCOM_PHY) += broadcom.o
obj-$(CONFIG_ICPLUS_PHY) += icplus.o

26
target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/net/phy/phy_device.c
===================================================================
--- linux-2.6.25.4.orig/drivers/net/phy/phy_device.c
+++ linux-2.6.25.4/drivers/net/phy/phy_device.c
@@ -53,6 +53,18 @@ static void phy_device_release(struct de
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -53,6 +53,18 @@
phy_device_free(to_phy_device(dev));
}
@ -21,7 +19,7 @@ Index: linux-2.6.25.4/drivers/net/phy/phy_device.c
struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
{
struct phy_device *dev;
@@ -78,6 +90,8 @@ struct phy_device* phy_device_create(str
@@ -78,6 +90,8 @@
dev->bus = bus;
dev->state = PHY_DOWN;
@ -30,11 +28,9 @@ Index: linux-2.6.25.4/drivers/net/phy/phy_device.c
mutex_init(&dev->lock);
Index: linux-2.6.25.4/include/linux/phy.h
===================================================================
--- linux-2.6.25.4.orig/include/linux/phy.h
+++ linux-2.6.25.4/include/linux/phy.h
@@ -295,6 +295,17 @@ struct phy_device {
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -295,6 +295,17 @@
void (*adjust_link)(struct net_device *dev);
void (*adjust_state)(struct net_device *dev);
@ -52,11 +48,9 @@ Index: linux-2.6.25.4/include/linux/phy.h
};
#define to_phy_device(d) container_of(d, struct phy_device, dev)
Index: linux-2.6.25.4/include/linux/netdevice.h
===================================================================
--- linux-2.6.25.4.orig/include/linux/netdevice.h
+++ linux-2.6.25.4/include/linux/netdevice.h
@@ -595,6 +595,7 @@ struct net_device
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -595,6 +595,7 @@
void *ax25_ptr; /* AX.25 specific data */
struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
assign before registering */

24
target/linux/generic-2.6/patches-2.6.25/640-mvswitch.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/net/phy/Kconfig
===================================================================
--- linux-2.6.25.4.orig/drivers/net/phy/Kconfig
+++ linux-2.6.25.4/drivers/net/phy/Kconfig
@@ -70,6 +70,12 @@ config ADM6996_PHY
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -70,6 +70,12 @@
---help---
Currently supports the ADM6996F switch
@ -15,11 +13,9 @@ Index: linux-2.6.25.4/drivers/net/phy/Kconfig
config FIXED_PHY
bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
depends on PHYLIB=y
Index: linux-2.6.25.4/drivers/net/phy/Makefile
===================================================================
--- linux-2.6.25.4.orig/drivers/net/phy/Makefile
+++ linux-2.6.25.4/drivers/net/phy/Makefile
@@ -13,6 +13,7 @@ obj-$(CONFIG_VITESSE_PHY) += vitesse.o
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -13,6 +13,7 @@
obj-$(CONFIG_BROADCOM_PHY) += broadcom.o
obj-$(CONFIG_ICPLUS_PHY) += icplus.o
obj-$(CONFIG_ADM6996_PHY) += adm6996.o
@ -27,10 +23,8 @@ Index: linux-2.6.25.4/drivers/net/phy/Makefile
obj-$(CONFIG_REALTEK_PHY) += realtek.o
obj-$(CONFIG_FIXED_PHY) += fixed.o
obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
Index: linux-2.6.25.4/drivers/net/phy/mdio_bus.c
===================================================================
--- linux-2.6.25.4.orig/drivers/net/phy/mdio_bus.c
+++ linux-2.6.25.4/drivers/net/phy/mdio_bus.c
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -35,6 +35,12 @@
#include <asm/irq.h>
#include <asm/uaccess.h>
@ -44,7 +38,7 @@ Index: linux-2.6.25.4/drivers/net/phy/mdio_bus.c
/**
* mdiobus_register - bring up all the PHYs on a given bus and attach them to bus
* @bus: target mii_bus
@@ -85,6 +91,7 @@ int mdiobus_register(struct mii_bus *bus
@@ -85,6 +91,7 @@
phydev->dev.parent = bus->dev;
phydev->dev.bus = &mdio_bus_type;

3888
target/linux/generic-2.6/patches-2.6.25/700-powerpc_git.patch
View File

File diff suppressed because it is too large Load Diff

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

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

8
target/linux/generic-2.6/patches-2.6.25/840-unable_to_open_console.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/init/main.c
===================================================================
--- linux-2.6.25.4.orig/init/main.c
+++ linux-2.6.25.4/init/main.c
@@ -775,7 +775,7 @@ static int noinline init_post(void)
--- a/init/main.c
+++ b/init/main.c
@@ -775,7 +775,7 @@
numa_default_policy();
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)

10
target/linux/generic-2.6/patches-2.6.25/850-jffs2_erase_progress_indicator.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/fs/jffs2/erase.c
===================================================================
--- linux-2.6.25.4.orig/fs/jffs2/erase.c
+++ linux-2.6.25.4/fs/jffs2/erase.c
@@ -35,6 +35,8 @@ static void jffs2_erase_block(struct jff
--- a/fs/jffs2/erase.c
+++ b/fs/jffs2/erase.c
@@ -35,6 +35,8 @@
{
int ret;
uint32_t bad_offset;
@ -11,7 +9,7 @@ Index: linux-2.6.25.4/fs/jffs2/erase.c
#ifdef __ECOS
ret = jffs2_flash_erase(c, jeb);
if (!ret) {
@@ -47,6 +49,11 @@ static void jffs2_erase_block(struct jff
@@ -47,6 +49,11 @@
D1(printk(KERN_DEBUG "jffs2_erase_block(): erase block %#08x (range %#08x-%#08x)\n",
jeb->offset, jeb->offset, jeb->offset + c->sector_size));

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

@ -1,7 +1,5 @@
Index: linux-2.6.25.4/include/linux/time.h
===================================================================
--- linux-2.6.25.4.orig/include/linux/time.h
+++ linux-2.6.25.4/include/linux/time.h
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -1,6 +1,10 @@
#ifndef _LINUX_TIME_H
#define _LINUX_TIME_H
@ -13,17 +11,15 @@ Index: linux-2.6.25.4/include/linux/time.h
#include <linux/types.h>
#ifdef __KERNEL__
@@ -232,4 +236,6 @@ struct itimerval {
@@ -232,4 +236,6 @@
*/
#define TIMER_ABSTIME 0x01
+#endif /* __KERNEL__ DEBIAN */
+
#endif
Index: linux-2.6.25.4/include/linux/types.h
===================================================================
--- linux-2.6.25.4.orig/include/linux/types.h
+++ linux-2.6.25.4/include/linux/types.h
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -1,6 +1,14 @@
#ifndef _LINUX_TYPES_H
#define _LINUX_TYPES_H
@ -39,7 +35,7 @@ Index: linux-2.6.25.4/include/linux/types.h
#ifdef __KERNEL__
#define DECLARE_BITMAP(name,bits) \
@@ -161,6 +169,8 @@ typedef unsigned long blkcnt_t;
@@ -161,6 +169,8 @@
#endif /* __KERNEL_STRICT_NAMES */

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

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

50
target/linux/generic-2.6/patches-2.6.25/903-hostap_txpower.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_ap.c
===================================================================
--- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap_ap.c
+++ linux-2.6.25.4/drivers/net/wireless/hostap/hostap_ap.c
@@ -2397,13 +2397,13 @@ int prism2_ap_get_sta_qual(local_info_t
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -2397,13 +2397,13 @@
addr[count].sa_family = ARPHRD_ETHER;
memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
if (sta->last_rx_silence == 0)
@ -22,7 +20,7 @@ Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_ap.c
qual[count].updated = sta->last_rx_updated;
sta->last_rx_updated = IW_QUAL_DBM;
@@ -2468,13 +2468,13 @@ int prism2_ap_translate_scan(struct net_
@@ -2468,13 +2468,13 @@
memset(&iwe, 0, sizeof(iwe));
iwe.cmd = IWEVQUAL;
if (sta->last_rx_silence == 0)
@ -42,10 +40,8 @@ Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_ap.c
iwe.u.qual.updated = sta->last_rx_updated;
iwe.len = IW_EV_QUAL_LEN;
current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_config.h
===================================================================
--- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap_config.h
+++ linux-2.6.25.4/drivers/net/wireless/hostap/hostap_config.h
--- a/drivers/net/wireless/hostap/hostap_config.h
+++ b/drivers/net/wireless/hostap/hostap_config.h
@@ -45,4 +45,9 @@
*/
/* #define PRISM2_NO_STATION_MODES */
@ -56,11 +52,9 @@ Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_config.h
+#define RAW_TXPOWER_SETTING
+
#endif /* HOSTAP_CONFIG_H */
Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap.h
===================================================================
--- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap.h
+++ linux-2.6.25.4/drivers/net/wireless/hostap/hostap.h
@@ -89,6 +89,7 @@ extern const struct iw_handler_def hosta
--- a/drivers/net/wireless/hostap/hostap.h
+++ b/drivers/net/wireless/hostap/hostap.h
@@ -89,6 +89,7 @@
extern const struct ethtool_ops prism2_ethtool_ops;
int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
@ -68,11 +62,9 @@ Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap.h
#endif /* HOSTAP_H */
Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_hw.c
===================================================================
--- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap_hw.c
+++ linux-2.6.25.4/drivers/net/wireless/hostap/hostap_hw.c
@@ -933,6 +933,7 @@ static int hfa384x_set_rid(struct net_de
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -933,6 +933,7 @@
prism2_hw_reset(dev);
}
@ -80,11 +72,9 @@ Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_hw.c
return res;
}
Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_info.c
===================================================================
--- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap_info.c
+++ linux-2.6.25.4/drivers/net/wireless/hostap/hostap_info.c
@@ -434,6 +434,11 @@ static void handle_info_queue_linkstatus
--- a/drivers/net/wireless/hostap/hostap_info.c
+++ b/drivers/net/wireless/hostap/hostap_info.c
@@ -434,6 +434,11 @@
}
/* Get BSSID if we have a valid AP address */
@ -96,11 +86,9 @@ Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_info.c
if (connected) {
netif_carrier_on(local->dev);
netif_carrier_on(local->ddev);
Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_ioctl.c
===================================================================
--- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap_ioctl.c
+++ linux-2.6.25.4/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -1500,23 +1500,20 @@ static int prism2_txpower_hfa386x_to_dBm
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -1500,23 +1500,20 @@
val = 255;
tmp = val;
@ -128,7 +116,7 @@ Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_ioctl.c
return (unsigned char) tmp;
}
@@ -4076,3 +4073,35 @@ int hostap_ioctl(struct net_device *dev,
@@ -4076,3 +4073,35 @@
return ret;
}

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

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

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

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

6
target/linux/generic-2.6/patches-2.6.25/905-i386_build.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.25.4/arch/x86/boot/tools/build.c
===================================================================
--- linux-2.6.25.4.orig/arch/x86/boot/tools/build.c
+++ linux-2.6.25.4/arch/x86/boot/tools/build.c
--- a/arch/x86/boot/tools/build.c
+++ b/arch/x86/boot/tools/build.c
@@ -29,7 +29,6 @@
#include <stdarg.h>
#include <sys/types.h>

16
target/linux/generic-2.6/patches-2.6.25/921-gpio_spi_driver.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/spi/Kconfig
===================================================================
--- linux-2.6.25.4.orig/drivers/spi/Kconfig
+++ linux-2.6.25.4/drivers/spi/Kconfig
@@ -100,6 +100,11 @@ config SPI_BUTTERFLY
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -100,6 +100,11 @@
inexpensive battery powered microcontroller evaluation board.
This same cable can be used to flash new firmware.
@ -14,11 +12,9 @@ Index: linux-2.6.25.4/drivers/spi/Kconfig
config SPI_IMX
tristate "Freescale iMX SPI controller"
depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
Index: linux-2.6.25.4/drivers/spi/Makefile
===================================================================
--- linux-2.6.25.4.orig/drivers/spi/Makefile
+++ linux-2.6.25.4/drivers/spi/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_BFIN) += spi_bfin5xx.
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -16,6 +16,7 @@
obj-$(CONFIG_SPI_BITBANG) += spi_bitbang.o
obj-$(CONFIG_SPI_AU1550) += au1550_spi.o
obj-$(CONFIG_SPI_BUTTERFLY) += spi_butterfly.o

10
target/linux/generic-2.6/patches-2.6.25/930-ppc_big_endian_io_memory_accessors.patch
View File

@ -30,11 +30,9 @@ and didn't make it with the ppc32 equivalent. Thanks.
---
Index: linux-2.6.25.4/include/asm-ppc/io.h
===================================================================
--- linux-2.6.25.4.orig/include/asm-ppc/io.h
+++ linux-2.6.25.4/include/asm-ppc/io.h
@@ -413,11 +413,21 @@ static inline unsigned int ioread16(void
--- a/include/asm-ppc/io.h
+++ b/include/asm-ppc/io.h
@@ -413,11 +413,21 @@
return readw(addr);
}
@ -56,7 +54,7 @@ Index: linux-2.6.25.4/include/asm-ppc/io.h
static inline void iowrite8(u8 val, void __iomem *addr)
{
writeb(val, addr);
@@ -428,11 +438,21 @@ static inline void iowrite16(u16 val, vo
@@ -428,11 +438,21 @@
writew(val, addr);
}

12
target/linux/generic-2.6/patches-2.6.25/940-arm_mach_types.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.25.4/arch/arm/tools/mach-types
===================================================================
--- linux-2.6.25.4.orig/arch/arm/tools/mach-types
+++ linux-2.6.25.4/arch/arm/tools/mach-types
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -12,7 +12,7 @@
#
# http://www.arm.linux.org.uk/developer/machines/?action=new
@ -11,7 +9,7 @@ Index: linux-2.6.25.4/arch/arm/tools/mach-types
#
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
#
@@ -381,13 +381,13 @@ ks8695p ARCH_KS8695P KS8695P 363
@@ -381,13 +381,13 @@
se4000 ARCH_SE4000 SE4000 364
quadriceps ARCH_QUADRICEPS QUADRICEPS 365
bronco ARCH_BRONCO BRONCO 366
@ -27,7 +25,7 @@ Index: linux-2.6.25.4/arch/arm/tools/mach-types
rcube ARCH_RCUBE RCUBE 374
rea_olv ARCH_REA_OLV REA_OLV 375
pxa_iphone ARCH_PXA_IPHONE PXA_IPHONE 376
@@ -1463,7 +1463,7 @@ artemis MACH_ARTEMIS ARTEMIS 1462
@@ -1463,7 +1463,7 @@
htctitan MACH_HTCTITAN HTCTITAN 1463
qranium MACH_QRANIUM QRANIUM 1464
adx_wsc2 MACH_ADX_WSC2 ADX_WSC2 1465
@ -36,7 +34,7 @@ Index: linux-2.6.25.4/arch/arm/tools/mach-types
bboard MACH_BBOARD BBOARD 1467
cambria MACH_CAMBRIA CAMBRIA 1468
mt7xxx MACH_MT7XXX MT7XXX 1469
@@ -1611,3 +1611,112 @@ kb9263 MACH_KB9263 KB9263 1612
@@ -1611,3 +1611,112 @@
mt7108 MACH_MT7108 MT7108 1613
smtr2440 MACH_SMTR2440 SMTR2440 1614
manao MACH_MANAO MANAO 1615