mirror/openwrt
1
0
Fork 0
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2024-11-18 22:43:53 +01:00
Code Issues

update to 2.6.25.1 and refresh patches

Browse Source 
SVN-Revision: 11006
This commit is contained in:
Gabor Juhos 2008-05-02 10:17:03 +00:00
parent aaac1064de
commit d7d8665572
93 changed files with 3767 additions and 3197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-version.mk
View File

@ -25,8 +25,8 @@ endif
ifeq ($(LINUX_VERSION),2.6.24.5)
LINUX_KERNEL_MD5SUM:=26500f8f92895bd33e391088b5edd4ad
endif
ifeq ($(LINUX_VERSION),2.6.25)
LINUX_KERNEL_MD5SUM:=db95a49a656a3247d4995a797d333153
ifeq ($(LINUX_VERSION),2.6.25.1)
LINUX_KERNEL_MD5SUM:=0d26fcafa00dc5cf27d4bf01301409a0
endif
# disable the md5sum check for unknown kernel versions

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

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

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

@ -1,7 +1,7 @@
Index: linux-2.6.23/include/linux/LzmaDecode.h
Index: linux-2.6.25.1/include/linux/LzmaDecode.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23/include/linux/LzmaDecode.h 2007-10-10 13:51:27.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/include/linux/LzmaDecode.h
@@ -0,0 +1,100 @@
+/*
+ LzmaDecode.h
@ -103,10 +103,10 @@ Index: linux-2.6.23/include/linux/LzmaDecode.h
+ UInt32 *outSizeProcessed);
+
+#endif
Index: linux-2.6.23/lib/LzmaDecode.c
Index: linux-2.6.25.1/lib/LzmaDecode.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23/lib/LzmaDecode.c 2007-10-10 13:51:27.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/lib/LzmaDecode.c
@@ -0,0 +1,663 @@
+/*
+ LzmaDecode.c
@ -771,12 +771,12 @@ Index: linux-2.6.23/lib/LzmaDecode.c
+ *outSizeProcessed = nowPos;
+ return LZMA_RESULT_OK;
+}
Index: linux-2.6.23/lib/Makefile
Index: linux-2.6.25.1/lib/Makefile
===================================================================
--- linux-2.6.23.orig/lib/Makefile 2007-10-10 13:50:24.000000000 +0800
+++ linux-2.6.23/lib/Makefile 2007-10-10 13:51:53.000000000 +0800
@@ -13,7 +13,7 @@
lib-y += kobject.o kref.o kobject_uevent.o klist.o
--- linux-2.6.25.1.orig/lib/Makefile
+++ linux-2.6.25.1/lib/Makefile
@@ -14,7 +14,7 @@ lib-$(CONFIG_SMP) += cpumask.o
lib-y += kobject.o kref.o klist.o
obj-y += div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
- bust_spinlocks.o hexdump.o kasprintf.o bitmap.o scatterlist.o

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

@ -1,7 +1,7 @@
Index: linux-2.6.23-rc6/fs/squashfs/inode.c
Index: linux-2.6.25.1/fs/squashfs/inode.c
===================================================================
--- linux-2.6.23-rc6.orig/fs/squashfs/inode.c 2007-09-21 16:23:55.000000000 +0800
+++ linux-2.6.23-rc6/fs/squashfs/inode.c 2007-09-21 16:23:56.000000000 +0800
--- linux-2.6.25.1.orig/fs/squashfs/inode.c
+++ linux-2.6.25.1/fs/squashfs/inode.c
@@ -4,6 +4,9 @@
* Copyright (c) 2002, 2003, 2004, 2005, 2006
* Phillip Lougher <phillip@lougher.org.uk>
@ -40,7 +40,7 @@ Index: linux-2.6.23-rc6/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 @@
@@ -64,7 +81,11 @@ static int squashfs_get_sb(struct file_s
const char *, void *, struct vfsmount *);
@ -52,7 +52,7 @@ Index: linux-2.6.23-rc6/fs/squashfs/inode.c
static struct file_system_type squashfs_fs_type = {
.owner = THIS_MODULE,
@@ -249,6 +270,15 @@
@@ -249,6 +270,15 @@ SQSH_EXTERN unsigned int squashfs_read_d
if (compressed) {
int zlib_err;
@ -68,7 +68,7 @@ Index: linux-2.6.23-rc6/fs/squashfs/inode.c
stream.next_in = c_buffer;
stream.avail_in = c_byte;
stream.next_out = buffer;
@@ -263,7 +293,7 @@
@@ -263,7 +293,7 @@ SQSH_EXTERN unsigned int squashfs_read_d
bytes = 0;
} else
bytes = stream.total_out;
@ -77,7 +77,7 @@ Index: linux-2.6.23-rc6/fs/squashfs/inode.c
up(&msblk->read_data_mutex);
}
@@ -2045,15 +2075,19 @@
@@ -2045,15 +2075,19 @@ static int __init init_squashfs_fs(void)
printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) "
"Phillip Lougher\n");
@ -97,7 +97,7 @@ Index: linux-2.6.23-rc6/fs/squashfs/inode.c
destroy_inodecache();
}
@@ -2064,7 +2098,9 @@
@@ -2064,7 +2098,9 @@ out:
static void __exit exit_squashfs_fs(void)
{

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

@ -1,8 +1,8 @@
Index: linux-2.6.23-rc6/Makefile
Index: linux-2.6.25.1/Makefile
===================================================================
--- linux-2.6.23-rc6.orig/Makefile 2007-09-21 16:23:55.000000000 +0800
+++ linux-2.6.23-rc6/Makefile 2007-09-21 16:23:56.000000000 +0800
@@ -508,6 +508,9 @@
--- linux-2.6.25.1.orig/Makefile
+++ linux-2.6.25.1/Makefile
@@ -533,6 +533,9 @@ endif
NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
CHECKFLAGS += $(NOSTDINC_FLAGS)
@ -10,5 +10,5 @@ Index: linux-2.6.23-rc6/Makefile
+CFLAGS += $(call cc-option,-funit-at-a-time,)
+
# warn about C99 declaration after statement
CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)

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

@ -1,6 +1,8 @@
--- linux-2.6.24/fs/squashfs/inode.c 2008-01-28 23:38:13.000000000 +0100
+++ linux-2.6.24-owrt/fs/squashfs/inode.c 2008-01-28 23:43:18.000000000 +0100
@@ -29,6 +29,7 @@
Index: linux-2.6.25.1/fs/squashfs/inode.c
===================================================================
--- linux-2.6.25.1.orig/fs/squashfs/inode.c
+++ linux-2.6.25.1/fs/squashfs/inode.c
@@ -33,6 +33,7 @@
#include <linux/fs.h>
#include <linux/smp_lock.h>
#include <linux/slab.h>
@ -8,7 +10,7 @@
#include <linux/squashfs_fs_sb.h>
#include <linux/squashfs_fs_i.h>
#include <linux/buffer_head.h>
@@ -2089,7 +2090,7 @@
@@ -2125,7 +2126,7 @@ static void squashfs_destroy_inode(struc
}

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

@ -1,8 +1,8 @@
Index: linux-2.6.23/include/asm-mips/system.h
Index: linux-2.6.25.1/include/asm-mips/system.h
===================================================================
--- linux-2.6.23.orig/include/asm-mips/system.h 2007-10-10 04:31:38.000000000 +0800
+++ linux-2.6.23/include/asm-mips/system.h 2007-10-10 13:52:24.000000000 +0800
@@ -181,7 +181,7 @@
--- linux-2.6.25.1.orig/include/asm-mips/system.h
+++ linux-2.6.25.1/include/asm-mips/system.h
@@ -185,7 +185,7 @@ extern __u64 __xchg_u64_unsupported_on_3
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,7 @@
Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0002.c
Index: linux-2.6.25.1/drivers/mtd/chips/cfi_cmdset_0002.c
===================================================================
--- linux-2.6.23-rc6.orig/drivers/mtd/chips/cfi_cmdset_0002.c 2007-09-21 16:23:54.000000000 +0800
+++ linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0002.c 2007-09-21 16:23:57.000000000 +0800
--- linux-2.6.25.1.orig/drivers/mtd/chips/cfi_cmdset_0002.c
+++ linux-2.6.25.1/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -51,6 +51,7 @@
#define SST49LF040B 0x0050
#define SST49LF008A 0x005a
@ -10,7 +10,7 @@ Index: linux-2.6.23-rc6/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 *);
@@ -294,12 +295,19 @@
@@ -298,12 +299,19 @@ struct mtd_info *cfi_cmdset_0002(struct
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,8 @@
Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
Index: linux-2.6.25.1/drivers/mtd/chips/cfi_cmdset_0001.c
===================================================================
--- linux-2.6.23-rc6.orig/drivers/mtd/chips/cfi_cmdset_0001.c 2007-09-21 16:23:54.000000000 +0800
+++ linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c 2007-09-21 16:23:57.000000000 +0800
@@ -933,7 +933,7 @@
--- linux-2.6.25.1.orig/drivers/mtd/chips/cfi_cmdset_0001.c
+++ linux-2.6.25.1/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -1008,7 +1008,7 @@ static void __xipram xip_enable(struct m
static int __xipram xip_wait_for_operation(
struct map_info *map, struct flchip *chip,
@ -11,7 +11,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
{
struct cfi_private *cfi = map->fldrv_priv;
struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
@@ -942,7 +942,7 @@
@@ -1017,7 +1017,7 @@ static int __xipram xip_wait_for_operati
flstate_t oldstate, newstate;
start = xip_currtime();
@ -20,7 +20,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
if (usec == 0)
usec = 500000;
done = 0;
@@ -1052,8 +1052,8 @@
@@ -1127,8 +1127,8 @@ static int __xipram xip_wait_for_operati
#define XIP_INVAL_CACHED_RANGE(map, from, size) \
INVALIDATE_CACHED_RANGE(map, from, size)
@ -31,7 +31,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
#else
@@ -1065,65 +1065,65 @@
@@ -1140,65 +1140,65 @@ static int __xipram xip_wait_for_operati
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 +132,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
/* Done and happy. */
chip->state = FL_STATUS;
return 0;
@@ -1132,7 +1132,8 @@
@@ -1207,7 +1207,8 @@ static int inval_cache_and_wait_for_oper
#endif
#define WAIT_TIMEOUT(map, chip, adr, udelay) \
@ -142,7 +142,7 @@ Index: linux-2.6.23-rc6/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)
@@ -1356,7 +1357,7 @@
@@ -1438,7 +1439,7 @@ static int __xipram do_write_oneword(str
ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
adr, map_bankwidth(map),
@ -151,7 +151,7 @@ Index: linux-2.6.23-rc6/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);
@@ -1593,7 +1594,7 @@
@@ -1678,7 +1679,7 @@ static int __xipram do_write_buffer(stru
ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,
initial_adr, initial_len,
@ -160,7 +160,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
if (ret) {
map_write(map, CMD(0x70), cmd_adr);
chip->state = FL_STATUS;
@@ -1728,7 +1729,7 @@
@@ -1813,7 +1814,7 @@ static int __xipram do_erase_oneblock(st
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,16 @@
Index: linux-2.6.23-rc6/fs/squashfs/Makefile
Index: linux-2.6.25.1/fs/squashfs/Makefile
===================================================================
--- linux-2.6.23-rc6.orig/fs/squashfs/Makefile 2007-09-21 16:23:55.000000000 +0800
+++ linux-2.6.23-rc6/fs/squashfs/Makefile 2007-09-21 16:23:58.000000000 +0800
--- linux-2.6.25.1.orig/fs/squashfs/Makefile
+++ linux-2.6.25.1/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.23-rc6/fs/squashfs/squashfs.h
Index: linux-2.6.25.1/fs/squashfs/squashfs.h
===================================================================
--- linux-2.6.23-rc6.orig/fs/squashfs/squashfs.h 2007-09-21 16:23:55.000000000 +0800
+++ linux-2.6.23-rc6/fs/squashfs/squashfs.h 2007-09-21 16:23:58.000000000 +0800
--- linux-2.6.25.1.orig/fs/squashfs/squashfs.h
+++ linux-2.6.25.1/fs/squashfs/squashfs.h
@@ -24,6 +24,9 @@
#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
#undef CONFIG_SQUASHFS_1_0_COMPATIBILITY

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

@ -1,8 +1,8 @@
Index: linux-2.6.23-rc6/arch/mips/kernel/head.S
Index: linux-2.6.25.1/arch/mips/kernel/head.S
===================================================================
--- linux-2.6.23-rc6.orig/arch/mips/kernel/head.S 2007-09-21 16:23:54.000000000 +0800
+++ linux-2.6.23-rc6/arch/mips/kernel/head.S 2007-09-21 16:23:58.000000000 +0800
@@ -130,6 +130,8 @@
--- linux-2.6.25.1.orig/arch/mips/kernel/head.S
+++ linux-2.6.25.1/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,7 @@
Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
Index: linux-2.6.25.1/drivers/mtd/devices/block2mtd.c
===================================================================
--- linux-2.6.23-rc6.orig/drivers/mtd/devices/block2mtd.c 2007-09-21 16:23:54.000000000 +0800
+++ linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c 2007-09-21 16:23:59.000000000 +0800
--- linux-2.6.25.1.orig/drivers/mtd/devices/block2mtd.c
+++ linux-2.6.25.1/drivers/mtd/devices/block2mtd.c
@@ -16,6 +16,7 @@
#include <linux/list.h>
#include <linux/init.h>
@ -10,7 +10,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
#include <linux/buffer_head.h>
#include <linux/mutex.h>
#include <linux/mount.h>
@@ -237,10 +238,11 @@
@@ -237,10 +238,11 @@ static void block2mtd_free_device(struct
/* FIXME: ensure that mtd->size % erase_size == 0 */
@ -23,7 +23,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
if (!devname)
return NULL;
@@ -279,14 +281,18 @@
@@ -279,14 +281,18 @@ static struct block2mtd_dev *add_device(
/* Setup the MTD structure */
/* make the name contain the block device in */
@ -47,7 +47,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
dev->mtd.erasesize = erase_size;
dev->mtd.writesize = 1;
dev->mtd.type = MTD_RAM;
@@ -298,15 +304,18 @@
@@ -298,15 +304,18 @@ static struct block2mtd_dev *add_device(
dev->mtd.read = block2mtd_read;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;
@ -70,7 +70,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
return dev;
devinit_err:
@@ -379,9 +388,9 @@
@@ -379,9 +388,9 @@ static char block2mtd_paramline[80 + 12]
static int block2mtd_setup2(const char *val)
{
@ -82,7 +82,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
char *name;
size_t erase_size = PAGE_SIZE;
int i, ret;
@@ -392,7 +401,7 @@
@@ -392,7 +401,7 @@ static int block2mtd_setup2(const char *
strcpy(str, val);
kill_final_newline(str);
@ -91,7 +91,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
token[i] = strsep(&str, ",");
if (str)
@@ -412,8 +421,10 @@
@@ -411,8 +420,10 @@ static int block2mtd_setup2(const char *
parse_err("illegal erase size");
}
}
@ -103,7 +103,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
return 0;
}
@@ -447,7 +458,7 @@
@@ -446,7 +457,7 @@ static int block2mtd_setup(const char *v
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,8 @@
Index: linux-2.6.23-rc6/drivers/mtd/Kconfig
Index: linux-2.6.25.1/drivers/mtd/Kconfig
===================================================================
--- linux-2.6.23-rc6.orig/drivers/mtd/Kconfig 2007-09-21 16:23:54.000000000 +0800
+++ linux-2.6.23-rc6/drivers/mtd/Kconfig 2007-09-21 16:23:59.000000000 +0800
@@ -47,6 +47,16 @@
--- linux-2.6.25.1.orig/drivers/mtd/Kconfig
+++ linux-2.6.25.1/drivers/mtd/Kconfig
@@ -47,6 +47,16 @@ config MTD_PARTITIONS
devices. Partitioning on NFTL 'devices' is a different - that's the
'normal' form of partitioning used on a block device.
@ -19,10 +19,10 @@ Index: linux-2.6.23-rc6/drivers/mtd/Kconfig
config MTD_REDBOOT_PARTS
tristate "RedBoot partition table parsing"
depends on MTD_PARTITIONS
Index: linux-2.6.23-rc6/drivers/mtd/mtdpart.c
Index: linux-2.6.25.1/drivers/mtd/mtdpart.c
===================================================================
--- linux-2.6.23-rc6.orig/drivers/mtd/mtdpart.c 2007-09-21 16:23:54.000000000 +0800
+++ linux-2.6.23-rc6/drivers/mtd/mtdpart.c 2007-09-21 16:23:59.000000000 +0800
--- linux-2.6.25.1.orig/drivers/mtd/mtdpart.c
+++ linux-2.6.25.1/drivers/mtd/mtdpart.c
@@ -20,6 +20,8 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
@ -32,7 +32,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/mtdpart.c
/* Our partition linked list */
static LIST_HEAD(mtd_partitions);
@@ -39,7 +41,7 @@
@@ -39,7 +41,7 @@ struct mtd_part {
* the pointer to that structure with this macro.
*/
#define PART(x) ((struct mtd_part *)(x))
@ -41,7 +41,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/mtdpart.c
/*
* MTD methods which simply translate the effective address and pass through
@@ -322,6 +324,316 @@
@@ -322,6 +324,316 @@ int del_mtd_partitions(struct mtd_info *
return 0;
}
@ -358,7 +358,7 @@ Index: linux-2.6.23-rc6/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 @@
@@ -334,171 +646,31 @@ int add_mtd_partitions(struct mtd_info *
int nbparts)
{
struct mtd_part *slave;
@ -551,7 +551,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/mtdpart.c
}
}
@@ -574,6 +746,32 @@
@@ -574,6 +746,32 @@ int parse_mtd_partitions(struct mtd_info
return ret;
}
@ -584,11 +584,11 @@ Index: linux-2.6.23-rc6/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.23-rc6/drivers/mtd/devices/block2mtd.c
Index: linux-2.6.25.1/drivers/mtd/devices/block2mtd.c
===================================================================
--- linux-2.6.23-rc6.orig/drivers/mtd/devices/block2mtd.c 2007-09-21 16:23:59.000000000 +0800
+++ linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c 2007-09-21 16:23:59.000000000 +0800
@@ -34,6 +34,8 @@
--- linux-2.6.25.1.orig/drivers/mtd/devices/block2mtd.c
+++ linux-2.6.25.1/drivers/mtd/devices/block2mtd.c
@@ -34,6 +34,8 @@ struct block2mtd_dev {
struct block_device *blkdev;
struct mtd_info mtd;
struct mutex write_mutex;
@ -597,7 +597,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
};
@@ -86,6 +88,12 @@
@@ -86,6 +88,12 @@ static int block2mtd_erase(struct mtd_in
size_t len = instr->len;
int err;
@ -610,7 +610,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
instr->state = MTD_ERASING;
mutex_lock(&dev->write_mutex);
err = _block2mtd_erase(dev, from, len);
@@ -98,6 +106,10 @@
@@ -98,6 +106,10 @@ static int block2mtd_erase(struct mtd_in
instr->state = MTD_ERASE_DONE;
mtd_erase_callback(instr);
@ -621,7 +621,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
return err;
}
@@ -109,10 +121,14 @@
@@ -109,10 +121,14 @@ static int block2mtd_read(struct mtd_inf
struct page *page;
int index = from >> PAGE_SHIFT;
int offset = from & (PAGE_SIZE-1);
@ -639,7 +639,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
if (from + len > mtd->size)
len = mtd->size - from;
@@ -127,10 +143,14 @@
@@ -127,10 +143,14 @@ static int block2mtd_read(struct mtd_inf
len = len - cpylen;
page = page_read(dev->blkdev->bd_inode->i_mapping, index);
@ -658,7 +658,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
memcpy(buf, page_address(page) + offset, cpylen);
page_cache_release(page);
@@ -141,7 +161,10 @@
@@ -141,7 +161,10 @@ static int block2mtd_read(struct mtd_inf
offset = 0;
index++;
}
@ -670,7 +670,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
}
@@ -193,12 +216,22 @@
@@ -193,12 +216,22 @@ static int block2mtd_write(struct mtd_in
size_t *retlen, const u_char *buf)
{
struct block2mtd_dev *dev = mtd->priv;
@ -697,7 +697,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
if (to + len > mtd->size)
len = mtd->size - to;
@@ -207,6 +240,9 @@
@@ -207,6 +240,9 @@ static int block2mtd_write(struct mtd_in
mutex_unlock(&dev->write_mutex);
if (err > 0)
err = 0;
@ -707,7 +707,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
return err;
}
@@ -215,51 +251,29 @@
@@ -215,51 +251,29 @@ static int block2mtd_write(struct mtd_in
static void block2mtd_sync(struct mtd_info *mtd)
{
struct block2mtd_dev *dev = mtd->priv;
@ -767,7 +767,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
}
@@ -267,17 +281,96 @@
@@ -267,17 +281,96 @@ static struct block2mtd_dev *add_device(
#endif
if (IS_ERR(bdev)) {
@ -867,7 +867,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
/* Setup the MTD structure */
/* make the name contain the block device in */
@@ -304,6 +397,7 @@
@@ -304,6 +397,7 @@ static struct block2mtd_dev *add_device(
dev->mtd.read = block2mtd_read;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;
@ -875,10 +875,10 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
part->name = dev->mtd.name;
Index: linux-2.6.23-rc6/drivers/mtd/mtdchar.c
Index: linux-2.6.25.1/drivers/mtd/mtdchar.c
===================================================================
--- linux-2.6.23-rc6.orig/drivers/mtd/mtdchar.c 2007-09-21 16:23:54.000000000 +0800
+++ linux-2.6.23-rc6/drivers/mtd/mtdchar.c 2007-09-21 16:23:59.000000000 +0800
--- linux-2.6.25.1.orig/drivers/mtd/mtdchar.c
+++ linux-2.6.25.1/drivers/mtd/mtdchar.c
@@ -17,6 +17,7 @@
#include <linux/mtd/mtd.h>
@ -887,7 +887,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/mtdchar.c
#include <asm/uaccess.h>
@@ -753,6 +754,13 @@
@@ -756,6 +757,13 @@ static int mtd_ioctl(struct inode *inode
file->f_pos = 0;
break;
}
@ -901,11 +901,11 @@ Index: linux-2.6.23-rc6/drivers/mtd/mtdchar.c
default:
ret = -ENOTTY;
Index: linux-2.6.23-rc6/include/linux/mtd/mtd.h
Index: linux-2.6.25.1/include/linux/mtd/mtd.h
===================================================================
--- linux-2.6.23-rc6.orig/include/linux/mtd/mtd.h 2007-09-21 16:23:54.000000000 +0800
+++ linux-2.6.23-rc6/include/linux/mtd/mtd.h 2007-09-21 16:23:59.000000000 +0800
@@ -98,6 +98,7 @@
--- linux-2.6.25.1.orig/include/linux/mtd/mtd.h
+++ linux-2.6.25.1/include/linux/mtd/mtd.h
@@ -98,6 +98,7 @@ struct mtd_oob_ops {
uint8_t *oobbuf;
};
@ -913,7 +913,7 @@ Index: linux-2.6.23-rc6/include/linux/mtd/mtd.h
struct mtd_info {
u_char type;
u_int32_t flags;
@@ -195,6 +196,9 @@
@@ -211,6 +212,9 @@ struct mtd_info {
struct module *owner;
int usecount;
@ -923,10 +923,10 @@ Index: linux-2.6.23-rc6/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.23-rc6/include/linux/mtd/partitions.h
Index: linux-2.6.25.1/include/linux/mtd/partitions.h
===================================================================
--- linux-2.6.23-rc6.orig/include/linux/mtd/partitions.h 2007-09-21 16:23:54.000000000 +0800
+++ linux-2.6.23-rc6/include/linux/mtd/partitions.h 2007-09-21 16:23:59.000000000 +0800
--- linux-2.6.25.1.orig/include/linux/mtd/partitions.h
+++ linux-2.6.25.1/include/linux/mtd/partitions.h
@@ -36,6 +36,7 @@
* erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
*/
@ -935,7 +935,7 @@ Index: linux-2.6.23-rc6/include/linux/mtd/partitions.h
struct mtd_partition {
char *name; /* identifier string */
u_int32_t size; /* partition size */
@@ -43,6 +44,7 @@
@@ -43,6 +44,7 @@ struct mtd_partition {
u_int32_t mask_flags; /* master MTD flags to mask out for this partition */
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 +943,7 @@ Index: linux-2.6.23-rc6/include/linux/mtd/partitions.h
};
#define MTDPART_OFS_NXTBLK (-2)
@@ -52,6 +54,7 @@
@@ -52,6 +54,7 @@ struct mtd_partition {
int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
int del_mtd_partitions(struct mtd_info *);
@ -951,11 +951,11 @@ Index: linux-2.6.23-rc6/include/linux/mtd/partitions.h
/*
* Functions dealing with the various ways of partitioning the space
Index: linux-2.6.23-rc6/include/mtd/mtd-abi.h
Index: linux-2.6.25.1/include/mtd/mtd-abi.h
===================================================================
--- linux-2.6.23-rc6.orig/include/mtd/mtd-abi.h 2007-09-21 16:23:54.000000000 +0800
+++ linux-2.6.23-rc6/include/mtd/mtd-abi.h 2007-09-21 16:23:59.000000000 +0800
@@ -95,6 +95,7 @@
--- linux-2.6.25.1.orig/include/mtd/mtd-abi.h
+++ linux-2.6.25.1/include/mtd/mtd-abi.h
@@ -95,6 +95,7 @@ struct otp_info {
#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,8 @@
Index: linux-2.6.23.1/drivers/mtd/redboot.c
Index: linux-2.6.25.1/drivers/mtd/redboot.c
===================================================================
--- linux-2.6.23.1.orig/drivers/mtd/redboot.c 2008-01-26 01:43:10.742362738 +0100
+++ linux-2.6.23.1/drivers/mtd/redboot.c 2008-01-26 01:47:24.432819736 +0100
@@ -236,14 +236,21 @@
--- linux-2.6.25.1.orig/drivers/mtd/redboot.c
+++ linux-2.6.25.1/drivers/mtd/redboot.c
@@ -251,14 +251,21 @@ static int parse_redboot_partitions(stru
#endif
names += strlen(names)+1;

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

@ -1,6 +1,8 @@
--- linux-2.6.24-rc5/net/netfilter/Kconfig 2007-12-11 23:43:21.000000000 -0600
+++ linux-2.6.24-rc5-layer7/net/netfilter/Kconfig 2007-12-11 23:35:12.000000000 -0600
@@ -633,6 +633,27 @@ config NETFILTER_XT_MATCH_STATE
Index: linux-2.6.25.1/net/netfilter/Kconfig
===================================================================
--- linux-2.6.25.1.orig/net/netfilter/Kconfig
+++ linux-2.6.25.1/net/netfilter/Kconfig
@@ -735,6 +735,27 @@ config NETFILTER_XT_MATCH_STATE
To compile it as a module, choose M here. If unsure, say N.
@ -28,9 +30,11 @@
config NETFILTER_XT_MATCH_STATISTIC
tristate '"statistic" match support'
depends on NETFILTER_XTABLES
--- linux-2.6.24-rc5/net/netfilter/Makefile 2007-12-11 23:43:21.000000000 -0600
+++ linux-2.6.24-rc5-layer7/net/netfilter/Makefile 2007-12-11 23:35:12.000000000 -0600
@@ -73,6 +73,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_QUOTA) +
Index: linux-2.6.25.1/net/netfilter/Makefile
===================================================================
--- linux-2.6.25.1.orig/net/netfilter/Makefile
+++ linux-2.6.25.1/net/netfilter/Makefile
@@ -77,6 +77,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RATEEST)
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
@ -38,8 +42,10 @@
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
--- linux-2.6.24-rc5/net/netfilter/xt_layer7.c 1969-12-31 18:00:00.000000000 -0600
+++ linux-2.6.24-rc5-layer7/net/netfilter/xt_layer7.c 2007-12-11 23:55:46.000000000 -0600
Index: linux-2.6.25.1/net/netfilter/xt_layer7.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/net/netfilter/xt_layer7.c
@@ -0,0 +1,634 @@
+/*
+ Kernel module to match application layer (OSI layer 7) data in connections.
@ -675,8 +681,10 @@
+
+module_init(xt_layer7_init);
+module_exit(xt_layer7_fini);
--- linux-2.6.24-rc5/net/netfilter/regexp/regexp.c 1969-12-31 18:00:00.000000000 -0600
+++ linux-2.6.24-rc5-layer7/net/netfilter/regexp/regexp.c 2007-12-11 23:35:12.000000000 -0600
Index: linux-2.6.25.1/net/netfilter/regexp/regexp.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/net/netfilter/regexp/regexp.c
@@ -0,0 +1,1197 @@
+/*
+ * regcomp and regexec -- regsub and regerror are elsewhere
@ -1875,8 +1883,10 @@
+#endif
+
+
--- linux-2.6.24-rc5/net/netfilter/regexp/regexp.h 1969-12-31 18:00:00.000000000 -0600
+++ linux-2.6.24-rc5-layer7/net/netfilter/regexp/regexp.h 2007-12-11 23:35:12.000000000 -0600
Index: linux-2.6.25.1/net/netfilter/regexp/regexp.h
===================================================================
--- /dev/null
+++ linux-2.6.25.1/net/netfilter/regexp/regexp.h
@@ -0,0 +1,41 @@
+/*
+ * Definitions etc. for regexp(3) routines.
@ -1919,16 +1929,20 @@
+void regerror(char *s);
+
+#endif
--- linux-2.6.24-rc5/net/netfilter/regexp/regmagic.h 1969-12-31 18:00:00.000000000 -0600
+++ linux-2.6.24-rc5-layer7/net/netfilter/regexp/regmagic.h 2007-12-11 23:35:12.000000000 -0600
Index: linux-2.6.25.1/net/netfilter/regexp/regmagic.h
===================================================================
--- /dev/null
+++ linux-2.6.25.1/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
--- linux-2.6.24-rc5/net/netfilter/regexp/regsub.c 1969-12-31 18:00:00.000000000 -0600
+++ linux-2.6.24-rc5-layer7/net/netfilter/regexp/regsub.c 2007-12-11 23:35:12.000000000 -0600
Index: linux-2.6.25.1/net/netfilter/regexp/regsub.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/net/netfilter/regexp/regsub.c
@@ -0,0 +1,95 @@
+/*
+ * regsub
@ -2025,9 +2039,11 @@
+ }
+ *dst++ = '\0';
+}
--- linux-2.6.24-rc5/net/netfilter/nf_conntrack_core.c 2007-12-11 23:43:21.000000000 -0600
+++ linux-2.6.24-rc5-layer7/net/netfilter/nf_conntrack_core.c 2007-12-11 23:35:12.000000000 -0600
@@ -206,6 +206,14 @@ destroy_conntrack(struct nf_conntrack *n
Index: linux-2.6.25.1/net/netfilter/nf_conntrack_core.c
===================================================================
--- linux-2.6.25.1.orig/net/netfilter/nf_conntrack_core.c
+++ linux-2.6.25.1/net/netfilter/nf_conntrack_core.c
@@ -210,6 +210,14 @@ destroy_conntrack(struct nf_conntrack *n
* too. */
nf_ct_remove_expectations(ct);
@ -2042,9 +2058,11 @@
/* 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));
--- linux-2.6.24-rc5/net/netfilter/nf_conntrack_standalone.c 2007-12-11 23:43:22.000000000 -0600
+++ linux-2.6.24-rc5-layer7/net/netfilter/nf_conntrack_standalone.c 2007-12-11 23:35:12.000000000 -0600
@@ -180,7 +180,12 @@ static int ct_seq_show(struct seq_file *
Index: linux-2.6.25.1/net/netfilter/nf_conntrack_standalone.c
===================================================================
--- linux-2.6.25.1.orig/net/netfilter/nf_conntrack_standalone.c
+++ linux-2.6.25.1/net/netfilter/nf_conntrack_standalone.c
@@ -181,7 +181,12 @@ static int ct_seq_show(struct seq_file *
return -ENOSPC;
#endif
@ -2058,8 +2076,10 @@
return -ENOSPC;
return 0;
--- linux-2.6.24-rc5/include/net/netfilter/nf_conntrack.h 2007-12-11 23:43:16.000000000 -0600
+++ linux-2.6.24-rc5-layer7/include/net/netfilter/nf_conntrack.h 2007-12-11 23:35:12.000000000 -0600
Index: linux-2.6.25.1/include/net/netfilter/nf_conntrack.h
===================================================================
--- linux-2.6.25.1.orig/include/net/netfilter/nf_conntrack.h
+++ linux-2.6.25.1/include/net/netfilter/nf_conntrack.h
@@ -124,6 +124,22 @@ struct nf_conn
u_int32_t secmark;
#endif
@ -2083,8 +2103,10 @@
/* Storage reserved for other modules: */
union nf_conntrack_proto proto;
--- linux-2.6.24-rc5/include/linux/netfilter/xt_layer7.h 1969-12-31 18:00:00.000000000 -0600
+++ linux-2.6.24-rc5-layer7/include/linux/netfilter/xt_layer7.h 2007-12-11 23:35:12.000000000 -0600
Index: linux-2.6.25.1/include/linux/netfilter/xt_layer7.h
===================================================================
--- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter/xt_layer7.h
@@ -0,0 +1,13 @@
+#ifndef _XT_LAYER7_H
+#define _XT_LAYER7_H

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

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

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

@ -1,7 +1,7 @@
Index: linux-2.6.23.1/include/linux/netfilter_ipv4/ipt_ipp2p.h
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_ipp2p.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23.1/include/linux/netfilter_ipv4/ipt_ipp2p.h 2007-11-19 18:22:19.000000000 -0600
--- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_ipp2p.h
@@ -0,0 +1,31 @@
+#ifndef __IPT_IPP2P_H
+#define __IPT_IPP2P_H
@ -34,10 +34,10 @@ Index: linux-2.6.23.1/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.23.1/net/ipv4/netfilter/ipt_ipp2p.c
Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_ipp2p.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23.1/net/ipv4/netfilter/ipt_ipp2p.c 2007-11-19 18:22:19.000000000 -0600
--- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ipt_ipp2p.c
@@ -0,0 +1,856 @@
+#if defined(MODVERSIONS)
+#include <linux/modversions.h>
@ -895,11 +895,11 @@ Index: linux-2.6.23.1/net/ipv4/netfilter/ipt_ipp2p.c
+module_exit(fini);
+
+
Index: linux-2.6.23.1/net/ipv4/netfilter/Kconfig
Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig
===================================================================
--- linux-2.6.23.1.orig/net/ipv4/netfilter/Kconfig 2007-11-19 18:21:55.000000000 -0600
+++ linux-2.6.23.1/net/ipv4/netfilter/Kconfig 2007-11-19 18:22:19.000000000 -0600
@@ -63,6 +63,12 @@
--- linux-2.6.25.1.orig/net/ipv4/netfilter/Kconfig
+++ linux-2.6.25.1/net/ipv4/netfilter/Kconfig
@@ -57,6 +57,12 @@ config IP_NF_IPTABLES
To compile it as a module, choose M here. If unsure, say N.
# The matches.
@ -912,16 +912,16 @@ Index: linux-2.6.23.1/net/ipv4/netfilter/Kconfig
config IP_NF_MATCH_RECENT
tristate '"recent" match support'
depends on IP_NF_IPTABLES
Index: linux-2.6.23.1/net/ipv4/netfilter/Makefile
Index: linux-2.6.25.1/net/ipv4/netfilter/Makefile
===================================================================
--- linux-2.6.23.1.orig/net/ipv4/netfilter/Makefile 2007-11-19 18:21:55.000000000 -0600
+++ linux-2.6.23.1/net/ipv4/netfilter/Makefile 2007-11-19 18:23:45.000000000 -0600
@@ -50,6 +50,8 @@
--- linux-2.6.25.1.orig/net/ipv4/netfilter/Makefile
+++ linux-2.6.25.1/net/ipv4/netfilter/Makefile
@@ -47,6 +47,8 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn
obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
obj-$(CONFIG_IP_NF_MATCH_ADDRTYPE) += ipt_addrtype.o
+obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
+
# targets
obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o

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

@ -1,6 +1,7 @@
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set.h
--- linux-2.6.23/include/linux/netfilter_ipv4/ip_set.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set.h 2007-10-12 11:52:37.000000000 +0200
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set.h
===================================================================
--- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set.h
@@ -0,0 +1,498 @@
+#ifndef _IP_SET_H
+#define _IP_SET_H
@ -500,9 +501,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set.h linux-2.6.23.pom2pa
+#endif /* __KERNEL__ */
+
+#endif /*_IP_SET_H*/
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iphash.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iphash.h
--- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iphash.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iphash.h 2007-10-12 11:52:37.000000000 +0200
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iphash.h
===================================================================
--- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iphash.h
@@ -0,0 +1,30 @@
+#ifndef __IP_SET_IPHASH_H
+#define __IP_SET_IPHASH_H
@ -534,9 +536,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iphash.h linux-2.6.23
+};
+
+#endif /* __IP_SET_IPHASH_H */
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_ipmap.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_ipmap.h
--- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_ipmap.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_ipmap.h 2007-10-12 11:52:37.000000000 +0200
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_ipmap.h
===================================================================
--- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_ipmap.h
@@ -0,0 +1,56 @@
+#ifndef __IP_SET_IPMAP_H
+#define __IP_SET_IPMAP_H
@ -594,9 +597,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_ipmap.h linux-2.6.23.
+}
+
+#endif /* __IP_SET_IPMAP_H */
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_ipporthash.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_ipporthash.h
--- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_ipporthash.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_ipporthash.h 2007-10-12 11:52:37.000000000 +0200
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_ipporthash.h
===================================================================
--- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_ipporthash.h
@@ -0,0 +1,34 @@
+#ifndef __IP_SET_IPPORTHASH_H
+#define __IP_SET_IPPORTHASH_H
@ -632,9 +636,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_ipporthash.h linux-2.
+};
+
+#endif /* __IP_SET_IPPORTHASH_H */
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iptree.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iptree.h
--- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iptree.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iptree.h 2007-10-12 11:52:37.000000000 +0200
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iptree.h
===================================================================
--- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iptree.h
@@ -0,0 +1,40 @@
+#ifndef __IP_SET_IPTREE_H
+#define __IP_SET_IPTREE_H
@ -676,9 +681,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iptree.h linux-2.6.23
+};
+
+#endif /* __IP_SET_IPTREE_H */
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iptreemap.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iptreemap.h
--- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iptreemap.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iptreemap.h 2007-10-12 11:52:37.000000000 +0200
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iptreemap.h
===================================================================
--- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iptreemap.h
@@ -0,0 +1,40 @@
+#ifndef __IP_SET_IPTREEMAP_H
+#define __IP_SET_IPTREEMAP_H
@ -720,9 +726,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iptreemap.h linux-2.6
+};
+
+#endif /* __IP_SET_IPTREEMAP_H */
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_jhash.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_jhash.h
--- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_jhash.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_jhash.h 2007-10-12 11:52:37.000000000 +0200
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_jhash.h
===================================================================
--- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_jhash.h
@@ -0,0 +1,148 @@
+#ifndef _LINUX_IPSET_JHASH_H
+#define _LINUX_IPSET_JHASH_H
@ -872,9 +879,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_jhash.h linux-2.6.23.
+}
+
+#endif /* _LINUX_IPSET_JHASH_H */
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_macipmap.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_macipmap.h
--- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_macipmap.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_macipmap.h 2007-10-12 11:52:37.000000000 +0200
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_macipmap.h
===================================================================
--- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_macipmap.h
@@ -0,0 +1,38 @@
+#ifndef __IP_SET_MACIPMAP_H
+#define __IP_SET_MACIPMAP_H
@ -914,9 +922,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_macipmap.h linux-2.6.
+};
+
+#endif /* __IP_SET_MACIPMAP_H */
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_malloc.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_malloc.h
--- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_malloc.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_malloc.h 2007-10-12 11:52:37.000000000 +0200
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_malloc.h
===================================================================
--- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_malloc.h
@@ -0,0 +1,116 @@
+#ifndef _IP_SET_MALLOC_H
+#define _IP_SET_MALLOC_H
@ -1034,9 +1043,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_malloc.h linux-2.6.23
+#endif /* __KERNEL__ */
+
+#endif /*_IP_SET_MALLOC_H*/
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_nethash.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_nethash.h
--- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_nethash.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_nethash.h 2007-10-12 11:52:37.000000000 +0200
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_nethash.h
===================================================================
--- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_nethash.h
@@ -0,0 +1,55 @@
+#ifndef __IP_SET_NETHASH_H
+#define __IP_SET_NETHASH_H
@ -1093,9 +1103,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_nethash.h linux-2.6.2
+}
+
+#endif /* __IP_SET_NETHASH_H */
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_portmap.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_portmap.h
--- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_portmap.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_portmap.h 2007-10-12 11:52:37.000000000 +0200
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_portmap.h
===================================================================
--- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_portmap.h
@@ -0,0 +1,25 @@
+#ifndef __IP_SET_PORTMAP_H
+#define __IP_SET_PORTMAP_H
@ -1122,9 +1133,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_portmap.h linux-2.6.2
+};
+
+#endif /* __IP_SET_PORTMAP_H */
diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ipt_set.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ipt_set.h
--- linux-2.6.23/include/linux/netfilter_ipv4/ipt_set.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ipt_set.h 2007-10-12 11:52:37.000000000 +0200
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_set.h
===================================================================
--- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_set.h
@@ -0,0 +1,21 @@
+#ifndef _IPT_SET_H
+#define _IPT_SET_H
@ -1147,9 +1159,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ipt_set.h linux-2.6.23.pom2p
+};
+
+#endif /*_IPT_SET_H*/
diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set.c
--- linux-2.6.23/net/ipv4/netfilter/ip_set.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set.c 2007-10-12 11:52:37.000000000 +0200
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set.c
@@ -0,0 +1,2003 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de>
@ -3154,9 +3167,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set.c linux-2.6.23.pom2patch.set/ne
+
+module_init(ip_set_init);
+module_exit(ip_set_fini);
diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_iphash.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_iphash.c
--- linux-2.6.23/net/ipv4/netfilter/ip_set_iphash.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_iphash.c 2007-10-12 11:52:37.000000000 +0200
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_iphash.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_iphash.c
@@ -0,0 +1,429 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ *
@ -3587,9 +3601,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_iphash.c linux-2.6.23.pom2patch
+
+module_init(ip_set_iphash_init);
+module_exit(ip_set_iphash_fini);
diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_ipmap.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_ipmap.c
--- linux-2.6.23/net/ipv4/netfilter/ip_set_ipmap.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_ipmap.c 2007-10-12 11:52:37.000000000 +0200
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_ipmap.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/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>
@ -3927,9 +3942,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_ipmap.c linux-2.6.23.pom2patch.
+
+module_init(ip_set_ipmap_init);
+module_exit(ip_set_ipmap_fini);
diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_ipporthash.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_ipporthash.c
--- linux-2.6.23/net/ipv4/netfilter/ip_set_ipporthash.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_ipporthash.c 2007-10-12 11:52:37.000000000 +0200
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_ipporthash.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_ipporthash.c
@@ -0,0 +1,581 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ *
@ -4512,9 +4528,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_ipporthash.c linux-2.6.23.pom2p
+
+module_init(ip_set_ipporthash_init);
+module_exit(ip_set_ipporthash_fini);
diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_iptree.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_iptree.c
--- linux-2.6.23/net/ipv4/netfilter/ip_set_iptree.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_iptree.c 2007-10-12 11:52:37.000000000 +0200
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_iptree.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_iptree.c
@@ -0,0 +1,612 @@
+/* Copyright (C) 2005 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ *
@ -5128,9 +5145,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_iptree.c linux-2.6.23.pom2patch
+
+module_init(ip_set_iptree_init);
+module_exit(ip_set_iptree_fini);
diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_iptreemap.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_iptreemap.c
--- linux-2.6.23/net/ipv4/netfilter/ip_set_iptreemap.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_iptreemap.c 2007-10-12 11:52:37.000000000 +0200
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_iptreemap.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_iptreemap.c
@@ -0,0 +1,829 @@
+/* Copyright (C) 2007 Sven Wegener <sven.wegener@stealer.net>
+ *
@ -5961,9 +5979,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_iptreemap.c linux-2.6.23.pom2pa
+
+module_init(ip_set_iptreemap_init);
+module_exit(ip_set_iptreemap_fini);
diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_macipmap.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_macipmap.c
--- linux-2.6.23/net/ipv4/netfilter/ip_set_macipmap.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_macipmap.c 2007-10-12 11:52:37.000000000 +0200
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_macipmap.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/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>
@ -6340,9 +6359,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_macipmap.c linux-2.6.23.pom2pat
+
+module_init(ip_set_macipmap_init);
+module_exit(ip_set_macipmap_fini);
diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_nethash.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_nethash.c
--- linux-2.6.23/net/ipv4/netfilter/ip_set_nethash.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_nethash.c 2007-10-12 11:52:37.000000000 +0200
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_nethash.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_nethash.c
@@ -0,0 +1,497 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ *
@ -6841,9 +6861,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_nethash.c linux-2.6.23.pom2patc
+
+module_init(ip_set_nethash_init);
+module_exit(ip_set_nethash_fini);
diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_portmap.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_portmap.c
--- linux-2.6.23/net/ipv4/netfilter/ip_set_portmap.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_portmap.c 2007-10-12 11:52:37.000000000 +0200
Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_portmap.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_portmap.c
@@ -0,0 +1,346 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ *
@ -7191,9 +7212,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_portmap.c linux-2.6.23.pom2patc
+
+module_init(ip_set_portmap_init);
+module_exit(ip_set_portmap_fini);
diff -Nru linux-2.6.23/net/ipv4/netfilter/ipt_set.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ipt_set.c
--- linux-2.6.23/net/ipv4/netfilter/ipt_set.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ipt_set.c 2007-10-12 11:52:38.000000000 +0200
Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_set.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ipt_set.c
@@ -0,0 +1,160 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de>
@ -7355,9 +7377,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ipt_set.c linux-2.6.23.pom2patch.set/n
+
+module_init(ipt_ipset_init);
+module_exit(ipt_ipset_fini);
diff -Nru linux-2.6.23/net/ipv4/netfilter/ipt_SET.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ipt_SET.c
--- linux-2.6.23/net/ipv4/netfilter/ipt_SET.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ipt_SET.c 2007-10-12 11:52:37.000000000 +0200
Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_SET.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ipt_SET.c
@@ -0,0 +1,179 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de>
@ -7538,10 +7561,11 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ipt_SET.c linux-2.6.23.pom2patch.set/n
+
+module_init(ipt_SET_init);
+module_exit(ipt_SET_fini);
diff -Nru linux-2.6.23/net/ipv4/netfilter/Kconfig linux-2.6.23.pom2patch.set/net/ipv4/netfilter/Kconfig
--- linux-2.6.23/net/ipv4/netfilter/Kconfig 2007-10-09 22:31:38.000000000 +0200
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/Kconfig 2007-10-12 11:52:38.000000000 +0200
@@ -402,5 +402,122 @@
Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig
===================================================================
--- linux-2.6.25.1.orig/net/ipv4/netfilter/Kconfig
+++ linux-2.6.25.1/net/ipv4/netfilter/Kconfig
@@ -385,5 +385,122 @@ config IP_NF_ARP_MANGLE
Allows altering the ARP packet payload: source and destination
hardware and network addresses.
@ -7664,19 +7688,20 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/Kconfig linux-2.6.23.pom2patch.set/net
+
endmenu
diff -Nru linux-2.6.23/net/ipv4/netfilter/Makefile linux-2.6.23.pom2patch.set/net/ipv4/netfilter/Makefile
--- linux-2.6.23/net/ipv4/netfilter/Makefile 2007-10-09 22:31:38.000000000 +0200
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/Makefile 2007-10-12 11:52:38.000000000 +0200
@@ -49,6 +49,7 @@
Index: linux-2.6.25.1/net/ipv4/netfilter/Makefile
===================================================================
--- linux-2.6.25.1.orig/net/ipv4/netfilter/Makefile
+++ linux-2.6.25.1/net/ipv4/netfilter/Makefile
@@ -46,6 +46,7 @@ obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o
obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o
obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
+obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o
obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
@@ -64,6 +65,18 @@
obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
@@ -59,6 +60,18 @@ obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += i
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
+obj-$(CONFIG_IP_NF_TARGET_SET) += ipt_SET.o

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

@ -1,7 +1,7 @@
Index: linux-2.6.23-rc6/include/linux/netfilter_ipv4/ipt_time.h
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_time.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23-rc6/include/linux/netfilter_ipv4/ipt_time.h 2007-09-21 16:24:02.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_time.h
@@ -0,0 +1,18 @@
+#ifndef __ipt_time_h_included__
+#define __ipt_time_h_included__
@ -21,10 +21,10 @@ Index: linux-2.6.23-rc6/include/linux/netfilter_ipv4/ipt_time.h
+
+
+#endif /* __ipt_time_h_included__ */
Index: linux-2.6.23-rc6/net/ipv4/netfilter/ipt_time.c
Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_time.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23-rc6/net/ipv4/netfilter/ipt_time.c 2007-09-21 16:24:02.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ipt_time.c
@@ -0,0 +1,180 @@
+/*
+ This is a module which is used for time matching
@ -206,13 +206,13 @@ Index: linux-2.6.23-rc6/net/ipv4/netfilter/ipt_time.c
+ r->tm_mon=i;
+ r->tm_mday=work-__spm[i]+1;
+}
Index: linux-2.6.23-rc6/net/ipv4/netfilter/Kconfig
Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig
===================================================================
--- linux-2.6.23-rc6.orig/net/ipv4/netfilter/Kconfig 2007-09-21 16:24:01.000000000 +0800
+++ linux-2.6.23-rc6/net/ipv4/netfilter/Kconfig 2007-09-21 16:24:02.000000000 +0800
@@ -96,6 +96,22 @@
To compile it as a module, choose M here. If unsure, say N.
--- linux-2.6.25.1.orig/net/ipv4/netfilter/Kconfig
+++ linux-2.6.25.1/net/ipv4/netfilter/Kconfig
@@ -63,6 +63,22 @@ config IP_NF_MATCH_IPP2P
help
Module for matching traffic of various Peer-to-Peer applications
+
+config IP_NF_MATCH_TIME
@ -231,14 +231,14 @@ Index: linux-2.6.23-rc6/net/ipv4/netfilter/Kconfig
+
+
config IP_NF_MATCH_RECENT
tristate "recent match support"
tristate '"recent" match support'
depends on IP_NF_IPTABLES
Index: linux-2.6.23-rc6/net/ipv4/netfilter/Makefile
Index: linux-2.6.25.1/net/ipv4/netfilter/Makefile
===================================================================
--- linux-2.6.23-rc6.orig/net/ipv4/netfilter/Makefile 2007-09-21 16:24:01.000000000 +0800
+++ linux-2.6.23-rc6/net/ipv4/netfilter/Makefile 2007-09-21 16:24:02.000000000 +0800
@@ -50,6 +50,7 @@
obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o
--- linux-2.6.25.1.orig/net/ipv4/netfilter/Makefile
+++ linux-2.6.25.1/net/ipv4/netfilter/Makefile
@@ -47,6 +47,7 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn
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
+obj-$(CONFIG_IP_NF_MATCH_TIME) += ipt_time.o

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

@ -1,6 +1,7 @@
diff -Naurw 2.6.24/drivers/net/imq.c 2.6.24.imq/drivers/net/imq.c
--- 2.6.24/drivers/net/imq.c 1969-12-31 21:00:00.000000000 -0300
+++ 2.6.24.imq/drivers/net/imq.c 2008-01-26 14:52:43.000000000 -0300
Index: linux-2.6.25.1/drivers/net/imq.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/drivers/net/imq.c
@@ -0,0 +1,409 @@
+/*
+ * Pseudo-driver for the intermediate queue device.
@ -411,10 +412,11 @@ diff -Naurw 2.6.24/drivers/net/imq.c 2.6.24.imq/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");
diff -Naurw 2.6.24/drivers/net/Kconfig 2.6.24.imq/drivers/net/Kconfig
--- 2.6.24/drivers/net/Kconfig 2008-01-24 19:58:37.000000000 -0300
+++ 2.6.24.imq/drivers/net/Kconfig 2008-01-26 15:00:11.000000000 -0300
@@ -112,6 +112,129 @@
Index: linux-2.6.25.1/drivers/net/Kconfig
===================================================================
--- linux-2.6.25.1.orig/drivers/net/Kconfig
+++ linux-2.6.25.1/drivers/net/Kconfig
@@ -117,6 +117,129 @@ config EQUALIZER
To compile this driver as a module, choose M here: the module
will be called eql. If unsure, say N.
@ -544,10 +546,11 @@ diff -Naurw 2.6.24/drivers/net/Kconfig 2.6.24.imq/drivers/net/Kconfig
config TUN
tristate "Universal TUN/TAP device driver support"
select CRC32
diff -Naurw 2.6.24/drivers/net/Makefile 2.6.24.imq/drivers/net/Makefile
--- 2.6.24/drivers/net/Makefile 2008-01-24 19:58:37.000000000 -0300
+++ 2.6.24.imq/drivers/net/Makefile 2008-01-26 15:00:11.000000000 -0300
@@ -139,6 +139,7 @@
Index: linux-2.6.25.1/drivers/net/Makefile
===================================================================
--- linux-2.6.25.1.orig/drivers/net/Makefile
+++ linux-2.6.25.1/drivers/net/Makefile
@@ -143,6 +143,7 @@ obj-$(CONFIG_SLHC) += slhc.o
obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
obj-$(CONFIG_DUMMY) += dummy.o
@ -555,9 +558,10 @@ diff -Naurw 2.6.24/drivers/net/Makefile 2.6.24.imq/drivers/net/Makefile
obj-$(CONFIG_IFB) += ifb.o
obj-$(CONFIG_MACVLAN) += macvlan.o
obj-$(CONFIG_DE600) += de600.o
diff -Naurw 2.6.24/include/linux/imq.h 2.6.24.imq/include/linux/imq.h
--- 2.6.24/include/linux/imq.h 1969-12-31 21:00:00.000000000 -0300
+++ 2.6.24.imq/include/linux/imq.h 2008-01-26 15:00:11.000000000 -0300
Index: linux-2.6.25.1/include/linux/imq.h
===================================================================
--- /dev/null
+++ linux-2.6.25.1/include/linux/imq.h
@@ -0,0 +1,9 @@
+#ifndef _IMQ_H
+#define _IMQ_H
@ -568,9 +572,10 @@ diff -Naurw 2.6.24/include/linux/imq.h 2.6.24.imq/include/linux/imq.h
+#define IMQ_F_ENQUEUE 0x80
+
+#endif /* _IMQ_H */
diff -Naurw 2.6.24/include/linux/netfilter_ipv4/ipt_IMQ.h 2.6.24.imq/include/linux/netfilter_ipv4/ipt_IMQ.h
--- 2.6.24/include/linux/netfilter_ipv4/ipt_IMQ.h 1969-12-31 21:00:00.000000000 -0300
+++ 2.6.24.imq/include/linux/netfilter_ipv4/ipt_IMQ.h 2008-01-26 15:00:11.000000000 -0300
Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_IMQ.h
===================================================================
--- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_IMQ.h
@@ -0,0 +1,8 @@
+#ifndef _IPT_IMQ_H
+#define _IPT_IMQ_H
@ -580,9 +585,10 @@ diff -Naurw 2.6.24/include/linux/netfilter_ipv4/ipt_IMQ.h 2.6.24.imq/include/lin
+};
+
+#endif /* _IPT_IMQ_H */
diff -Naurw 2.6.24/include/linux/netfilter_ipv6/ip6t_IMQ.h 2.6.24.imq/include/linux/netfilter_ipv6/ip6t_IMQ.h
--- 2.6.24/include/linux/netfilter_ipv6/ip6t_IMQ.h 1969-12-31 21:00:00.000000000 -0300
+++ 2.6.24.imq/include/linux/netfilter_ipv6/ip6t_IMQ.h 2008-01-26 15:00:11.000000000 -0300
Index: linux-2.6.25.1/include/linux/netfilter_ipv6/ip6t_IMQ.h
===================================================================
--- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_ipv6/ip6t_IMQ.h
@@ -0,0 +1,8 @@
+#ifndef _IP6T_IMQ_H
+#define _IP6T_IMQ_H
@ -592,10 +598,11 @@ diff -Naurw 2.6.24/include/linux/netfilter_ipv6/ip6t_IMQ.h 2.6.24.imq/include/li
+};
+
+#endif /* _IP6T_IMQ_H */
diff -Naurw 2.6.24/include/linux/skbuff.h 2.6.24.imq/include/linux/skbuff.h
--- 2.6.24/include/linux/skbuff.h 2008-01-24 19:58:37.000000000 -0300
+++ 2.6.24.imq/include/linux/skbuff.h 2008-01-26 15:00:11.000000000 -0300
@@ -295,6 +295,10 @@
Index: linux-2.6.25.1/include/linux/skbuff.h
===================================================================
--- linux-2.6.25.1.orig/include/linux/skbuff.h
+++ linux-2.6.25.1/include/linux/skbuff.h
@@ -296,6 +296,10 @@ struct sk_buff {
struct nf_conntrack *nfct;
struct sk_buff *nfct_reasm;
#endif
@ -606,7 +613,7 @@ diff -Naurw 2.6.24/include/linux/skbuff.h 2.6.24.imq/include/linux/skbuff.h
#ifdef CONFIG_BRIDGE_NETFILTER
struct nf_bridge_info *nf_bridge;
#endif
@@ -1728,6 +1732,10 @@
@@ -1736,6 +1740,10 @@ static inline void __nf_copy(struct sk_b
dst->nfct_reasm = src->nfct_reasm;
nf_conntrack_get_reasm(src->nfct_reasm);
#endif
@ -617,9 +624,10 @@ diff -Naurw 2.6.24/include/linux/skbuff.h 2.6.24.imq/include/linux/skbuff.h
#ifdef CONFIG_BRIDGE_NETFILTER
dst->nf_bridge = src->nf_bridge;
nf_bridge_get(src->nf_bridge);
diff -Naurw 2.6.24/net/core/dev.c 2.6.24.imq/net/core/dev.c
--- 2.6.24/net/core/dev.c 2008-01-24 19:58:37.000000000 -0300
+++ 2.6.24.imq/net/core/dev.c 2008-01-26 15:00:11.000000000 -0300
Index: linux-2.6.25.1/net/core/dev.c
===================================================================
--- linux-2.6.25.1.orig/net/core/dev.c
+++ linux-2.6.25.1/net/core/dev.c
@@ -95,6 +95,9 @@
#include <net/net_namespace.h>
#include <net/sock.h>
@ -630,7 +638,7 @@ diff -Naurw 2.6.24/net/core/dev.c 2.6.24.imq/net/core/dev.c
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/stat.h>
@@ -1533,7 +1536,11 @@
@@ -1537,7 +1540,11 @@ static int dev_gso_segment(struct sk_buf
int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
if (likely(!skb->next)) {
@ -643,9 +651,10 @@ diff -Naurw 2.6.24/net/core/dev.c 2.6.24.imq/net/core/dev.c
dev_queue_xmit_nit(skb, dev);
if (netif_needs_gso(dev, skb)) {
diff -Naurw 2.6.24/net/ipv4/netfilter/ipt_IMQ.c 2.6.24.imq/net/ipv4/netfilter/ipt_IMQ.c
--- 2.6.24/net/ipv4/netfilter/ipt_IMQ.c 1969-12-31 21:00:00.000000000 -0300
+++ 2.6.24.imq/net/ipv4/netfilter/ipt_IMQ.c 2008-01-26 15:00:11.000000000 -0300
Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_IMQ.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/ipt_IMQ.c
@@ -0,0 +1,69 @@
+/*
+ * This target marks packets to be enqueued to an imq device
@ -716,10 +725,11 @@ diff -Naurw 2.6.24/net/ipv4/netfilter/ipt_IMQ.c 2.6.24.imq/net/ipv4/netfilter/ip
+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");
diff -Naurw 2.6.24/net/ipv4/netfilter/Kconfig 2.6.24.imq/net/ipv4/netfilter/Kconfig
--- 2.6.24/net/ipv4/netfilter/Kconfig 2008-01-24 19:58:37.000000000 -0300
+++ 2.6.24.imq/net/ipv4/netfilter/Kconfig 2008-01-26 15:00:11.000000000 -0300
@@ -311,6 +311,17 @@
Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig
===================================================================
--- linux-2.6.25.1.orig/net/ipv4/netfilter/Kconfig
+++ linux-2.6.25.1/net/ipv4/netfilter/Kconfig
@@ -315,6 +315,17 @@ config IP_NF_MANGLE
To compile it as a module, choose M here. If unsure, say N.
@ -737,10 +747,11 @@ diff -Naurw 2.6.24/net/ipv4/netfilter/Kconfig 2.6.24.imq/net/ipv4/netfilter/Kcon
config IP_NF_TARGET_ECN
tristate "ECN target support"
depends on IP_NF_MANGLE
diff -Naurw 2.6.24/net/ipv4/netfilter/Makefile 2.6.24.imq/net/ipv4/netfilter/Makefile
--- 2.6.24/net/ipv4/netfilter/Makefile 2008-01-24 19:58:37.000000000 -0300
+++ 2.6.24.imq/net/ipv4/netfilter/Makefile 2008-01-26 15:00:11.000000000 -0300
@@ -54,6 +54,7 @@
Index: linux-2.6.25.1/net/ipv4/netfilter/Makefile
===================================================================
--- linux-2.6.25.1.orig/net/ipv4/netfilter/Makefile
+++ linux-2.6.25.1/net/ipv4/netfilter/Makefile
@@ -55,6 +55,7 @@ obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_i
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
@ -748,9 +759,10 @@ diff -Naurw 2.6.24/net/ipv4/netfilter/Makefile 2.6.24.imq/net/ipv4/netfilter/Mak
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
diff -Naurw 2.6.24/net/ipv6/netfilter/ip6t_IMQ.c 2.6.24.imq/net/ipv6/netfilter/ip6t_IMQ.c
--- 2.6.24/net/ipv6/netfilter/ip6t_IMQ.c 1969-12-31 21:00:00.000000000 -0300
+++ 2.6.24.imq/net/ipv6/netfilter/ip6t_IMQ.c 2008-01-26 15:00:11.000000000 -0300
Index: linux-2.6.25.1/net/ipv6/netfilter/ip6t_IMQ.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/net/ipv6/netfilter/ip6t_IMQ.c
@@ -0,0 +1,69 @@
+/*
+ * This target marks packets to be enqueued to an imq device
@ -821,10 +833,11 @@ diff -Naurw 2.6.24/net/ipv6/netfilter/ip6t_IMQ.c 2.6.24.imq/net/ipv6/netfilter/i
+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");
diff -Naurw 2.6.24/net/ipv6/netfilter/Kconfig 2.6.24.imq/net/ipv6/netfilter/Kconfig
--- 2.6.24/net/ipv6/netfilter/Kconfig 2008-01-24 19:58:37.000000000 -0300
+++ 2.6.24.imq/net/ipv6/netfilter/Kconfig 2008-01-26 15:00:11.000000000 -0300
@@ -173,6 +173,15 @@
Index: linux-2.6.25.1/net/ipv6/netfilter/Kconfig
===================================================================
--- linux-2.6.25.1.orig/net/ipv6/netfilter/Kconfig
+++ linux-2.6.25.1/net/ipv6/netfilter/Kconfig
@@ -179,6 +179,15 @@ config IP6_NF_MANGLE
To compile it as a module, choose M here. If unsure, say N.
@ -840,9 +853,10 @@ diff -Naurw 2.6.24/net/ipv6/netfilter/Kconfig 2.6.24.imq/net/ipv6/netfilter/Kcon
config IP6_NF_TARGET_HL
tristate 'HL (hoplimit) target support'
depends on IP6_NF_MANGLE
diff -Naurw 2.6.24/net/ipv6/netfilter/Makefile 2.6.24.imq/net/ipv6/netfilter/Makefile
--- 2.6.24/net/ipv6/netfilter/Makefile 2008-01-24 19:58:37.000000000 -0300
+++ 2.6.24.imq/net/ipv6/netfilter/Makefile 2008-01-26 15:00:11.000000000 -0300
Index: linux-2.6.25.1/net/ipv6/netfilter/Makefile
===================================================================
--- linux-2.6.25.1.orig/net/ipv6/netfilter/Makefile
+++ linux-2.6.25.1/net/ipv6/netfilter/Makefile
@@ -6,6 +6,7 @@
obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o
obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
@ -851,10 +865,11 @@ diff -Naurw 2.6.24/net/ipv6/netfilter/Makefile 2.6.24.imq/net/ipv6/netfilter/Mak
obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o
diff -Naurw 2.6.24/net/sched/sch_generic.c 2.6.24.imq/net/sched/sch_generic.c
--- 2.6.24/net/sched/sch_generic.c 2008-01-24 19:58:37.000000000 -0300
+++ 2.6.24.imq/net/sched/sch_generic.c 2008-01-26 15:00:11.000000000 -0300
@@ -176,6 +176,13 @@
Index: linux-2.6.25.1/net/sched/sch_generic.c
===================================================================
--- linux-2.6.25.1.orig/net/sched/sch_generic.c
+++ linux-2.6.25.1/net/sched/sch_generic.c
@@ -182,6 +182,13 @@ static inline int qdisc_restart(struct n
return ret;
}
@ -867,4 +882,4 @@ diff -Naurw 2.6.24/net/sched/sch_generic.c 2.6.24.imq/net/sched/sch_generic.c
+
void __qdisc_run(struct net_device *dev)
{
do {
unsigned long start_time = jiffies;

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

@ -1,17 +1,17 @@
Index: linux-2.6.24/include/linux/netfilter/oot_conntrack.h
Index: linux-2.6.25.1/include/linux/netfilter/oot_conntrack.h
===================================================================
--- /dev/null
+++ linux-2.6.24/include/linux/netfilter/oot_conntrack.h
+++ linux-2.6.25.1/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.24/include/linux/netfilter/oot_trans.h
Index: linux-2.6.25.1/include/linux/netfilter/oot_trans.h
===================================================================
--- /dev/null
+++ linux-2.6.24/include/linux/netfilter/oot_trans.h
+++ linux-2.6.25.1/include/linux/netfilter/oot_trans.h
@@ -0,0 +1,14 @@
+/* Out of tree workarounds */
+#include <linux/version.h>
@ -27,10 +27,10 @@ Index: linux-2.6.24/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.24/include/linux/netfilter/xt_CHAOS.h
Index: linux-2.6.25.1/include/linux/netfilter/xt_CHAOS.h
===================================================================
--- /dev/null
+++ linux-2.6.24/include/linux/netfilter/xt_CHAOS.h
+++ linux-2.6.25.1/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 +46,10 @@ Index: linux-2.6.24/include/linux/netfilter/xt_CHAOS.h
+};
+
+#endif /* _LINUX_NETFILTER_XT_CHAOS_H */
Index: linux-2.6.24/include/linux/netfilter/xt_portscan.h
Index: linux-2.6.25.1/include/linux/netfilter/xt_portscan.h
===================================================================
--- /dev/null
+++ linux-2.6.24/include/linux/netfilter/xt_portscan.h
+++ linux-2.6.25.1/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 +59,10 @@ Index: linux-2.6.24/include/linux/netfilter/xt_portscan.h
+};
+
+#endif /* _LINUX_NETFILTER_XT_PORTSCAN_H */
Index: linux-2.6.24/net/netfilter/find_match.c
Index: linux-2.6.25.1/net/netfilter/find_match.c
===================================================================
--- /dev/null
+++ linux-2.6.24/net/netfilter/find_match.c
+++ linux-2.6.25.1/net/netfilter/find_match.c
@@ -0,0 +1,39 @@
+/*
+ xt_request_find_match
@ -103,11 +103,11 @@ Index: linux-2.6.24/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.24/net/netfilter/Kconfig
Index: linux-2.6.25.1/net/netfilter/Kconfig
===================================================================
--- linux-2.6.24.orig/net/netfilter/Kconfig
+++ linux-2.6.24/net/netfilter/Kconfig
@@ -265,6 +265,14 @@ config NETFILTER_XTABLES
--- linux-2.6.25.1.orig/net/netfilter/Kconfig
+++ linux-2.6.25.1/net/netfilter/Kconfig
@@ -276,6 +276,14 @@ config NETFILTER_XTABLES
# alphabetically ordered list of targets
@ -122,7 +122,7 @@ Index: linux-2.6.24/net/netfilter/Kconfig
config NETFILTER_XT_TARGET_CLASSIFY
tristate '"CLASSIFY" target support'
depends on NETFILTER_XTABLES
@@ -292,6 +300,14 @@ config NETFILTER_XT_TARGET_CONNMARK
@@ -305,6 +313,14 @@ config NETFILTER_XT_TARGET_CONNMARK
<file:Documentation/kbuild/modules.txt>. The module will be called
ipt_CONNMARK.ko. If unsure, say `N'.
@ -135,9 +135,9 @@ Index: linux-2.6.24/net/netfilter/Kconfig
+ To compile it as a module, choose M here. If unsure, say N.
+
config NETFILTER_XT_TARGET_DSCP
tristate '"DSCP" target support'
tristate '"DSCP" and "TOS" target support'
depends on NETFILTER_XTABLES
@@ -556,6 +572,14 @@ config NETFILTER_XT_MATCH_POLICY
@@ -640,6 +656,14 @@ config NETFILTER_XT_MATCH_POLICY
To compile it as a module, choose M here. If unsure, say N.
@ -150,30 +150,30 @@ Index: linux-2.6.24/net/netfilter/Kconfig
+ To compile it as a module, choose M here. If unsure, say N.
+
config NETFILTER_XT_MATCH_MULTIPORT
tristate "Multiple port match support"
tristate '"multiport" Multiple port match support'
depends on NETFILTER_XTABLES
Index: linux-2.6.24/net/netfilter/Makefile
Index: linux-2.6.25.1/net/netfilter/Makefile
===================================================================
--- linux-2.6.24.orig/net/netfilter/Makefile
+++ linux-2.6.24/net/netfilter/Makefile
@@ -49,6 +49,8 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK
obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o
--- linux-2.6.25.1.orig/net/netfilter/Makefile
+++ linux-2.6.25.1/net/netfilter/Makefile
@@ -50,6 +50,8 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK
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
+obj-$(CONFIG_NETFILTER_XT_TARGET_CHAOS) += xt_CHAOS.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_DELUDE) += xt_DELUDE.o
# matches
obj-$(CONFIG_NETFILTER_XT_MATCH_COMMENT) += xt_comment.o
@@ -79,3 +81,4 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_STRING)
@@ -83,3 +85,4 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_STRING)
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.24/net/netfilter/xt_CHAOS.c
Index: linux-2.6.25.1/net/netfilter/xt_CHAOS.c
===================================================================
--- /dev/null
+++ linux-2.6.24/net/netfilter/xt_CHAOS.c
+++ linux-2.6.25.1/net/netfilter/xt_CHAOS.c
@@ -0,0 +1,200 @@
+/*
+ * CHAOS target for netfilter
@ -375,10 +375,10 @@ Index: linux-2.6.24/net/netfilter/xt_CHAOS.c
+MODULE_DESCRIPTION("netfilter \"CHAOS\" target");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("ipt_CHAOS");
Index: linux-2.6.24/net/netfilter/xt_DELUDE.c
Index: linux-2.6.25.1/net/netfilter/xt_DELUDE.c
===================================================================
--- /dev/null
+++ linux-2.6.24/net/netfilter/xt_DELUDE.c
+++ linux-2.6.25.1/net/netfilter/xt_DELUDE.c
@@ -0,0 +1,197 @@
+/*
+ * DELUDE target
@ -577,10 +577,10 @@ Index: linux-2.6.24/net/netfilter/xt_DELUDE.c
+MODULE_DESCRIPTION("netfilter \"DELUDE\" target");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("ipt_DELUDE");
Index: linux-2.6.24/net/netfilter/xt_portscan.c
Index: linux-2.6.25.1/net/netfilter/xt_portscan.c
===================================================================
--- /dev/null
+++ linux-2.6.24/net/netfilter/xt_portscan.c
+++ linux-2.6.25.1/net/netfilter/xt_portscan.c
@@ -0,0 +1,269 @@
+/*
+ * portscan match for netfilter
@ -851,11 +851,11 @@ Index: linux-2.6.24/net/netfilter/xt_portscan.c
+MODULE_DESCRIPTION("netfilter \"portscan\" match");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("ipt_portscan");
Index: linux-2.6.24/drivers/char/random.c
Index: linux-2.6.25.1/drivers/char/random.c
===================================================================
--- linux-2.6.24.orig/drivers/char/random.c
+++ linux-2.6.24/drivers/char/random.c
@@ -1564,6 +1564,8 @@ __u32 secure_tcp_sequence_number(__be32
--- linux-2.6.25.1.orig/drivers/char/random.c
+++ linux-2.6.25.1/drivers/char/random.c
@@ -1563,6 +1563,8 @@ __u32 secure_tcp_sequence_number(__be32
return seq;
}

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

@ -1,8 +1,8 @@
Index: linux-2.6.23/net/netfilter/Kconfig
Index: linux-2.6.25.1/net/netfilter/Kconfig
===================================================================
--- linux-2.6.23.orig/net/netfilter/Kconfig
+++ linux-2.6.23/net/netfilter/Kconfig
@@ -401,6 +401,23 @@ config NETFILTER_XT_TARGET_CONNSECMARK
--- linux-2.6.25.1.orig/net/netfilter/Kconfig
+++ linux-2.6.25.1/net/netfilter/Kconfig
@@ -437,6 +437,23 @@ config NETFILTER_XT_TARGET_CONNSECMARK
To compile it as a module, choose M here. If unsure, say N.
@ -26,22 +26,22 @@ Index: linux-2.6.23/net/netfilter/Kconfig
config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support'
depends on NETFILTER_XTABLES && (IPV6 || IPV6=n)
Index: linux-2.6.23/net/netfilter/Makefile
Index: linux-2.6.25.1/net/netfilter/Makefile
===================================================================
--- linux-2.6.23.orig/net/netfilter/Makefile
+++ linux-2.6.23/net/netfilter/Makefile
@@ -49,6 +49,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG)
--- linux-2.6.25.1.orig/net/netfilter/Makefile
+++ linux-2.6.25.1/net/netfilter/Makefile
@@ -47,6 +47,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE
obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_NOTRACK.o
obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.o
obj-$(CONFIG_NETFILTER_XT_TARGET_RATEEST) += xt_RATEEST.o
obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_TARPIT) += xt_TARPIT.o
obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o
obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
Index: linux-2.6.23/net/netfilter/xt_TARPIT.c
obj-$(CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP) += xt_TCPOPTSTRIP.o
obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.o
Index: linux-2.6.25.1/net/netfilter/xt_TARPIT.c
===================================================================
--- /dev/null
+++ linux-2.6.23/net/netfilter/xt_TARPIT.c
+++ linux-2.6.25.1/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,8 @@
Index: linux-2.6.23-rc6/net/netfilter/Kconfig
Index: linux-2.6.25.1/net/netfilter/Kconfig
===================================================================
--- linux-2.6.23-rc6.orig/net/netfilter/Kconfig 2007-09-21 16:24:03.000000000 +0800
+++ linux-2.6.23-rc6/net/netfilter/Kconfig 2007-09-21 16:24:04.000000000 +0800
@@ -143,7 +143,7 @@
--- linux-2.6.25.1.orig/net/netfilter/Kconfig
+++ linux-2.6.25.1/net/netfilter/Kconfig
@@ -145,7 +145,7 @@ config NF_CONNTRACK_FTP
config NF_CONNTRACK_H323
tristate "H.323 protocol support"
@ -11,7 +11,7 @@ Index: linux-2.6.23-rc6/net/netfilter/Kconfig
depends on NETFILTER_ADVANCED
help
H.323 is a VoIP signalling protocol from ITU-T. As one of the most
@@ -403,7 +403,7 @@
@@ -456,7 +456,7 @@ config NETFILTER_XT_TARGET_TARPIT
config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support'

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

@ -1,7 +1,7 @@
Index: linux-2.6.23-rc9/include/linux/netfilter/nf_conntrack_rtsp.h
Index: linux-2.6.25.1/include/linux/netfilter/nf_conntrack_rtsp.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23-rc9/include/linux/netfilter/nf_conntrack_rtsp.h 2007-10-05 21:26:39.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter/nf_conntrack_rtsp.h
@@ -0,0 +1,63 @@
+/*
+ * RTSP extension for IP connection tracking.
@ -66,10 +66,10 @@ Index: linux-2.6.23-rc9/include/linux/netfilter/nf_conntrack_rtsp.h
+#endif /* __KERNEL__ */
+
+#endif /* _IP_CONNTRACK_RTSP_H */
Index: linux-2.6.23-rc9/include/linux/netfilter_helpers.h
Index: linux-2.6.25.1/include/linux/netfilter_helpers.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23-rc9/include/linux/netfilter_helpers.h 2007-10-05 21:26:39.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_helpers.h
@@ -0,0 +1,133 @@
+/*
+ * Helpers for netfiler modules. This file provides implementations for basic
@ -204,10 +204,10 @@ Index: linux-2.6.23-rc9/include/linux/netfilter_helpers.h
+#endif /* __KERNEL__ */
+
+#endif /* _NETFILTER_HELPERS_H */
Index: linux-2.6.23-rc9/include/linux/netfilter_mime.h
Index: linux-2.6.25.1/include/linux/netfilter_mime.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23-rc9/include/linux/netfilter_mime.h 2007-10-05 21:26:39.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/include/linux/netfilter_mime.h
@@ -0,0 +1,89 @@
+/*
+ * MIME functions for netfilter modules. This file provides implementations
@ -298,11 +298,11 @@ Index: linux-2.6.23-rc9/include/linux/netfilter_mime.h
+#endif /* __KERNEL__ */
+
+#endif /* _NETFILTER_MIME_H */
Index: linux-2.6.23-rc9/net/ipv4/netfilter/Makefile
Index: linux-2.6.25.1/net/ipv4/netfilter/Makefile
===================================================================
--- linux-2.6.23-rc9.orig/net/ipv4/netfilter/Makefile 2007-10-05 21:26:39.000000000 +0800
+++ linux-2.6.23-rc9/net/ipv4/netfilter/Makefile 2007-10-05 21:26:39.000000000 +0800
@@ -23,6 +23,7 @@
--- linux-2.6.25.1.orig/net/ipv4/netfilter/Makefile
+++ linux-2.6.25.1/net/ipv4/netfilter/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am
obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
@ -310,11 +310,11 @@ Index: linux-2.6.23-rc9/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.23-rc9/net/netfilter/Kconfig
Index: linux-2.6.25.1/net/netfilter/Kconfig
===================================================================
--- linux-2.6.23-rc9.orig/net/netfilter/Kconfig 2007-10-05 21:26:39.000000000 +0800
+++ linux-2.6.23-rc9/net/netfilter/Kconfig 2007-10-05 21:26:39.000000000 +0800
@@ -249,6 +249,16 @@
--- linux-2.6.25.1.orig/net/netfilter/Kconfig
+++ linux-2.6.25.1/net/netfilter/Kconfig
@@ -258,6 +258,16 @@ config NF_CONNTRACK_TFTP
To compile it as a module, choose M here. If unsure, say N.
@ -329,13 +329,13 @@ Index: linux-2.6.23-rc9/net/netfilter/Kconfig
+ Documentation/modules.txt. If unsure, say 'Y'.
+
config NF_CT_NETLINK
tristate 'Connection tracking netlink interface (EXPERIMENTAL)'
depends on EXPERIMENTAL && NF_CONNTRACK && NETFILTER_NETLINK
Index: linux-2.6.23-rc9/net/netfilter/Makefile
tristate 'Connection tracking netlink interface'
depends on NF_CONNTRACK
Index: linux-2.6.25.1/net/netfilter/Makefile
===================================================================
--- linux-2.6.23-rc9.orig/net/netfilter/Makefile 2007-10-05 21:26:39.000000000 +0800
+++ linux-2.6.23-rc9/net/netfilter/Makefile 2007-10-05 21:26:39.000000000 +0800
@@ -33,6 +33,7 @@
--- linux-2.6.25.1.orig/net/netfilter/Makefile
+++ linux-2.6.25.1/net/netfilter/Makefile
@@ -32,6 +32,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co
obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
@ -343,11 +343,11 @@ Index: linux-2.6.23-rc9/net/netfilter/Makefile
# generic X tables
obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
Index: linux-2.6.23-rc9/net/ipv4/netfilter/Kconfig
Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig
===================================================================
--- linux-2.6.23-rc9.orig/net/ipv4/netfilter/Kconfig 2007-10-05 21:26:39.000000000 +0800
+++ linux-2.6.23-rc9/net/ipv4/netfilter/Kconfig 2007-10-05 21:26:39.000000000 +0800
@@ -314,6 +314,11 @@
--- linux-2.6.25.1.orig/net/ipv4/netfilter/Kconfig
+++ linux-2.6.25.1/net/ipv4/netfilter/Kconfig
@@ -277,6 +277,11 @@ config NF_NAT_IRC
depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
default NF_NAT && NF_CONNTRACK_IRC
@ -359,10 +359,10 @@ Index: linux-2.6.23-rc9/net/ipv4/netfilter/Kconfig
config NF_NAT_TFTP
tristate
depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
Index: linux-2.6.23-rc9/net/netfilter/nf_conntrack_rtsp.c
Index: linux-2.6.25.1/net/netfilter/nf_conntrack_rtsp.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23-rc9/net/netfilter/nf_conntrack_rtsp.c 2007-10-05 21:46:43.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/net/netfilter/nf_conntrack_rtsp.c
@@ -0,0 +1,513 @@
+/*
+ * RTSP extension for IP connection tracking
@ -877,10 +877,10 @@ Index: linux-2.6.23-rc9/net/netfilter/nf_conntrack_rtsp.c
+
+EXPORT_SYMBOL(nf_nat_rtsp_hook_expectfn);
+
Index: linux-2.6.23-rc9/net/ipv4/netfilter/nf_nat_rtsp.c
Index: linux-2.6.25.1/net/ipv4/netfilter/nf_nat_rtsp.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23-rc9/net/ipv4/netfilter/nf_nat_rtsp.c 2007-10-05 21:41:16.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/net/ipv4/netfilter/nf_nat_rtsp.c
@@ -0,0 +1,496 @@
+/*
+ * RTSP extension for TCP NAT alteration

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

@ -1,7 +1,8 @@
diff -Naur linux-2.6.21.5.orig/include/linux/pkt_sched.h linux-2.6.21.5/include/linux/pkt_sched.h
--- linux-2.6.21.5.orig/include/linux/pkt_sched.h 2007-06-11 11:37:06.000000000 -0700
+++ linux-2.6.21.5/include/linux/pkt_sched.h 2007-06-22 22:53:46.000000000 -0700
@@ -146,8 +146,37 @@
Index: linux-2.6.25.1/include/linux/pkt_sched.h
===================================================================
--- linux-2.6.25.1.orig/include/linux/pkt_sched.h
+++ linux-2.6.25.1/include/linux/pkt_sched.h
@@ -162,8 +162,37 @@ struct tc_sfq_xstats
*
* The only reason for this is efficiency, it is possible
* to change these parameters in compile time.
@ -39,10 +40,11 @@ diff -Naur linux-2.6.21.5.orig/include/linux/pkt_sched.h linux-2.6.21.5/include/
/* RED section */
enum
diff -Naur linux-2.6.21.5.orig/net/sched/Kconfig linux-2.6.21.5/net/sched/Kconfig
--- linux-2.6.21.5.orig/net/sched/Kconfig 2007-06-11 11:37:06.000000000 -0700
+++ linux-2.6.21.5/net/sched/Kconfig 2007-06-23 14:11:02.000000000 -0700
@@ -189,6 +189,37 @@
Index: linux-2.6.25.1/net/sched/Kconfig
===================================================================
--- linux-2.6.25.1.orig/net/sched/Kconfig
+++ linux-2.6.25.1/net/sched/Kconfig
@@ -139,6 +139,37 @@ config NET_SCH_SFQ
To compile this code as a module, choose M here: the
module will be called sch_sfq.
@ -80,10 +82,11 @@ diff -Naur linux-2.6.21.5.orig/net/sched/Kconfig linux-2.6.21.5/net/sched/Kconfi
config NET_SCH_TEQL
tristate "True Link Equalizer (TEQL)"
---help---
diff -Naur linux-2.6.21.5.orig/net/sched/Makefile linux-2.6.21.5/net/sched/Makefile
--- linux-2.6.21.5.orig/net/sched/Makefile 2007-06-11 11:37:06.000000000 -0700
+++ linux-2.6.21.5/net/sched/Makefile 2007-06-22 22:53:46.000000000 -0700
@@ -23,6 +23,7 @@
Index: linux-2.6.25.1/net/sched/Makefile
===================================================================
--- linux-2.6.25.1.orig/net/sched/Makefile
+++ linux-2.6.25.1/net/sched/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_NET_SCH_GRED) += sch_gred.o
obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o
obj-$(CONFIG_NET_SCH_DSMARK) += sch_dsmark.o
obj-$(CONFIG_NET_SCH_SFQ) += sch_sfq.o
@ -91,9 +94,10 @@ diff -Naur linux-2.6.21.5.orig/net/sched/Makefile linux-2.6.21.5/net/sched/Makef
obj-$(CONFIG_NET_SCH_TBF) += sch_tbf.o
obj-$(CONFIG_NET_SCH_TEQL) += sch_teql.o
obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o
diff -Naur linux-2.6.21.5.orig/net/sched/sch_esfq.c linux-2.6.21.5/net/sched/sch_esfq.c
--- linux-2.6.21.5.orig/net/sched/sch_esfq.c 1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.21.5/net/sched/sch_esfq.c 2007-06-23 19:18:00.000000000 -0700
Index: linux-2.6.25.1/net/sched/sch_esfq.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/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,8 @@
Index: linux-2.6.23-rc6/arch/mips/Makefile
Index: linux-2.6.25.1/arch/mips/Makefile
===================================================================
--- linux-2.6.23-rc6.orig/arch/mips/Makefile 2007-09-21 16:23:53.000000000 +0800
+++ linux-2.6.23-rc6/arch/mips/Makefile 2007-09-21 16:24:05.000000000 +0800
@@ -565,6 +565,9 @@
--- linux-2.6.25.1.orig/arch/mips/Makefile
+++ linux-2.6.25.1/arch/mips/Makefile
@@ -593,6 +593,9 @@ core-$(CONFIG_TOSHIBA_RBTX4938) += arch/
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,8 @@
Index: linux-2.6.23-rc6/fs/jffs2/build.c
Index: linux-2.6.25.1/fs/jffs2/build.c
===================================================================
--- linux-2.6.23-rc6.orig/fs/jffs2/build.c 2007-09-21 16:23:53.000000000 +0800
+++ linux-2.6.23-rc6/fs/jffs2/build.c 2007-09-21 16:24:05.000000000 +0800
@@ -105,6 +105,17 @@
--- linux-2.6.25.1.orig/fs/jffs2/build.c
+++ linux-2.6.25.1/fs/jffs2/build.c
@@ -105,6 +105,17 @@ static int jffs2_build_filesystem(struct
dbg_fsbuild("scanned flash completely\n");
jffs2_dbg_dump_block_lists_nolock(c);
@ -20,11 +20,11 @@ Index: linux-2.6.23-rc6/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.23-rc6/fs/jffs2/scan.c
Index: linux-2.6.25.1/fs/jffs2/scan.c
===================================================================
--- linux-2.6.23-rc6.orig/fs/jffs2/scan.c 2007-09-21 16:23:52.000000000 +0800
+++ linux-2.6.23-rc6/fs/jffs2/scan.c 2007-09-21 16:24:05.000000000 +0800
@@ -142,9 +142,12 @@
--- linux-2.6.25.1.orig/fs/jffs2/scan.c
+++ linux-2.6.25.1/fs/jffs2/scan.c
@@ -142,9 +142,12 @@ int jffs2_scan_medium(struct jffs2_sb_in
/* reset summary info for next eraseblock scan */
jffs2_sum_reset_collected(s);
@ -40,7 +40,7 @@ Index: linux-2.6.23-rc6/fs/jffs2/scan.c
if (ret < 0)
goto out;
@@ -545,6 +548,17 @@
@@ -545,6 +548,17 @@ static int jffs2_scan_eraseblock (struct
return err;
}

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

@ -1,7 +1,7 @@
Index: linux-2.6.23-rc6/include/asm-powerpc/segment.h
Index: linux-2.6.25.1/include/asm-powerpc/segment.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23-rc6/include/asm-powerpc/segment.h 2007-09-21 16:24:05.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/include/asm-powerpc/segment.h
@@ -0,0 +1,6 @@
+#ifndef _ASM_SEGMENT_H
+#define _ASM_SEGMENT_H

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

@ -1,35 +1,35 @@
Index: linux-2.6.23/drivers/net/r8169.c
Index: linux-2.6.25.1/drivers/net/r8169.c
===================================================================
--- linux-2.6.23.orig/drivers/net/r8169.c 2007-10-10 04:31:38.000000000 +0800
+++ linux-2.6.23/drivers/net/r8169.c 2007-10-10 13:53:17.000000000 +0800
@@ -1459,7 +1459,7 @@
--- linux-2.6.25.1.orig/drivers/net/r8169.c
+++ linux-2.6.25.1/drivers/net/r8169.c
@@ -1537,7 +1537,7 @@ static const struct rtl_cfg_info {
.hw_start = rtl_hw_start_8169,
.region = 1,
.align = 0,
- .intr_event = SYSErr | LinkChg | RxOverflow |
+ .intr_event = LinkChg | RxOverflow |
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow
},
@@ -1467,7 +1467,7 @@
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
.msi = 0
@@ -1546,7 +1546,7 @@ static const struct rtl_cfg_info {
.hw_start = rtl_hw_start_8168,
.region = 2,
.align = 8,
- .intr_event = SYSErr | LinkChg | RxOverflow |
+ .intr_event = LinkChg | RxOverflow |
TxErr | TxOK | RxOK | RxErr,
.napi_event = TxErr | TxOK | RxOK | RxOverflow
},
@@ -1475,7 +1475,7 @@
.napi_event = TxErr | TxOK | RxOK | RxOverflow,
.msi = RTL_FEATURE_MSI
@@ -1555,7 +1555,7 @@ static const struct rtl_cfg_info {
.hw_start = rtl_hw_start_8101,
.region = 2,
.align = 8,
- .intr_event = SYSErr | LinkChg | RxOverflow | PCSTimeout |
+ .intr_event = LinkChg | RxOverflow | PCSTimeout |
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow
}
@@ -2779,10 +2779,12 @@
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
.msi = RTL_FEATURE_MSI
@@ -2903,10 +2903,12 @@ static irqreturn_t rtl8169_interrupt(int
break;
}

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

@ -1,33 +1,33 @@
Index: linux-2.6.23/fs/Kconfig
Index: linux-2.6.25.1/fs/Kconfig
===================================================================
--- linux-2.6.23.orig/fs/Kconfig 2007-10-10 13:52:14.000000000 +0800
+++ linux-2.6.23/fs/Kconfig 2007-10-10 13:53:23.000000000 +0800
@@ -458,6 +458,9 @@
This option will enlarge your kernel, but it allows debugging of
ocfs2 filesystem issues.
--- linux-2.6.25.1.orig/fs/Kconfig
+++ linux-2.6.25.1/fs/Kconfig
@@ -1449,6 +1449,9 @@ config VXFS_FS
To compile this as a module, choose M here: the module will be
called freevxfs. If unsure, say N.
+config MINI_FO
+ tristate "Mini fanout overlay filesystem"
+
config MINIX_FS
tristate "Minix fs support"
help
Index: linux-2.6.23/fs/Makefile
tristate "Minix file system support"
depends on BLOCK
Index: linux-2.6.25.1/fs/Makefile
===================================================================
--- linux-2.6.23.orig/fs/Makefile 2007-10-10 13:52:14.000000000 +0800
+++ linux-2.6.23/fs/Makefile 2007-10-10 13:53:23.000000000 +0800
@@ -76,6 +76,7 @@
obj-$(CONFIG_RAMFS) += ramfs/
--- linux-2.6.25.1.orig/fs/Makefile
+++ linux-2.6.25.1/fs/Makefile
@@ -77,6 +77,7 @@ obj-$(CONFIG_SQUASHFS) += squashfs/
obj-y += ramfs/
obj-$(CONFIG_HUGETLBFS) += hugetlbfs/
obj-$(CONFIG_CODA_FS) += coda/
+obj-$(CONFIG_MINI_FO) += mini_fo/
obj-$(CONFIG_MINIX_FS) += minix/
obj-$(CONFIG_FAT_FS) += fat/
obj-$(CONFIG_MSDOS_FS) += msdos/
Index: linux-2.6.23/fs/mini_fo/aux.c
Index: linux-2.6.25.1/fs/mini_fo/aux.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23/fs/mini_fo/aux.c 2007-10-10 13:53:23.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/aux.c
@@ -0,0 +1,577 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@ -606,10 +606,10 @@ Index: linux-2.6.23/fs/mini_fo/aux.c
+
+#endif /* unused */
+
Index: linux-2.6.23/fs/mini_fo/ChangeLog
Index: linux-2.6.25.1/fs/mini_fo/ChangeLog
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23/fs/mini_fo/ChangeLog 2007-10-10 13:53:23.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/ChangeLog
@@ -0,0 +1,281 @@
+2006-01-24 Markus Klotzbuecher <mk@mary.denx.de>
+
@ -892,10 +892,10 @@ Index: linux-2.6.23/fs/mini_fo/ChangeLog
+ * Implementation of mini_fo_mknod and mini_fo_rename, support
+ for device files.
+
Index: linux-2.6.23/fs/mini_fo/dentry.c
Index: linux-2.6.25.1/fs/mini_fo/dentry.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23/fs/mini_fo/dentry.c 2007-10-10 13:53:23.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/dentry.c
@@ -0,0 +1,244 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@ -1141,10 +1141,10 @@ Index: linux-2.6.23/fs/mini_fo/dentry.c
+ d_delete: mini_fo_d_delete,
+ d_iput: mini_fo_d_iput,
+};
Index: linux-2.6.23/fs/mini_fo/file.c
Index: linux-2.6.25.1/fs/mini_fo/file.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23/fs/mini_fo/file.c 2007-10-10 13:53:23.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/file.c
@@ -0,0 +1,713 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@ -1859,10 +1859,10 @@ Index: linux-2.6.23/fs/mini_fo/file.c
+ /* not implemented: sendpage */
+ /* not implemented: get_unmapped_area */
+ };
Index: linux-2.6.23/fs/mini_fo/fist.h
Index: linux-2.6.25.1/fs/mini_fo/fist.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23/fs/mini_fo/fist.h 2007-10-10 13:53:23.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/fist.h
@@ -0,0 +1,252 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@ -2116,10 +2116,10 @@ Index: linux-2.6.23/fs/mini_fo/fist.h
+# define FIST_IOCTL_SET_DEBUG_VALUE _IOW(0x15, 2, int)
+
+#endif /* not __FIST_H_ */
Index: linux-2.6.23/fs/mini_fo/inode.c
Index: linux-2.6.25.1/fs/mini_fo/inode.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23/fs/mini_fo/inode.c 2007-10-10 13:53:23.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/inode.c
@@ -0,0 +1,1564 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@ -3685,10 +3685,10 @@ Index: linux-2.6.23/fs/mini_fo/inode.c
+ removexattr: mini_fo_removexattr
+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
+ };
Index: linux-2.6.23/fs/mini_fo/main.c
Index: linux-2.6.25.1/fs/mini_fo/main.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23/fs/mini_fo/main.c 2007-10-10 13:53:23.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/main.c
@@ -0,0 +1,423 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@ -4113,10 +4113,10 @@ Index: linux-2.6.23/fs/mini_fo/main.c
+
+module_init(init_mini_fo_fs)
+module_exit(exit_mini_fo_fs)
Index: linux-2.6.23/fs/mini_fo/Makefile
Index: linux-2.6.25.1/fs/mini_fo/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23/fs/mini_fo/Makefile 2007-10-10 13:53:23.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/Makefile
@@ -0,0 +1,17 @@
+#
+# Makefile for mini_fo 2.4 and 2.6 Linux kernels
@ -4135,10 +4135,10 @@ Index: linux-2.6.23/fs/mini_fo/Makefile
+# dependencies
+${mini_fo-objs}: mini_fo.h fist.h
+
Index: linux-2.6.23/fs/mini_fo/meta.c
Index: linux-2.6.25.1/fs/mini_fo/meta.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23/fs/mini_fo/meta.c 2007-10-10 13:53:23.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/meta.c
@@ -0,0 +1,1000 @@
+/*
+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
@ -5140,10 +5140,10 @@ Index: linux-2.6.23/fs/mini_fo/meta.c
+ return 0;
+}
+
Index: linux-2.6.23/fs/mini_fo/mini_fo.h
Index: linux-2.6.25.1/fs/mini_fo/mini_fo.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23/fs/mini_fo/mini_fo.h 2007-10-10 13:53:23.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/mini_fo.h
@@ -0,0 +1,510 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@ -5655,10 +5655,10 @@ Index: linux-2.6.23/fs/mini_fo/mini_fo.h
+/* ioctls */
+
+#endif /* not __MINI_FO_H_ */
Index: linux-2.6.23/fs/mini_fo/mini_fo-merge
Index: linux-2.6.25.1/fs/mini_fo/mini_fo-merge
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23/fs/mini_fo/mini_fo-merge 2007-10-10 13:53:23.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/mini_fo-merge
@@ -0,0 +1,180 @@
+#!/bin/bash
+#
@ -5840,10 +5840,10 @@ Index: linux-2.6.23/fs/mini_fo/mini_fo-merge
+#rm $TMP/$SKIP_DEL_LIST
+
+echo "Done!"
Index: linux-2.6.23/fs/mini_fo/mini_fo-overlay
Index: linux-2.6.25.1/fs/mini_fo/mini_fo-overlay
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23/fs/mini_fo/mini_fo-overlay 2007-10-10 13:53:23.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/mini_fo-overlay
@@ -0,0 +1,130 @@
+#!/bin/bash
+#
@ -5975,10 +5975,10 @@ Index: linux-2.6.23/fs/mini_fo/mini_fo-overlay
+if [ $? -ne 0 ]; then
+ echo "Error, mounting failed, maybe no permisson to mount?"
+fi
Index: linux-2.6.23/fs/mini_fo/mmap.c
Index: linux-2.6.25.1/fs/mini_fo/mmap.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23/fs/mini_fo/mmap.c 2007-10-10 13:53:23.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/mmap.c
@@ -0,0 +1,637 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@ -6617,10 +6617,10 @@ Index: linux-2.6.23/fs/mini_fo/mmap.c
+ print_exit_status(err);
+ return err;
+}
Index: linux-2.6.23/fs/mini_fo/README
Index: linux-2.6.25.1/fs/mini_fo/README
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23/fs/mini_fo/README 2007-10-10 13:53:23.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/README
@@ -0,0 +1,163 @@
+README for the mini_fo overlay file system
+=========================================
@ -6785,10 +6785,10 @@ Index: linux-2.6.23/fs/mini_fo/README
+2 of the License, or (at your option) any later version.
+
+
Index: linux-2.6.23/fs/mini_fo/RELEASE_NOTES
Index: linux-2.6.25.1/fs/mini_fo/RELEASE_NOTES
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23/fs/mini_fo/RELEASE_NOTES 2007-10-10 13:53:23.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/RELEASE_NOTES
@@ -0,0 +1,111 @@
+Release: mini_fo-0.6.1 (v0-6-1)
+Date: 21.09.2005
@ -6901,10 +6901,10 @@ Index: linux-2.6.23/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.23/fs/mini_fo/state.c
Index: linux-2.6.25.1/fs/mini_fo/state.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23/fs/mini_fo/state.c 2007-10-10 13:53:23.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/state.c
@@ -0,0 +1,620 @@
+/*
+ * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
@ -7526,10 +7526,10 @@ Index: linux-2.6.23/fs/mini_fo/state.c
+ return err;
+}
+
Index: linux-2.6.23/fs/mini_fo/super.c
Index: linux-2.6.25.1/fs/mini_fo/super.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23/fs/mini_fo/super.c 2007-10-10 13:53:23.000000000 +0800
--- /dev/null
+++ linux-2.6.25.1/fs/mini_fo/super.c
@@ -0,0 +1,281 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok

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

@ -1,7 +1,7 @@
Index: linux-2.6.25/fs/mini_fo/main.c
Index: linux-2.6.25.1/fs/mini_fo/main.c
===================================================================
--- linux-2.6.25.orig/fs/mini_fo/main.c
+++ linux-2.6.25/fs/mini_fo/main.c
--- linux-2.6.25.1.orig/fs/mini_fo/main.c
+++ linux-2.6.25.1/fs/mini_fo/main.c
@@ -79,6 +79,7 @@ mini_fo_tri_interpose(dentry_t *hidden_d
* of the new inode's fields
*/
@ -50,10 +50,10 @@ Index: linux-2.6.25/fs/mini_fo/main.c
stohs2(sb) = hidden_root2->d_sb;
/* validate storage dir, this is done in
Index: linux-2.6.25/fs/mini_fo/mini_fo.h
Index: linux-2.6.25.1/fs/mini_fo/mini_fo.h
===================================================================
--- linux-2.6.25.orig/fs/mini_fo/mini_fo.h
+++ linux-2.6.25/fs/mini_fo/mini_fo.h
--- linux-2.6.25.1.orig/fs/mini_fo/mini_fo.h
+++ linux-2.6.25.1/fs/mini_fo/mini_fo.h
@@ -302,6 +302,10 @@ extern int mini_fo_tri_interpose(dentry_
extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
dentry_t *src_dentry, struct vfsmount *src_mnt);
@ -95,10 +95,10 @@ Index: linux-2.6.25/fs/mini_fo/mini_fo.h
/*
* Definitions for user and kernel code
*/
Index: linux-2.6.25/fs/mini_fo/super.c
Index: linux-2.6.25.1/fs/mini_fo/super.c
===================================================================
--- linux-2.6.25.orig/fs/mini_fo/super.c
+++ linux-2.6.25/fs/mini_fo/super.c
--- linux-2.6.25.1.orig/fs/mini_fo/super.c
+++ linux-2.6.25.1/fs/mini_fo/super.c
@@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
}
#endif
@ -131,10 +131,10 @@ Index: linux-2.6.25/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/fs/mini_fo/aux.c
Index: linux-2.6.25.1/fs/mini_fo/aux.c
===================================================================
--- linux-2.6.25.orig/fs/mini_fo/aux.c
+++ linux-2.6.25/fs/mini_fo/aux.c
--- linux-2.6.25.1.orig/fs/mini_fo/aux.c
+++ linux-2.6.25.1/fs/mini_fo/aux.c
@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb,
err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);

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

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

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

@ -1,8 +1,8 @@
Index: linux-2.6.23.1/sound/core/Kconfig
Index: linux-2.6.25.1/sound/core/Kconfig
===================================================================
--- linux-2.6.23.1.orig/sound/core/Kconfig 2007-11-25 18:14:23.486146184 +0100
+++ linux-2.6.23.1/sound/core/Kconfig 2007-11-25 18:14:26.474316473 +0100
@@ -9,7 +9,7 @@
--- linux-2.6.25.1.orig/sound/core/Kconfig
+++ linux-2.6.25.1/sound/core/Kconfig
@@ -9,7 +9,7 @@ config SND_PCM
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,8 @@
Index: linux-2.6.23-rc9/drivers/leds/Kconfig
Index: linux-2.6.25.1/drivers/leds/Kconfig
===================================================================
--- linux-2.6.23-rc9.orig/drivers/leds/Kconfig 2007-10-02 12:51:05.000000000 +0800
+++ linux-2.6.23-rc9/drivers/leds/Kconfig 2007-10-03 23:43:31.000000000 +0800
@@ -133,4 +133,8 @@
--- linux-2.6.25.1.orig/drivers/leds/Kconfig
+++ linux-2.6.25.1/drivers/leds/Kconfig
@@ -181,4 +181,8 @@ config LEDS_TRIGGER_HEARTBEAT
load average.
If unsure, say Y.
@ -11,11 +11,11 @@ Index: linux-2.6.23-rc9/drivers/leds/Kconfig
+ depends on LEDS_TRIGGERS
+
endif # NEW_LEDS
Index: linux-2.6.23-rc9/drivers/leds/Makefile
Index: linux-2.6.25.1/drivers/leds/Makefile
===================================================================
--- linux-2.6.23-rc9.orig/drivers/leds/Makefile 2007-10-02 12:51:05.000000000 +0800
+++ linux-2.6.23-rc9/drivers/leds/Makefile 2007-10-03 23:42:24.000000000 +0800
@@ -22,3 +22,4 @@
--- linux-2.6.25.1.orig/drivers/leds/Makefile
+++ linux-2.6.25.1/drivers/leds/Makefile
@@ -26,3 +26,4 @@ obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.
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

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

@ -1,7 +1,8 @@
diff -Nur linux-2.6.23.1.orig/drivers/leds/Kconfig linux-2.6.23.1/drivers/leds/Kconfig
--- linux-2.6.23.1.orig/drivers/leds/Kconfig 2007-10-12 12:43:44.000000000 -0400
+++ linux-2.6.23.1/drivers/leds/Kconfig 2007-10-31 02:36:22.000000000 -0400
@@ -81,6 +81,12 @@
Index: linux-2.6.25.1/drivers/leds/Kconfig
===================================================================
--- linux-2.6.25.1.orig/drivers/leds/Kconfig
+++ linux-2.6.25.1/drivers/leds/Kconfig
@@ -79,6 +79,12 @@ config LEDS_WRAP
help
This option enables support for the PCEngines WRAP programmable LEDs.
@ -13,15 +14,16 @@ diff -Nur linux-2.6.23.1.orig/drivers/leds/Kconfig linux-2.6.23.1/drivers/leds/K
+
config LEDS_H1940
tristate "LED Support for iPAQ H1940 device"
depends LEDS_CLASS && ARCH_H1940
diff -Nur linux-2.6.23.1.orig/drivers/leds/Makefile linux-2.6.23.1/drivers/leds/Makefile
--- linux-2.6.23.1.orig/drivers/leds/Makefile 2007-10-12 12:43:44.000000000 -0400
+++ linux-2.6.23.1/drivers/leds/Makefile 2007-10-31 02:36:17.000000000 -0400
@@ -14,6 +14,7 @@
depends on LEDS_CLASS && ARCH_H1940
Index: linux-2.6.25.1/drivers/leds/Makefile
===================================================================
--- linux-2.6.25.1.orig/drivers/leds/Makefile
+++ linux-2.6.25.1/drivers/leds/Makefile
@@ -14,6 +14,7 @@ obj-$(CONFIG_LEDS_S3C24XX) += leds-s3c2
obj-$(CONFIG_LEDS_AMS_DELTA) += leds-ams-delta.o
obj-$(CONFIG_LEDS_NET48XX) += leds-net48xx.o
obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o
+obj-$(CONFIG_LEDS_ALIX) += leds-alix.o
obj-$(CONFIG_LEDS_H1940) += leds-h1940.o
obj-$(CONFIG_LEDS_COBALT) += leds-cobalt.o
obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o
obj-$(CONFIG_LEDS_COBALT_QUBE) += leds-cobalt-qube.o
obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o

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

@ -1,7 +1,8 @@
diff -ur linux-2.6.23.1.orig/drivers/leds/Kconfig linux-2.6.23.1/drivers/leds/Kconfig
--- linux-2.6.23.1.orig/drivers/leds/Kconfig 2007-12-01 00:41:03.000000000 +1300
+++ linux-2.6.23.1/drivers/leds/Kconfig 2007-12-01 01:26:43.000000000 +1300
@@ -137,4 +137,11 @@
Index: linux-2.6.25.1/drivers/leds/Kconfig
===================================================================
--- linux-2.6.25.1.orig/drivers/leds/Kconfig
+++ linux-2.6.25.1/drivers/leds/Kconfig
@@ -191,4 +191,11 @@ config LEDS_TRIGGER_MORSE
tristate "LED Morse Trigger"
depends on LEDS_TRIGGERS
@ -13,10 +14,11 @@ diff -ur linux-2.6.23.1.orig/drivers/leds/Kconfig linux-2.6.23.1/drivers/leds/Kc
+ If unsure, say Y.
+
endif # NEW_LEDS
diff -ur linux-2.6.23.1.orig/drivers/leds/Makefile linux-2.6.23.1/drivers/leds/Makefile
--- linux-2.6.23.1.orig/drivers/leds/Makefile 2007-12-01 00:41:03.000000000 +1300
+++ linux-2.6.23.1/drivers/leds/Makefile 2007-12-01 01:27:12.000000000 +1300
@@ -23,3 +23,4 @@
Index: linux-2.6.25.1/drivers/leds/Makefile
===================================================================
--- linux-2.6.25.1.orig/drivers/leds/Makefile
+++ linux-2.6.25.1/drivers/leds/Makefile
@@ -28,3 +28,4 @@ obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledt
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,5 +1,7 @@
--- linux-2.6.24.5/drivers/rtc/rtc-ds1672.c 2008-04-19 03:53:39.000000000 +0200
+++ linux-2.6.24.5-owrt/drivers/rtc/rtc-ds1672.c 2008-04-29 22:16:41.000000000 +0200
Index: linux-2.6.25.1/drivers/rtc/rtc-ds1672.c
===================================================================
--- linux-2.6.25.1.orig/drivers/rtc/rtc-ds1672.c
+++ linux-2.6.25.1/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,6 +1,8 @@
--- linux-2.6.24.2.orig/drivers/input/misc/Kconfig 2007-08-21 06:33:06.000000000 +0200
+++ linux-2.6.24.2/drivers/input/misc/Kconfig 2007-10-08 10:57:23.000000000 +0200
@@ -178,4 +178,20 @@
Index: linux-2.6.25.1/drivers/input/misc/Kconfig
===================================================================
--- linux-2.6.25.1.orig/drivers/input/misc/Kconfig
+++ linux-2.6.25.1/drivers/input/misc/Kconfig
@@ -197,4 +197,20 @@ config HP_SDC_RTC
Say Y here if you want to support the built-in real time clock
of the HP SDC controller.
@ -21,9 +23,11 @@
+ module will be called gpio-buttons.
+
endif
--- linux-2.6.24.2.orig/drivers/input/misc/Makefile 2007-08-21 06:33:06.000000000 +0200
+++ linux-2.6.24.2/drivers/input/misc/Makefile 2007-10-08 10:50:12.000000000 +0200
@@ -18,3 +18,4 @@
Index: linux-2.6.25.1/drivers/input/misc/Makefile
===================================================================
--- linux-2.6.25.1.orig/drivers/input/misc/Makefile
+++ linux-2.6.25.1/drivers/input/misc/Makefile
@@ -19,3 +19,4 @@ obj-$(CONFIG_INPUT_YEALINK) += yealink.
obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o
obj-$(CONFIG_INPUT_UINPUT) += uinput.o
obj-$(CONFIG_INPUT_APANEL) += apanel.o

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

@ -1,8 +1,8 @@
Index: linux-2.6.23-rc6/fs/Kconfig
Index: linux-2.6.25.1/fs/Kconfig
===================================================================
--- linux-2.6.23-rc6.orig/fs/Kconfig 2007-09-21 16:24:06.000000000 +0800
+++ linux-2.6.23-rc6/fs/Kconfig 2007-09-21 16:24:08.000000000 +0800
@@ -419,6 +419,7 @@
--- linux-2.6.25.1.orig/fs/Kconfig
+++ linux-2.6.25.1/fs/Kconfig
@@ -421,6 +421,7 @@ config FS_POSIX_ACL
source "fs/xfs/Kconfig"
source "fs/gfs2/Kconfig"
@ -10,11 +10,11 @@ Index: linux-2.6.23-rc6/fs/Kconfig
config OCFS2_FS
tristate "OCFS2 file system support"
Index: linux-2.6.23-rc6/fs/Makefile
Index: linux-2.6.25.1/fs/Makefile
===================================================================
--- linux-2.6.23-rc6.orig/fs/Makefile 2007-09-21 16:24:06.000000000 +0800
+++ linux-2.6.23-rc6/fs/Makefile 2007-09-21 16:24:08.000000000 +0800
@@ -120,3 +120,4 @@
--- linux-2.6.25.1.orig/fs/Makefile
+++ linux-2.6.25.1/fs/Makefile
@@ -121,3 +121,4 @@ obj-$(CONFIG_HPPFS) += hppfs/
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/600-phy_extension.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.23/drivers/net/phy/phy.c
Index: linux-2.6.25.1/drivers/net/phy/phy.c
===================================================================
--- linux-2.6.23.orig/drivers/net/phy/phy.c 2007-10-14 00:05:26.000000000 +0200
+++ linux-2.6.23/drivers/net/phy/phy.c 2007-10-14 00:44:21.000000000 +0200
@@ -344,6 +344,50 @@
--- linux-2.6.25.1.orig/drivers/net/phy/phy.c
+++ linux-2.6.25.1/drivers/net/phy/phy.c
@@ -348,6 +348,50 @@ int phy_ethtool_gset(struct phy_device *
}
EXPORT_SYMBOL(phy_ethtool_gset);
@ -53,11 +53,11 @@ Index: linux-2.6.23/drivers/net/phy/phy.c
/**
* phy_mii_ioctl - generic PHY MII ioctl interface
* @phydev: the phy_device struct
Index: linux-2.6.23/include/linux/phy.h
Index: linux-2.6.25.1/include/linux/phy.h
===================================================================
--- linux-2.6.23.orig/include/linux/phy.h 2007-10-14 00:05:15.000000000 +0200
+++ linux-2.6.23/include/linux/phy.h 2007-10-14 00:18:54.000000000 +0200
@@ -393,6 +393,7 @@
--- linux-2.6.25.1.orig/include/linux/phy.h
+++ linux-2.6.25.1/include/linux/phy.h
@@ -399,6 +399,7 @@ void phy_start_machine(struct phy_device
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);

4552
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,8 @@
Index: linux-2.6.23-rc6/drivers/usb/serial/usb-serial.c
Index: linux-2.6.25.1/drivers/usb/serial/usb-serial.c
===================================================================
--- linux-2.6.23-rc6.orig/drivers/usb/serial/usb-serial.c 2007-09-21 16:23:52.000000000 +0800
+++ linux-2.6.23-rc6/drivers/usb/serial/usb-serial.c 2007-09-21 16:24:09.000000000 +0800
@@ -58,6 +58,7 @@
--- linux-2.6.25.1.orig/drivers/usb/serial/usb-serial.c
+++ linux-2.6.25.1/drivers/usb/serial/usb-serial.c
@@ -58,6 +58,7 @@ static struct usb_driver usb_serial_driv
drivers depend on it.
*/
@ -10,7 +10,7 @@ Index: linux-2.6.23-rc6/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);
@@ -866,7 +867,7 @@
@@ -904,7 +905,7 @@ int usb_serial_probe(struct usb_interfac
dev_err(&interface->dev, "No free urbs available\n");
goto probe_error;
}
@ -19,7 +19,7 @@ Index: linux-2.6.23-rc6/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);
@@ -1276,3 +1277,5 @@
@@ -1316,3 +1317,5 @@ MODULE_LICENSE("GPL");
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,8 @@
Index: linux-2.6.23.14/init/main.c
Index: linux-2.6.25.1/init/main.c
===================================================================
--- linux-2.6.23.14.orig/init/main.c 2008-01-25 19:12:45.000000000 +0100
+++ linux-2.6.23.14/init/main.c 2008-01-25 19:12:52.000000000 +0100
@@ -780,7 +780,7 @@
--- linux-2.6.25.1.orig/init/main.c
+++ linux-2.6.25.1/init/main.c
@@ -775,7 +775,7 @@ static int noinline init_post(void)
numa_default_policy();
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)

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

@ -1,7 +1,8 @@
diff -Nur linux-2.6.24/fs/jffs2/erase.c linux-2.6.24-owrt/fs/jffs2/erase.c
--- linux-2.6.24/fs/jffs2/erase.c 2008-01-30 17:30:15.000000000 +0100
+++ linux-2.6.24-owrt/fs/jffs2/erase.c 2008-01-30 22:20:02.000000000 +0100
@@ -35,6 +35,8 @@
Index: linux-2.6.25.1/fs/jffs2/erase.c
===================================================================
--- linux-2.6.25.1.orig/fs/jffs2/erase.c
+++ linux-2.6.25.1/fs/jffs2/erase.c
@@ -35,6 +35,8 @@ static void jffs2_erase_block(struct jff
{
int ret;
uint32_t bad_offset;
@ -10,7 +11,7 @@ diff -Nur linux-2.6.24/fs/jffs2/erase.c linux-2.6.24-owrt/fs/jffs2/erase.c
#ifdef __ECOS
ret = jffs2_flash_erase(c, jeb);
if (!ret) {
@@ -47,6 +49,11 @@
@@ -47,6 +49,11 @@ static void jffs2_erase_block(struct jff
D1(printk(KERN_DEBUG "jffs2_erase_block(): erase block %#08x (range %#08x-%#08x)\n",
jeb->offset, jeb->offset, jeb->offset + c->sector_size));

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

@ -1,7 +1,7 @@
Index: linux-2.6.23-rc6/include/linux/time.h
Index: linux-2.6.25.1/include/linux/time.h
===================================================================
--- linux-2.6.23-rc6.orig/include/linux/time.h 2007-09-21 16:23:52.000000000 +0800
+++ linux-2.6.23-rc6/include/linux/time.h 2007-09-21 16:24:09.000000000 +0800
--- linux-2.6.25.1.orig/include/linux/time.h
+++ linux-2.6.25.1/include/linux/time.h
@@ -1,6 +1,10 @@
#ifndef _LINUX_TIME_H
#define _LINUX_TIME_H
@ -13,17 +13,17 @@ Index: linux-2.6.23-rc6/include/linux/time.h
#include <linux/types.h>
#ifdef __KERNEL__
@@ -227,4 +231,6 @@
@@ -232,4 +236,6 @@ struct itimerval {
*/
#define TIMER_ABSTIME 0x01
+#endif /* __KERNEL__ DEBIAN */
+
#endif
Index: linux-2.6.23-rc6/include/linux/types.h
Index: linux-2.6.25.1/include/linux/types.h
===================================================================
--- linux-2.6.23-rc6.orig/include/linux/types.h 2007-09-21 16:23:52.000000000 +0800
+++ linux-2.6.23-rc6/include/linux/types.h 2007-09-21 16:24:09.000000000 +0800
--- linux-2.6.25.1.orig/include/linux/types.h
+++ linux-2.6.25.1/include/linux/types.h
@@ -1,6 +1,14 @@
#ifndef _LINUX_TYPES_H
#define _LINUX_TYPES_H
@ -38,8 +38,8 @@ Index: linux-2.6.23-rc6/include/linux/types.h
+
#ifdef __KERNEL__
#define BITS_TO_LONGS(bits) \
@@ -162,6 +170,8 @@
#define DECLARE_BITMAP(name,bits) \
@@ -161,6 +169,8 @@ typedef unsigned long blkcnt_t;
#endif /* __KERNEL_STRICT_NAMES */

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

@ -1,8 +1,8 @@
Index: linux-2.6.23-rc6/scripts/genksyms/parse.c_shipped
Index: linux-2.6.25.1/scripts/genksyms/parse.c_shipped
===================================================================
--- linux-2.6.23-rc6.orig/scripts/genksyms/parse.c_shipped 2007-09-21 16:23:51.000000000 +0800
+++ linux-2.6.23-rc6/scripts/genksyms/parse.c_shipped 2007-09-21 16:24:10.000000000 +0800
@@ -144,7 +144,9 @@
--- linux-2.6.25.1.orig/scripts/genksyms/parse.c_shipped
+++ linux-2.6.25.1/scripts/genksyms/parse.c_shipped
@@ -160,7 +160,9 @@
#include <assert.h>
@ -12,10 +12,10 @@ Index: linux-2.6.23-rc6/scripts/genksyms/parse.c_shipped
#include "genksyms.h"
static int is_typedef;
Index: linux-2.6.23-rc6/scripts/genksyms/parse.y
Index: linux-2.6.25.1/scripts/genksyms/parse.y
===================================================================
--- linux-2.6.23-rc6.orig/scripts/genksyms/parse.y 2007-09-21 16:23:51.000000000 +0800
+++ linux-2.6.23-rc6/scripts/genksyms/parse.y 2007-09-21 16:24:10.000000000 +0800
--- linux-2.6.25.1.orig/scripts/genksyms/parse.y
+++ linux-2.6.25.1/scripts/genksyms/parse.y
@@ -24,7 +24,9 @@
%{
@ -26,10 +26,10 @@ Index: linux-2.6.23-rc6/scripts/genksyms/parse.y
#include "genksyms.h"
static int is_typedef;
Index: linux-2.6.23-rc6/scripts/kallsyms.c
Index: linux-2.6.25.1/scripts/kallsyms.c
===================================================================
--- linux-2.6.23-rc6.orig/scripts/kallsyms.c 2007-09-21 16:23:51.000000000 +0800
+++ linux-2.6.23-rc6/scripts/kallsyms.c 2007-09-21 16:24:10.000000000 +0800
--- linux-2.6.25.1.orig/scripts/kallsyms.c
+++ linux-2.6.25.1/scripts/kallsyms.c
@@ -28,6 +28,35 @@
#include <stdlib.h>
#include <string.h>
@ -66,11 +66,11 @@ Index: linux-2.6.23-rc6/scripts/kallsyms.c
#define KSYM_NAME_LEN 128
Index: linux-2.6.23-rc6/scripts/kconfig/Makefile
Index: linux-2.6.25.1/scripts/kconfig/Makefile
===================================================================
--- linux-2.6.23-rc6.orig/scripts/kconfig/Makefile 2007-09-21 16:23:51.000000000 +0800
+++ linux-2.6.23-rc6/scripts/kconfig/Makefile 2007-09-21 16:24:10.000000000 +0800
@@ -88,6 +88,9 @@
--- linux-2.6.25.1.orig/scripts/kconfig/Makefile
+++ linux-2.6.25.1/scripts/kconfig/Makefile
@@ -93,6 +93,9 @@ check-lxdialog := $(srctree)/$(src)/lxd
# 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 +80,10 @@ Index: linux-2.6.23-rc6/scripts/kconfig/Makefile
HOST_EXTRACFLAGS += -DLOCALE
Index: linux-2.6.23-rc6/scripts/mod/mk_elfconfig.c
Index: linux-2.6.25.1/scripts/mod/mk_elfconfig.c
===================================================================
--- linux-2.6.23-rc6.orig/scripts/mod/mk_elfconfig.c 2007-09-21 16:23:51.000000000 +0800
+++ linux-2.6.23-rc6/scripts/mod/mk_elfconfig.c 2007-09-21 16:24:10.000000000 +0800
--- linux-2.6.25.1.orig/scripts/mod/mk_elfconfig.c
+++ linux-2.6.25.1/scripts/mod/mk_elfconfig.c
@@ -1,7 +1,11 @@
#include <stdio.h>
#include <stdlib.h>
@ -96,10 +96,10 @@ Index: linux-2.6.23-rc6/scripts/mod/mk_elfconfig.c
int
main(int argc, char **argv)
Index: linux-2.6.23-rc6/scripts/mod/modpost.h
Index: linux-2.6.25.1/scripts/mod/modpost.h
===================================================================
--- linux-2.6.23-rc6.orig/scripts/mod/modpost.h 2007-09-21 16:23:51.000000000 +0800
+++ linux-2.6.23-rc6/scripts/mod/modpost.h 2007-09-21 16:24:10.000000000 +0800
--- linux-2.6.25.1.orig/scripts/mod/modpost.h
+++ linux-2.6.25.1/scripts/mod/modpost.h
@@ -7,7 +7,11 @@
#include <sys/mman.h>
#include <fcntl.h>

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

@ -1,7 +1,8 @@
diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_ap.c linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_ap.c
--- linux-2.6.17/drivers/net/wireless/hostap/hostap_ap.c 2006-06-18 04:49:35.000000000 +0300
+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_ap.c 2006-12-10 19:13:33.000000000 +0200
@@ -2345,13 +2345,13 @@
Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap_ap.c
===================================================================
--- linux-2.6.25.1.orig/drivers/net/wireless/hostap/hostap_ap.c
+++ linux-2.6.25.1/drivers/net/wireless/hostap/hostap_ap.c
@@ -2397,13 +2397,13 @@ int prism2_ap_get_sta_qual(local_info_t
addr[count].sa_family = ARPHRD_ETHER;
memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
if (sta->last_rx_silence == 0)
@ -21,7 +22,7 @@ diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_ap.c linux-2.6.17-patc
qual[count].updated = sta->last_rx_updated;
sta->last_rx_updated = IW_QUAL_DBM;
@@ -2416,13 +2416,13 @@
@@ -2468,13 +2468,13 @@ int prism2_ap_translate_scan(struct net_
memset(&iwe, 0, sizeof(iwe));
iwe.cmd = IWEVQUAL;
if (sta->last_rx_silence == 0)
@ -41,10 +42,11 @@ diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_ap.c linux-2.6.17-patc
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,
diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_config.h linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_config.h
--- linux-2.6.17/drivers/net/wireless/hostap/hostap_config.h 2006-06-18 04:49:35.000000000 +0300
+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_config.h 2006-12-10 19:13:33.000000000 +0200
@@ -47,4 +47,9 @@
Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap_config.h
===================================================================
--- linux-2.6.25.1.orig/drivers/net/wireless/hostap/hostap_config.h
+++ linux-2.6.25.1/drivers/net/wireless/hostap/hostap_config.h
@@ -45,4 +45,9 @@
*/
/* #define PRISM2_NO_STATION_MODES */
@ -54,32 +56,35 @@ diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_config.h linux-2.6.17-
+#define RAW_TXPOWER_SETTING
+
#endif /* HOSTAP_CONFIG_H */
diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap.h linux-2.6.17-patched/drivers/net/wireless/hostap/hostap.h
--- linux-2.6.17/drivers/net/wireless/hostap/hostap.h 2006-06-18 04:49:35.000000000 +0300
+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap.h 2006-12-10 19:20:00.000000000 +0200
@@ -89,6 +89,7 @@
extern struct ethtool_ops prism2_ethtool_ops;
Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap.h
===================================================================
--- linux-2.6.25.1.orig/drivers/net/wireless/hostap/hostap.h
+++ linux-2.6.25.1/drivers/net/wireless/hostap/hostap.h
@@ -89,6 +89,7 @@ extern const struct iw_handler_def hosta
extern const struct ethtool_ops prism2_ethtool_ops;
int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
+int hostap_restore_power(struct net_device *dev);
#endif /* HOSTAP_H */
diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_hw.c linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_hw.c
--- linux-2.6.17/drivers/net/wireless/hostap/hostap_hw.c 2006-06-18 04:49:35.000000000 +0300
+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_hw.c 2006-12-10 19:13:33.000000000 +0200
@@ -1043,6 +1043,7 @@
dev->name, local->fragm_threshold);
Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap_hw.c
===================================================================
--- linux-2.6.25.1.orig/drivers/net/wireless/hostap/hostap_hw.c
+++ linux-2.6.25.1/drivers/net/wireless/hostap/hostap_hw.c
@@ -933,6 +933,7 @@ static int hfa384x_set_rid(struct net_de
prism2_hw_reset(dev);
}
+ hostap_restore_power(dev);
return res;
}
diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_info.c linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_info.c
--- linux-2.6.17/drivers/net/wireless/hostap/hostap_info.c 2006-06-18 04:49:35.000000000 +0300
+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_info.c 2006-12-10 19:13:33.000000000 +0200
@@ -429,6 +429,11 @@
Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap_info.c
===================================================================
--- linux-2.6.25.1.orig/drivers/net/wireless/hostap/hostap_info.c
+++ linux-2.6.25.1/drivers/net/wireless/hostap/hostap_info.c
@@ -434,6 +434,11 @@ static void handle_info_queue_linkstatus
}
/* Get BSSID if we have a valid AP address */
@ -91,10 +96,11 @@ diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_info.c linux-2.6.17-pa
if (connected) {
netif_carrier_on(local->dev);
netif_carrier_on(local->ddev);
diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_ioctl.c linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_ioctl.c
--- linux-2.6.17/drivers/net/wireless/hostap/hostap_ioctl.c 2006-06-18 04:49:35.000000000 +0300
+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_ioctl.c 2006-12-10 21:21:03.000000000 +0200
@@ -1506,23 +1506,20 @@
Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap_ioctl.c
===================================================================
--- linux-2.6.25.1.orig/drivers/net/wireless/hostap/hostap_ioctl.c
+++ linux-2.6.25.1/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -1500,23 +1500,20 @@ static int prism2_txpower_hfa386x_to_dBm
val = 255;
tmp = val;
@ -122,7 +128,7 @@ diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_ioctl.c linux-2.6.17-p
return (unsigned char) tmp;
}
@@ -4086,3 +4083,35 @@
@@ -4076,3 +4073,35 @@ int hostap_ioctl(struct net_device *dev,
return ret;
}

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

@ -1,8 +1,8 @@
Index: linux-2.6.23-rc6/include/linux/stddef.h
Index: linux-2.6.25.1/include/linux/stddef.h
===================================================================
--- linux-2.6.23-rc6.orig/include/linux/stddef.h 2007-09-21 16:23:51.000000000 +0800
+++ linux-2.6.23-rc6/include/linux/stddef.h 2007-09-21 16:24:10.000000000 +0800
@@ -16,6 +16,7 @@
--- linux-2.6.25.1.orig/include/linux/stddef.h
+++ linux-2.6.25.1/include/linux/stddef.h
@@ -16,6 +16,7 @@ enum {
false = 0,
true = 1
};
@ -10,7 +10,7 @@ Index: linux-2.6.23-rc6/include/linux/stddef.h
#undef offsetof
#ifdef __compiler_offsetof
@@ -23,6 +24,5 @@
@@ -23,6 +24,5 @@ enum {
#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,8 @@
Index: linux-2.6.23-rc6/scripts/gen_initramfs_list.sh
Index: linux-2.6.25.1/scripts/gen_initramfs_list.sh
===================================================================
--- linux-2.6.23-rc6.orig/scripts/gen_initramfs_list.sh 2007-09-21 16:23:51.000000000 +0800
+++ linux-2.6.23-rc6/scripts/gen_initramfs_list.sh 2007-09-21 16:24:11.000000000 +0800
@@ -125,7 +125,7 @@
--- linux-2.6.25.1.orig/scripts/gen_initramfs_list.sh
+++ linux-2.6.25.1/scripts/gen_initramfs_list.sh
@@ -125,7 +125,7 @@ parse() {
str="${ftype} ${name} ${location} ${str}"
;;
"nod")
@ -11,7 +11,7 @@ Index: linux-2.6.23-rc6/scripts/gen_initramfs_list.sh
local maj=`field 5 ${dev}`
local min=`field 6 ${dev}`
maj=${maj%,}
@@ -135,7 +135,7 @@
@@ -135,7 +135,7 @@ parse() {
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,7 @@
Index: linux-2.6.23.9/arch/i386/boot/tools/build.c
Index: linux-2.6.25.1/arch/x86/boot/tools/build.c
===================================================================
--- linux-2.6.23.9.orig/arch/x86/boot/tools/build.c 2007-12-12 01:10:17.967096643 +0100
+++ linux-2.6.23.9/arch/i386/x86/tools/build.c 2007-12-12 01:10:22.051329391 +0100
--- linux-2.6.25.1.orig/arch/x86/boot/tools/build.c
+++ linux-2.6.25.1/arch/x86/boot/tools/build.c
@@ -29,7 +29,6 @@
#include <stdarg.h>
#include <sys/types.h>

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

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

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

@ -30,10 +30,11 @@ and didn't make it with the ppc32 equivalent. Thanks.
---
diff -uprN a/include/asm-ppc/io.h b/include/asm-ppc/io.h
--- a/include/asm-ppc/io.h 2005-08-21 17:49:44.000000000 -0400
+++ b/include/asm-ppc/io.h 2005-08-21 20:29:55.000000000 -0400
@@ -487,11 +487,21 @@ static inline unsigned int ioread16(void
Index: linux-2.6.25.1/include/asm-ppc/io.h
===================================================================
--- linux-2.6.25.1.orig/include/asm-ppc/io.h
+++ linux-2.6.25.1/include/asm-ppc/io.h
@@ -413,11 +413,21 @@ static inline unsigned int ioread16(void
return readw(addr);
}
@ -55,7 +56,7 @@ diff -uprN a/include/asm-ppc/io.h b/include/asm-ppc/io.h
static inline void iowrite8(u8 val, void __iomem *addr)
{
writeb(val, addr);
@@ -502,11 +512,21 @@ static inline void iowrite16(u16 val, vo
@@ -428,11 +438,21 @@ static inline void iowrite16(u16 val, vo
writew(val, addr);
}
@ -77,4 +78,3 @@ diff -uprN a/include/asm-ppc/io.h b/include/asm-ppc/io.h
static inline void ioread8_rep(void __iomem *addr, void *dst, unsigned long count)
{
_insb(addr, dst, count);

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

@ -1,5 +1,7 @@
--- linux-2.6.24.2/arch/arm/tools/mach-types 2008-04-09 01:34:47.000000000 +0200
+++ linux-2.6.24.2-owrt/arch/arm/tools/mach-types 2008-04-09 14:26:57.000000000 +0200
Index: linux-2.6.25.1/arch/arm/tools/mach-types
===================================================================
--- linux-2.6.25.1.orig/arch/arm/tools/mach-types
+++ linux-2.6.25.1/arch/arm/tools/mach-types
@@ -12,7 +12,7 @@
#
# http://www.arm.linux.org.uk/developer/machines/?action=new
@ -9,7 +11,7 @@
#
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
#
@@ -381,13 +381,13 @@
@@ -381,13 +381,13 @@ ks8695p ARCH_KS8695P KS8695P 363
se4000 ARCH_SE4000 SE4000 364
quadriceps ARCH_QUADRICEPS QUADRICEPS 365
bronco ARCH_BRONCO BRONCO 366
@ -25,7 +27,7 @@
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 @@
@@ -1463,7 +1463,7 @@ artemis MACH_ARTEMIS ARTEMIS 1462
htctitan MACH_HTCTITAN HTCTITAN 1463
qranium MACH_QRANIUM QRANIUM 1464
adx_wsc2 MACH_ADX_WSC2 ADX_WSC2 1465
@ -34,7 +36,7 @@
bboard MACH_BBOARD BBOARD 1467
cambria MACH_CAMBRIA CAMBRIA 1468
mt7xxx MACH_MT7XXX MT7XXX 1469
@@ -1611,3 +1611,112 @@
@@ -1611,3 +1611,112 @@ kb9263 MACH_KB9263 KB9263 1612
mt7108 MACH_MT7108 MT7108 1613
smtr2440 MACH_SMTR2440 SMTR2440 1614
manao MACH_MANAO MANAO 1615

8
target/linux/generic-2.6/patches-2.6.25/950-revert_conntrack_optimization.patch
View File

@ -1,6 +1,8 @@
--- linux-2.6.25/net/netfilter/nf_conntrack_core.c 2008-04-17 04:49:44.000000000 +0200
+++ linux-2.6.25-owrt/net/netfilter/nf_conntrack_core.c 2008-04-30 12:36:55.000000000 +0200
@@ -73,19 +73,15 @@
Index: linux-2.6.25.1/net/netfilter/nf_conntrack_core.c
===================================================================
--- linux-2.6.25.1.orig/net/netfilter/nf_conntrack_core.c
+++ linux-2.6.25.1/net/netfilter/nf_conntrack_core.c
@@ -73,19 +73,15 @@ static unsigned int nf_conntrack_hash_rn
static u_int32_t __hash_conntrack(const struct nf_conntrack_tuple *tuple,
unsigned int size, unsigned int rnd)
{

2
target/linux/ixp4xx/Makefile
View File

@ -12,7 +12,7 @@ BOARDNAME:=Intel IXP4xx
FEATURES:=squashfs
SUBTARGETS=generic harddisk
LINUX_VERSION:=2.6.25
LINUX_VERSION:=2.6.25.1
include $(INCLUDE_DIR)/target.mk

32
target/linux/ixp4xx/patches-2.6.25/010-rtc_isl1208_new_style.patch
View File

@ -2,10 +2,10 @@
drivers/rtc/rtc-isl1208.c | 357 +++++++++++++++++++++-------------------------
1 file changed, 170 insertions(+), 187 deletions(-)
Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
Index: linux-2.6.25.1/drivers/rtc/rtc-isl1208.c
===================================================================
--- linux-2.6.25-rc6-armeb.orig/drivers/rtc/rtc-isl1208.c 2008-03-20 10:26:41.000000000 +1030
+++ linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c 2008-03-20 10:26:53.000000000 +1030
--- linux-2.6.25.1.orig/drivers/rtc/rtc-isl1208.c
+++ linux-2.6.25.1/drivers/rtc/rtc-isl1208.c
@@ -15,16 +15,15 @@
#include <linux/bcd.h>
#include <linux/rtc.h>
@ -93,7 +93,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
BUG_ON(reg > ISL1208_REG_USR2);
BUG_ON(reg + len > ISL1208_REG_USR2 + 1);
@@ -103,15 +84,14 @@
@@ -103,15 +84,14 @@ isl1208_i2c_read_regs(struct i2c_client
/* block write */
static int
isl1208_i2c_set_regs(struct i2c_client *client, u8 reg, u8 const buf[],
@ -111,7 +111,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
BUG_ON(reg > ISL1208_REG_USR2);
BUG_ON(reg + len > ISL1208_REG_USR2 + 1);
@@ -125,7 +105,8 @@
@@ -125,7 +105,8 @@ isl1208_i2c_set_regs(struct i2c_client *
}
/* simple check to see wether we have a isl1208 */
@ -121,7 +121,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
{
u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };
u8 zero_mask[ISL1208_RTC_SECTION_LEN] = {
@@ -139,24 +120,29 @@
@@ -139,24 +120,29 @@ static int isl1208_i2c_validate_client(s
return ret;
for (i = 0; i < ISL1208_RTC_SECTION_LEN; ++i) {
@ -157,7 +157,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
/* The 6bit value in the ATR register controls the load
* capacitance C_load * in steps of 0.25pF
@@ -169,51 +155,54 @@
@@ -169,51 +155,54 @@ static int isl1208_i2c_get_atr(struct i2
*
*/
@ -225,7 +225,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
{
struct i2c_client *const client = to_i2c_client(dev);
int sr, dtr, atr, usr;
@@ -230,20 +219,19 @@
@@ -230,20 +219,19 @@ static int isl1208_rtc_proc(struct devic
(sr & ISL1208_REG_SR_ALM) ? " ALM" : "",
(sr & ISL1208_REG_SR_WRTC) ? " WRTC" : "",
(sr & ISL1208_REG_SR_XTOSCB) ? " XTOSCB" : "",
@ -249,7 +249,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
usr = isl1208_i2c_get_usr(client);
if (usr >= 0)
@@ -252,9 +240,8 @@
@@ -252,9 +240,8 @@ static int isl1208_rtc_proc(struct devic
return 0;
}
@ -261,7 +261,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
{
int sr;
u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };
@@ -274,27 +261,30 @@
@@ -274,27 +261,30 @@ static int isl1208_i2c_read_time(struct
tm->tm_sec = BCD2BIN(regs[ISL1208_REG_SC]);
tm->tm_min = BCD2BIN(regs[ISL1208_REG_MN]);
@ -299,7 +299,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
{
struct rtc_time *const tm = &alarm->time;
u8 regs[ISL1208_ALARM_SECTION_LEN] = { 0, };
@@ -307,7 +297,7 @@
@@ -307,7 +297,7 @@ static int isl1208_i2c_read_alarm(struct
}
sr = isl1208_i2c_read_regs(client, ISL1208_REG_SCA, regs,
@ -308,7 +308,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
if (sr < 0) {
dev_err(&client->dev, "%s: reading alarm section failed\n",
__func__);
@@ -315,23 +305,25 @@
@@ -315,23 +305,25 @@ static int isl1208_i2c_read_alarm(struct
}
/* MSB of each alarm register is an enable bit */
@ -343,7 +343,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
{
int sr;
u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };
@@ -353,7 +345,7 @@
@@ -353,7 +345,7 @@ static int isl1208_i2c_set_time(struct i
}
/* set WRTC */
@ -352,7 +352,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
sr | ISL1208_REG_SR_WRTC);
if (sr < 0) {
dev_err(&client->dev, "%s: writing SR failed\n", __func__);
@@ -369,7 +361,7 @@
@@ -369,7 +361,7 @@ static int isl1208_i2c_set_time(struct i
}
/* clear WRTC again */
@ -361,7 +361,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
sr & ~ISL1208_REG_SR_WRTC);
if (sr < 0) {
dev_err(&client->dev, "%s: writing SR failed\n", __func__);
@@ -380,70 +372,69 @@
@@ -380,70 +372,69 @@ static int isl1208_i2c_set_time(struct i
}
@ -460,7 +460,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
{
int usr = -1;
@@ -460,124 +451,116 @@
@@ -460,124 +451,116 @@ static ssize_t isl1208_sysfs_store_usr(s
return isl1208_i2c_set_usr(to_i2c_client(dev), usr) ? -EIO : count;
}

14
target/linux/ixp4xx/patches-2.6.25/011-rtc_pcf8563_new_style.patch
View File

@ -2,10 +2,10 @@
drivers/rtc/rtc-pcf8563.c | 109 +++++++++++++---------------------------------
1 file changed, 32 insertions(+), 77 deletions(-)
Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-pcf8563.c
Index: linux-2.6.25.1/drivers/rtc/rtc-pcf8563.c
===================================================================
--- linux-2.6.25-rc6-armeb.orig/drivers/rtc/rtc-pcf8563.c 2008-03-20 10:26:43.000000000 +1030
+++ linux-2.6.25-rc6-armeb/drivers/rtc/rtc-pcf8563.c 2008-03-20 10:26:51.000000000 +1030
--- linux-2.6.25.1.orig/drivers/rtc/rtc-pcf8563.c
+++ linux-2.6.25.1/drivers/rtc/rtc-pcf8563.c
@@ -18,17 +18,7 @@
#include <linux/bcd.h>
#include <linux/rtc.h>
@ -25,7 +25,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-pcf8563.c
#define PCF8563_REG_ST1 0x00 /* status */
#define PCF8563_REG_ST2 0x01
@@ -53,8 +43,10 @@
@@ -53,8 +43,10 @@ I2C_CLIENT_INSMOD;
#define PCF8563_SC_LV 0x80 /* low voltage */
#define PCF8563_MO_C 0x80 /* century */
@ -37,7 +37,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-pcf8563.c
/*
* The meaning of MO_C bit varies by the chip type.
* From PCF8563 datasheet: this bit is toggled when the years
@@ -72,16 +64,13 @@
@@ -72,16 +64,13 @@ struct pcf8563 {
int c_polarity; /* 0: MO_C=1 means 19xx, otherwise MO_C=1 means 20xx */
};
@ -55,7 +55,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-pcf8563.c
unsigned char buf[13] = { PCF8563_REG_ST1 };
struct i2c_msg msgs[] = {
@@ -138,7 +127,7 @@
@@ -138,7 +127,7 @@ static int pcf8563_get_datetime(struct i
static int pcf8563_set_datetime(struct i2c_client *client, struct rtc_time *tm)
{
@ -64,7 +64,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-pcf8563.c
int i, err;
unsigned char buf[9];
@@ -257,100 +246,66 @@
@@ -257,100 +246,66 @@ static const struct rtc_class_ops pcf856
.set_time = pcf8563_rtc_set_time,
};

12
target/linux/ixp4xx/patches-2.6.25/012-rtc_x1205_new_style.patch
View File

@ -2,10 +2,10 @@
drivers/rtc/rtc-x1205.c | 128 ++++++++++++++++--------------------------------
1 file changed, 43 insertions(+), 85 deletions(-)
Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-x1205.c
Index: linux-2.6.25.1/drivers/rtc/rtc-x1205.c
===================================================================
--- linux-2.6.25-rc6-armeb.orig/drivers/rtc/rtc-x1205.c 2008-03-20 10:24:13.000000000 +1030
+++ linux-2.6.25-rc6-armeb/drivers/rtc/rtc-x1205.c 2008-03-20 10:24:23.000000000 +1030
--- linux-2.6.25.1.orig/drivers/rtc/rtc-x1205.c
+++ linux-2.6.25.1/drivers/rtc/rtc-x1205.c
@@ -22,20 +22,7 @@
#include <linux/rtc.h>
#include <linux/delay.h>
@ -28,7 +28,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-x1205.c
/* offsets into CCR area */
@@ -91,19 +78,7 @@
@@ -91,19 +78,7 @@ I2C_CLIENT_INSMOD;
#define X1205_HR_MIL 0x80 /* Set in ccr.hour for 24 hr mode */
@ -49,7 +49,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-x1205.c
/*
* In the routines that deal directly with the x1205 hardware, we use
@@ -497,58 +472,51 @@
@@ -497,58 +472,51 @@ static ssize_t x1205_sysfs_show_dtrim(st
}
static DEVICE_ATTR(dtrim, S_IRUGO, x1205_sysfs_show_dtrim, NULL);
@ -135,7 +135,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-x1205.c
i2c_set_clientdata(client, rtc);
@@ -565,45 +533,35 @@
@@ -565,45 +533,35 @@ static int x1205_probe(struct i2c_adapte
else
dev_err(&client->dev, "couldn't read status\n");

68
target/linux/ixp4xx/patches-2.6.25/030-ixp4xx_fsg_board_support.patch
View File

@ -45,10 +45,10 @@ now calls machine_restart() directly.
create mode 100644 arch/arm/mach-ixp4xx/fsg-setup.c
create mode 100644 include/asm-arm/arch-ixp4xx/fsg.h
diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig
index efa0485..fc14932 100644
--- a/arch/arm/configs/ixp4xx_defconfig
+++ b/arch/arm/configs/ixp4xx_defconfig
Index: linux-2.6.25.1/arch/arm/configs/ixp4xx_defconfig
===================================================================
--- linux-2.6.25.1.orig/arch/arm/configs/ixp4xx_defconfig
+++ linux-2.6.25.1/arch/arm/configs/ixp4xx_defconfig
@@ -165,6 +165,7 @@ CONFIG_ARCH_PRPMC1100=y
CONFIG_MACH_NAS100D=y
CONFIG_MACH_DSMG600=y
@ -94,10 +94,10 @@ index efa0485..fc14932 100644
CONFIG_RTC_DRV_X1205=y
CONFIG_RTC_DRV_PCF8563=y
# CONFIG_RTC_DRV_PCF8583 is not set
diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
index e774447..db8b5fe 100644
--- a/arch/arm/mach-ixp4xx/Kconfig
+++ b/arch/arm/mach-ixp4xx/Kconfig
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
@@ -125,6 +125,15 @@ config ARCH_IXDP4XX
depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435
default y
@ -114,11 +114,11 @@ index e774447..db8b5fe 100644
#
# Certain registers and IRQs are only enabled if supporting IXP465 CPUs
#
diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile
index c195688..2e6bbf9 100644
--- a/arch/arm/mach-ixp4xx/Makefile
+++ b/arch/arm/mach-ixp4xx/Makefile
@@ -15,6 +15,7 @@ obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
@@ -15,6 +15,7 @@ obj-pci-$(CONFIG_MACH_NAS100D) += nas10
obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
@ -126,7 +126,7 @@ index c195688..2e6bbf9 100644
obj-y += common.o
@@ -28,6 +29,7 @@ obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o
@@ -28,6 +29,7 @@ obj-$(CONFIG_MACH_NAS100D) += nas100d-se
obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o
obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
@ -134,11 +134,10 @@ index c195688..2e6bbf9 100644
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
diff --git a/arch/arm/mach-ixp4xx/fsg-pci.c b/arch/arm/mach-ixp4xx/fsg-pci.c
new file mode 100644
index 0000000..f19f3f6
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-pci.c
===================================================================
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/fsg-pci.c
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-pci.c
@@ -0,0 +1,71 @@
+/*
+ * arch/arch/mach-ixp4xx/fsg-pci.c
@ -211,11 +210,10 @@ index 0000000..f19f3f6
+}
+
+subsys_initcall(fsg_pci_init);
diff --git a/arch/arm/mach-ixp4xx/fsg-setup.c b/arch/arm/mach-ixp4xx/fsg-setup.c
new file mode 100644
index 0000000..0db3a90
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-setup.c
===================================================================
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/fsg-setup.c
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-setup.c
@@ -0,0 +1,276 @@
+/*
+ * arch/arm/mach-ixp4xx/fsg-setup.c
@ -493,11 +491,10 @@ index 0000000..0db3a90
+ .init_machine = fsg_init,
+MACHINE_END
+
diff --git a/include/asm-arm/arch-ixp4xx/fsg.h b/include/asm-arm/arch-ixp4xx/fsg.h
new file mode 100644
index 0000000..c0100cc
Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/fsg.h
===================================================================
--- /dev/null
+++ b/include/asm-arm/arch-ixp4xx/fsg.h
+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/fsg.h
@@ -0,0 +1,50 @@
+/*
+ * include/asm-arm/arch-ixp4xx/fsg.h
@ -549,10 +546,10 @@ index 0000000..c0100cc
+#define FSG_LED_USB_BIT 4
+#define FSG_LED_RING_BIT 5
+#define FSG_LED_SYNC_BIT 7
diff --git a/include/asm-arm/arch-ixp4xx/hardware.h b/include/asm-arm/arch-ixp4xx/hardware.h
index 73e8dc3..fa723a6 100644
--- a/include/asm-arm/arch-ixp4xx/hardware.h
+++ b/include/asm-arm/arch-ixp4xx/hardware.h
Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/hardware.h
===================================================================
--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/hardware.h
+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/hardware.h
@@ -45,5 +45,6 @@
#include "nslu2.h"
#include "nas100d.h"
@ -560,10 +557,10 @@ index 73e8dc3..fa723a6 100644
+#include "fsg.h"
#endif /* _ASM_ARCH_HARDWARE_H */
diff --git a/include/asm-arm/arch-ixp4xx/irqs.h b/include/asm-arm/arch-ixp4xx/irqs.h
index 1180160..674af4a 100644
--- a/include/asm-arm/arch-ixp4xx/irqs.h
+++ b/include/asm-arm/arch-ixp4xx/irqs.h
Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/irqs.h
===================================================================
--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/irqs.h
+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/irqs.h
@@ -128,4 +128,11 @@
#define IRQ_DSMG600_PCI_INTE IRQ_IXP4XX_GPIO7
#define IRQ_DSMG600_PCI_INTF IRQ_IXP4XX_GPIO6
@ -576,6 +573,3 @@ index 1180160..674af4a 100644
+#define IRQ_FSG_PCI_INTC IRQ_IXP4XX_GPIO5
+
#endif
--
1.5.2.5

28
target/linux/ixp4xx/patches-2.6.25/031-ixp4xx_fsg_led_driver.patch
View File

@ -18,10 +18,10 @@ KernelVersion: v2.6.25-rc6-117-g457fb60
3 files changed, 268 insertions(+), 0 deletions(-)
create mode 100644 drivers/leds/leds-fsg.c
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 859814f..aefbe04 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
Index: linux-2.6.25.1/drivers/leds/Kconfig
===================================================================
--- linux-2.6.25.1.orig/drivers/leds/Kconfig
+++ linux-2.6.25.1/drivers/leds/Kconfig
@@ -46,6 +46,12 @@ config LEDS_SPITZ
This option enables support for the LEDs on Sharp Zaurus
SL-Cxx00 series (C1000, C3000, C3100).
@ -35,11 +35,11 @@ index 859814f..aefbe04 100644
config LEDS_TOSA
tristate "LED Support for the Sharp SL-6000 series"
depends on LEDS_CLASS && PXA_SHARPSL
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index 84ced3b..b17bd91 100644
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o
Index: linux-2.6.25.1/drivers/leds/Makefile
===================================================================
--- linux-2.6.25.1.orig/drivers/leds/Makefile
+++ linux-2.6.25.1/drivers/leds/Makefile
@@ -22,6 +22,7 @@ obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o
obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o
obj-$(CONFIG_LEDS_CLEVO_MAIL) += leds-clevo-mail.o
obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.o
@ -47,11 +47,10 @@ index 84ced3b..b17bd91 100644
# LED Triggers
obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o
diff --git a/drivers/leds/leds-fsg.c b/drivers/leds/leds-fsg.c
new file mode 100644
index 0000000..a7421b8
Index: linux-2.6.25.1/drivers/leds/leds-fsg.c
===================================================================
--- /dev/null
+++ b/drivers/leds/leds-fsg.c
+++ linux-2.6.25.1/drivers/leds/leds-fsg.c
@@ -0,0 +1,261 @@
+/*
+ * LED Driver for the Freecom FSG-3
@ -314,6 +313,3 @@ index 0000000..a7421b8
+MODULE_AUTHOR("Rod Whitby <rod@whitby.id.au>");
+MODULE_DESCRIPTION("Freecom FSG-3 LED driver");
+MODULE_LICENSE("GPL");
--
1.5.2.5

6
target/linux/ixp4xx/patches-2.6.25/090-increase_entropy_pools.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.19/drivers/char/random.c
Index: linux-2.6.25.1/drivers/char/random.c
===================================================================
--- linux-2.6.19.orig/drivers/char/random.c
+++ linux-2.6.19/drivers/char/random.c
--- linux-2.6.25.1.orig/drivers/char/random.c
+++ linux-2.6.25.1/drivers/char/random.c
@@ -248,9 +248,9 @@
/*
* Configuration information

9
target/linux/ixp4xx/patches-2.6.25/100-gateway7001_mac_plat_info.patch
View File

@ -1,7 +1,8 @@
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/gateway7001-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/gateway7001-setup.c
--- linux-2.6.23/arch/arm/mach-ixp4xx/gateway7001-setup.c 2007-10-09 22:31:38.000000000 +0200
+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/gateway7001-setup.c 2007-10-22 15:09:33.000000000 +0200
@@ -76,9 +76,36 @@
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/gateway7001-setup.c
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/gateway7001-setup.c
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/gateway7001-setup.c
@@ -76,9 +76,36 @@ static struct platform_device gateway700
.resource = &gateway7001_uart_resource,
};

9
target/linux/ixp4xx/patches-2.6.25/101-wg302_mac_plat_info.patch
View File

@ -1,7 +1,8 @@
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/wg302v2-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/wg302v2-setup.c
--- linux-2.6.23/arch/arm/mach-ixp4xx/wg302v2-setup.c 2007-10-09 22:31:38.000000000 +0200
+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/wg302v2-setup.c 2007-10-22 15:02:20.000000000 +0200
@@ -77,9 +77,27 @@
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v2-setup.c
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/wg302v2-setup.c
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v2-setup.c
@@ -77,9 +77,27 @@ static struct platform_device wg302v2_ua
.resource = &wg302v2_uart_resource,
};

47
target/linux/ixp4xx/patches-2.6.25/110-pronghorn_metro_support.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
===================================================================
--- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:23.000000000 +1030
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:26.000000000 +1030
@@ -57,6 +57,14 @@
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
@@ -57,6 +57,14 @@ config MACH_WG302V2
WG302 v2 or WAG302 v2 Access Points. For more information
on this platform, see http://openwrt.org
@ -17,11 +17,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
config ARCH_IXDP425
bool "IXDP425"
help
Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
===================================================================
--- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:23.000000000 +1030
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:26.000000000 +1030
@@ -16,6 +16,7 @@
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
@@ -16,6 +16,7 @@ obj-pci-$(CONFIG_MACH_DSMG600) += dsmg6
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
@ -29,17 +29,18 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
obj-y += common.o
@@ -30,5 +31,6 @@
@@ -30,6 +31,7 @@ obj-$(CONFIG_MACH_DSMG600) += dsmg6
obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
obj-$(CONFIG_MACH_FSG) += fsg-setup.o
+obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
Index: linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-pci.c 2008-03-12 21:21:26.000000000 +1030
--- /dev/null
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
@@ -0,0 +1,74 @@
+/*
+ * arch/arch/mach-ixp4xx/pronghornmetro-pci.c
@ -115,10 +116,10 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
+}
+
+subsys_initcall(pronghornmetro_pci_init);
Index: linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2008-03-12 21:21:26.000000000 +1030
--- /dev/null
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
@@ -0,0 +1,147 @@
+/*
+ * arch/arm/mach-ixp4xx/pronghornmetro-setup.c
@ -267,11 +268,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
+ .init_machine = pronghornmetro_init,
+MACHINE_END
+#endif
Index: linux-2.6.24/Documentation/arm/IXP4xx
Index: linux-2.6.25.1/Documentation/arm/IXP4xx
===================================================================
--- linux-2.6.24.orig/Documentation/arm/IXP4xx 2008-03-12 21:20:48.000000000 +1030
+++ linux-2.6.24/Documentation/arm/IXP4xx 2008-03-12 21:21:26.000000000 +1030
@@ -111,6 +111,9 @@
--- linux-2.6.25.1.orig/Documentation/arm/IXP4xx
+++ linux-2.6.25.1/Documentation/arm/IXP4xx
@@ -111,6 +111,9 @@ http://www.adiengineering.com/productsCo
the platform has two mini-PCI slots used for 802.11[bga] cards.
Finally, there is an IDE port hanging off the expansion bus.
@ -281,11 +282,11 @@ Index: linux-2.6.24/Documentation/arm/IXP4xx
Gateworks Avila Network Platform
http://www.gateworks.com/avila_sbc.htm
Index: linux-2.6.24/include/asm-arm/arch-ixp4xx/uncompress.h
Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h
===================================================================
--- linux-2.6.24.orig/include/asm-arm/arch-ixp4xx/uncompress.h 2008-03-12 21:20:48.000000000 +1030
+++ linux-2.6.24/include/asm-arm/arch-ixp4xx/uncompress.h 2008-03-12 21:21:26.000000000 +1030
@@ -41,7 +41,8 @@
--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/uncompress.h
+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h
@@ -41,7 +41,8 @@ static __inline__ void __arch_decomp_set
* Some boards are using UART2 as console
*/
if (machine_is_adi_coyote() || machine_is_gtwx5715() ||

9
target/linux/ixp4xx/patches-2.6.25/111-pronghorn_metro_mac_plat_info.patch
View File

@ -1,7 +1,8 @@
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
--- linux-2.6.23/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-10-22 15:41:27.000000000 +0200
+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-10-22 15:43:30.000000000 +0200
@@ -104,9 +104,36 @@
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
@@ -104,9 +104,36 @@ static struct platform_device pronghornm
.resource = pronghornmetro_pata_resources,
};

41
target/linux/ixp4xx/patches-2.6.25/120-compex_support.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
===================================================================
--- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:26.000000000 +1030
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:26.000000000 +1030
@@ -65,6 +65,14 @@
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
@@ -65,6 +65,14 @@ config MACH_PRONGHORNMETRO
Engineering Pronghorn Metro Platform. For more
information on this platform, see <file:Documentation/arm/IXP4xx>.
@ -17,11 +17,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
config ARCH_IXDP425
bool "IXDP425"
help
Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
===================================================================
--- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:26.000000000 +1030
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:26.000000000 +1030
@@ -17,6 +17,7 @@
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
@@ -17,6 +17,7 @@ obj-pci-$(CONFIG_MACH_GATEWAY7001) += ga
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
@ -29,17 +29,18 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
obj-y += common.o
@@ -32,5 +33,6 @@
@@ -32,6 +33,7 @@ obj-$(CONFIG_MACH_GATEWAY7001) += gatewa
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
obj-$(CONFIG_MACH_FSG) += fsg-setup.o
obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
+obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
Index: linux-2.6.24/arch/arm/mach-ixp4xx/compex-setup.c
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/compex-setup.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.24/arch/arm/mach-ixp4xx/compex-setup.c 2008-03-12 21:21:26.000000000 +1030
--- /dev/null
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/compex-setup.c
@@ -0,0 +1,120 @@
+/*
+ * arch/arm/mach-ixp4xx/compex-setup.c
@ -161,11 +162,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/compex-setup.c
+ .init_machine = compex_init,
+MACHINE_END
+#endif
Index: linux-2.6.24/arch/arm/mach-ixp4xx/ixdp425-pci.c
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixdp425-pci.c
===================================================================
--- linux-2.6.24.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c 2008-03-12 21:20:48.000000000 +1030
+++ linux-2.6.24/arch/arm/mach-ixp4xx/ixdp425-pci.c 2008-03-12 21:21:26.000000000 +1030
@@ -66,7 +66,7 @@
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -66,7 +66,7 @@ struct hw_pci ixdp425_pci __initdata = {
int __init ixdp425_pci_init(void)
{
if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
@ -174,11 +175,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/ixdp425-pci.c
pci_common_init(&ixdp425_pci);
return 0;
}
Index: linux-2.6.24/arch/arm/tools/mach-types
Index: linux-2.6.25.1/arch/arm/tools/mach-types
===================================================================
--- linux-2.6.24.orig/arch/arm/tools/mach-types 2008-03-12 21:20:48.000000000 +1030
+++ linux-2.6.24/arch/arm/tools/mach-types 2008-03-12 21:21:26.000000000 +1030
@@ -1278,7 +1278,7 @@
--- linux-2.6.25.1.orig/arch/arm/tools/mach-types
+++ linux-2.6.25.1/arch/arm/tools/mach-types
@@ -1276,7 +1276,7 @@ oiab MACH_OIAB OIAB 1269
smdk6400 MACH_SMDK6400 SMDK6400 1270
nokia_n800 MACH_NOKIA_N800 NOKIA_N800 1271
greenphone MACH_GREENPHONE GREENPHONE 1272

9
target/linux/ixp4xx/patches-2.6.25/121-compex_mac_plat_info.patch
View File

@ -1,7 +1,8 @@
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/compex-setup.c
--- linux-2.6.23/arch/arm/mach-ixp4xx/compex-setup.c 2007-10-23 18:39:29.000000000 +0200
+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/compex-setup.c 2007-10-23 18:45:34.000000000 +0200
@@ -90,9 +90,36 @@
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/compex-setup.c
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/compex-setup.c
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/compex-setup.c
@@ -90,9 +90,36 @@ static struct platform_device compex_uar
.resource = compex_uart_resources,
};

39
target/linux/ixp4xx/patches-2.6.25/130-wrt300nv2_support.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
===================================================================
--- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:26.000000000 +1030
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:27.000000000 +1030
@@ -73,6 +73,14 @@
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
@@ -73,6 +73,14 @@ config MACH_COMPEX
WP18 or NP18A boards. For more information on this
platform, see http://openwrt.org
@ -17,11 +17,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
config ARCH_IXDP425
bool "IXDP425"
help
Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
===================================================================
--- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:26.000000000 +1030
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:27.000000000 +1030
@@ -18,6 +18,7 @@
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
@@ -18,6 +18,7 @@ obj-pci-$(CONFIG_MACH_WG302V2) += wg302
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
@ -29,17 +29,18 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
obj-y += common.o
@@ -34,5 +35,6 @@
@@ -34,6 +35,7 @@ obj-$(CONFIG_MACH_WG302V2) += wg302v2-se
obj-$(CONFIG_MACH_FSG) += fsg-setup.o
obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
+obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
Index: linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-pci.c 2008-03-12 21:21:27.000000000 +1030
--- /dev/null
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
@@ -0,0 +1,65 @@
+/*
+ * arch/arch/mach-ixp4xx/wrt300nv2-pci.c
@ -106,10 +107,10 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
+}
+
+subsys_initcall(wrt300nv2_pci_init);
Index: linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-setup.c 2008-03-12 21:21:27.000000000 +1030
--- /dev/null
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
@@ -0,0 +1,108 @@
+/*
+ * arch/arm/mach-ixp4xx/wrt300nv2-setup.c
@ -219,11 +220,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
+ .init_machine = wrt300nv2_init,
+MACHINE_END
+#endif
Index: linux-2.6.24/include/asm-arm/arch-ixp4xx/uncompress.h
Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h
===================================================================
--- linux-2.6.24.orig/include/asm-arm/arch-ixp4xx/uncompress.h 2008-03-12 21:21:26.000000000 +1030
+++ linux-2.6.24/include/asm-arm/arch-ixp4xx/uncompress.h 2008-03-12 21:21:27.000000000 +1030
@@ -42,7 +42,7 @@
--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/uncompress.h
+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h
@@ -42,7 +42,7 @@ static __inline__ void __arch_decomp_set
*/
if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
machine_is_gateway7001() || machine_is_wg302v2() ||

9
target/linux/ixp4xx/patches-2.6.25/131-wrt300nv2_mac_plat_info.patch
View File

@ -1,7 +1,8 @@
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/wrt300nv2-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
--- linux-2.6.23/arch/arm/mach-ixp4xx/wrt300nv2-setup.c 2007-10-23 19:20:08.000000000 +0200
+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/wrt300nv2-setup.c 2007-10-23 19:22:19.000000000 +0200
@@ -76,9 +76,36 @@
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
@@ -76,9 +76,36 @@ static struct platform_device wrt300nv2_
.resource = &wrt300nv2_uart_resource,
};

36
target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch
View File

@ -1,7 +1,8 @@
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Kconfig
--- linux-2.6.23/arch/arm/mach-ixp4xx/Kconfig 2007-10-23 19:20:08.000000000 +0200
+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Kconfig 2007-10-23 19:26:46.000000000 +0200
@@ -65,6 +65,14 @@
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
@@ -65,6 +65,14 @@ config MACH_PRONGHORNMETRO
Engineering Pronghorn Metro Platform. For more
information on this platform, see <file:Documentation/arm/IXP4xx>.
@ -16,7 +17,7 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23-owrt/arch/arm/m
config MACH_COMPEX
bool "Compex WP18 / NP18A"
select PCI
@@ -163,7 +171,7 @@
@@ -163,7 +171,7 @@ config MACH_FSG
#
config CPU_IXP46X
bool
@ -25,10 +26,11 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23-owrt/arch/arm/m
default y
config CPU_IXP43X
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Makefile linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Makefile
--- linux-2.6.23/arch/arm/mach-ixp4xx/Makefile 2007-10-23 19:20:08.000000000 +0200
+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Makefile 2007-10-23 19:23:52.000000000 +0200
@@ -19,6 +19,7 @@
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
@@ -19,6 +19,7 @@ obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o
@ -36,7 +38,7 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Makefile linux-2.6.23-owrt/arch/arm/
obj-y += common.o
@@ -36,6 +37,7 @@
@@ -36,6 +37,7 @@ obj-$(CONFIG_MACH_FSG) += fsg-setup.o
obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
@ -44,9 +46,10 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Makefile linux-2.6.23-owrt/arch/arm/
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-pci.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-pci.c
--- linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-pci.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-pci.c 2007-10-23 19:23:52.000000000 +0200
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-pci.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-pci.c
@@ -0,0 +1,71 @@
+/*
+ * arch/arch/mach-ixp4xx/pronghornmetro-pci.c
@ -119,9 +122,10 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-pci.c linux-2.6.23-owrt/a
+}
+
+subsys_initcall(sidewinder_pci_init);
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-setup.c
--- linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-setup.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-setup.c 2007-10-23 19:23:52.000000000 +0200
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-setup.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-setup.c
@@ -0,0 +1,115 @@
+/*
+ * arch/arm/mach-ixp4xx/sidewinder-setup.c

37
target/linux/ixp4xx/patches-2.6.25/150-lanready_ap1000_support.patch
View File

@ -1,6 +1,7 @@
diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/ap1000-setup.c linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ap1000-setup.c
--- linux-2.6.23.1/arch/arm/mach-ixp4xx/ap1000-setup.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ap1000-setup.c 2007-11-14 13:58:58.000000000 +0100
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ap1000-setup.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ap1000-setup.c
@@ -0,0 +1,151 @@
+/*
+ * arch/arm/mach-ixp4xx/ap1000-setup.c
@ -153,10 +154,11 @@ diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/ap1000-setup.c linux-2.6.23.1-owrt
+ .init_machine = ap1000_init,
+MACHINE_END
+#endif
diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/ixdp425-pci.c linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c
--- linux-2.6.23.1/arch/arm/mach-ixp4xx/ixdp425-pci.c 2007-11-14 13:15:50.000000000 +0100
+++ linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c 2007-11-14 13:27:16.000000000 +0100
@@ -66,7 +66,8 @@
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixdp425-pci.c
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -66,7 +66,8 @@ struct hw_pci ixdp425_pci __initdata = {
int __init ixdp425_pci_init(void)
{
if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
@ -166,10 +168,11 @@ diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/ixdp425-pci.c linux-2.6.23.1-owrt/
pci_common_init(&ixdp425_pci);
return 0;
}
diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/Kconfig
--- linux-2.6.23.1/arch/arm/mach-ixp4xx/Kconfig 2007-11-14 13:15:50.000000000 +0100
+++ linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/Kconfig 2007-11-14 13:25:07.000000000 +0100
@@ -89,6 +89,14 @@
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
@@ -89,6 +89,14 @@ config MACH_WRT300NV2
WRT300N v2 router. For more information on this
platform, see http://openwrt.org
@ -184,10 +187,11 @@ diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23.1-owrt/arch/a
config ARCH_IXDP425
bool "IXDP425"
help
diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/Makefile linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/Makefile
--- linux-2.6.23.1/arch/arm/mach-ixp4xx/Makefile 2007-11-14 13:15:50.000000000 +0100
+++ linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/Makefile 2007-11-14 13:31:29.000000000 +0100
@@ -20,6 +20,7 @@
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
@@ -20,6 +20,7 @@ obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) +=
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o
obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o
@ -195,10 +199,11 @@ diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/Makefile linux-2.6.23.1-owrt/arch/
obj-y += common.o
@@ -38,5 +39,6 @@
@@ -38,6 +39,7 @@ obj-$(CONFIG_MACH_PRONGHORNMETRO) += pro
obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
+obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o

9
target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch
View File

@ -1,7 +1,8 @@
diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/ap1000-setup.c linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ap1000-setup.c
--- linux-2.6.23.1/arch/arm/mach-ixp4xx/ap1000-setup.c 2007-11-14 14:11:10.000000000 +0100
+++ linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ap1000-setup.c 2007-11-14 14:09:30.000000000 +0100
@@ -90,9 +90,37 @@
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ap1000-setup.c
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ap1000-setup.c
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ap1000-setup.c
@@ -90,9 +90,37 @@ static struct platform_device ap1000_uar
.resource = ap1000_uart_resources
};

34
target/linux/ixp4xx/patches-2.6.25/160-wg302v1_support.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
===================================================================
--- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:28.000000000 +1030
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:29.000000000 +1030
@@ -49,6 +49,14 @@
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
@@ -49,6 +49,14 @@ config MACH_GATEWAY7001
7001 Access Point. For more information on this platform,
see http://openwrt.org
@ -17,11 +17,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
config MACH_WG302V2
bool "Netgear WG302 v2 / WAG302 v2"
select PCI
Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
===================================================================
--- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:28.000000000 +1030
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:29.000000000 +1030
@@ -14,6 +14,7 @@
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
@@ -14,6 +14,7 @@ obj-pci-$(CONFIG_MACH_NSLU2) += nslu2-p
obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o
obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
@ -29,18 +29,18 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
@@ -33,6 +34,7 @@
obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o nas100d-power.o
obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o
@@ -33,6 +34,7 @@ obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.
obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o
obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o
obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
+obj-$(CONFIG_MACH_WG302V1) += wg302v1-setup.o
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
obj-$(CONFIG_MACH_FSG) += fsg-setup.o
obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
Index: linux-2.6.24/arch/arm/mach-ixp4xx/wg302v1-pci.c
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-pci.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.24/arch/arm/mach-ixp4xx/wg302v1-pci.c 2008-03-12 21:21:29.000000000 +1030
--- /dev/null
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-pci.c
@@ -0,0 +1,63 @@
+/*
+ * arch/arch/mach-ixp4xx/wg302v1-pci.c
@ -105,10 +105,10 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/wg302v1-pci.c
+}
+
+subsys_initcall(wg302v1_pci_init);
Index: linux-2.6.24/arch/arm/mach-ixp4xx/wg302v1-setup.c
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.24/arch/arm/mach-ixp4xx/wg302v1-setup.c 2008-03-12 21:21:29.000000000 +1030
--- /dev/null
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c
@@ -0,0 +1,109 @@
+/*
+ * arch/arm/mach-ixp4xx/wg302v1-setup.c

9
target/linux/ixp4xx/patches-2.6.25/161-wg302v1_mac_plat_info.patch
View File

@ -1,7 +1,8 @@
diff -Nur linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/wg302v1-setup.c
--- linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c 2008-01-14 23:06:42.000000000 +0100
+++ linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/wg302v1-setup.c 2008-01-14 23:03:16.000000000 +0100
@@ -77,9 +77,27 @@
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c
@@ -77,9 +77,27 @@ static struct platform_device wg302v1_ua
.resource = &wg302v1_uart_resource,
};

11
target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch
View File

@ -1,7 +1,8 @@
diff -Nur linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/wg302v1-setup.c
--- linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c 2008-01-14 23:12:03.000000000 +0100
+++ linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/wg302v1-setup.c 2008-01-14 23:11:34.000000000 +0100
@@ -100,6 +100,36 @@
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c
@@ -100,6 +100,36 @@ static struct platform_device *wg302v1_d
&wg302_eth[0],
};
@ -38,7 +39,7 @@ diff -Nur linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c linux-2.6.23.12-o
static void __init wg302v1_init(void)
{
ixp4xx_sys_init();
@@ -118,6 +148,7 @@
@@ -118,6 +148,7 @@ MACHINE_START(WG302V1, "Netgear WG302 v1
/* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,

8
target/linux/ixp4xx/patches-2.6.25/170-ixdpg425_mac_plat_info.patch
View File

@ -1,6 +1,8 @@
--- linux-2.6.24.2/arch/arm/mach-ixp4xx/coyote-setup.c 2008-02-11 06:51:11.000000000 +0100
+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/coyote-setup.c 2008-04-07 12:39:48.000000000 +0200
@@ -73,9 +73,37 @@
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/coyote-setup.c
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/coyote-setup.c
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/coyote-setup.c
@@ -73,9 +73,37 @@ static struct platform_device coyote_uar
.resource = &coyote_uart_resource,
};

42
target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch
View File

@ -1,7 +1,8 @@
diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/Kconfig
--- linux-2.6.24.2/arch/arm/mach-ixp4xx/Kconfig 2008-04-09 01:34:46.000000000 +0200
+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/Kconfig 2008-04-09 00:06:48.000000000 +0200
@@ -150,6 +150,14 @@
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
@@ -150,6 +150,14 @@ config ARCH_PRPMC1100
PrPCM1100 Processor Mezanine Module. For more information on
this platform, see <file:Documentation/arm/IXP4xx>.
@ -16,10 +17,11 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.24.2-owrt/arch/a
config MACH_NAS100D
bool
prompt "NAS100D"
diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/Makefile
--- linux-2.6.24.2/arch/arm/mach-ixp4xx/Makefile 2008-04-09 01:34:46.000000000 +0200
+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/Makefile 2008-04-09 00:07:45.000000000 +0200
@@ -22,6 +22,7 @@
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
@@ -22,6 +22,7 @@ obj-pci-$(CONFIG_MACH_COMPEX) += ixdp42
obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o
obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o
obj-pci-$(CONFIG_MACH_AP1000) += ixdp425-pci.o
@ -27,7 +29,7 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.24.2-owrt/arch/
obj-y += common.o
@@ -42,6 +43,7 @@
@@ -42,6 +43,7 @@ obj-$(CONFIG_MACH_COMPEX) += compex-setu
obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o
@ -35,9 +37,10 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.24.2-owrt/arch/
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-setup.c linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/tw5334-setup.c
--- linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-setup.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/tw5334-setup.c 2008-04-09 01:58:52.000000000 +0200
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-setup.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-setup.c
@@ -0,0 +1,162 @@
+/*
+ * arch/arm/mach-ixp4xx/tw5334-setup.c
@ -201,9 +204,10 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-setup.c linux-2.6.24.2-owrt
+ .init_machine = tw5334_init,
+MACHINE_END
+#endif
diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-pci.c linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/tw5334-pci.c
--- linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-pci.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/tw5334-pci.c 2008-04-09 00:35:32.000000000 +0200
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-pci.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-pci.c
@@ -0,0 +1,69 @@
+/*
+ * arch/arch/mach-ixp4xx/tw5334-pci.c
@ -274,9 +278,11 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-pci.c linux-2.6.24.2-owrt/a
+}
+
+subsys_initcall(tw5334_pci_init);
--- linux-2.6.24.2/include/asm-arm/arch-ixp4xx/uncompress.h 2008-04-07 08:59:19.000000000 +0200
+++ linux-2.6.24.2-owrt/include/asm-arm/arch-ixp4xx/uncompress.h 2008-04-09 13:22:42.000000000 +0200
@@ -42,7 +42,8 @@
Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h
===================================================================
--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/uncompress.h
+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h
@@ -42,7 +42,8 @@ static __inline__ void __arch_decomp_set
*/
if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
machine_is_gateway7001() || machine_is_wg302v2() ||

43
target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch
View File

@ -1,7 +1,8 @@
diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/Kconfig linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/Kconfig
--- linux-2.6.24.5/arch/arm/mach-ixp4xx/Kconfig 2008-04-28 20:22:27.000000000 +0200
+++ linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/Kconfig 2008-04-28 20:26:44.000000000 +0200
@@ -25,6 +25,14 @@
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
@@ -25,6 +25,14 @@ config MACH_AVILA
Avila Network Platform. For more information on this platform,
see <file:Documentation/arm/IXP4xx>.
@ -16,7 +17,7 @@ diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/Kconfig linux-2.6.24.5-owrt/arch/a
config MACH_LOFT
bool "Loft"
depends on MACH_AVILA
@@ -200,7 +208,7 @@
@@ -200,7 +208,7 @@ config CPU_IXP46X
config CPU_IXP43X
bool
@ -25,10 +26,11 @@ diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/Kconfig linux-2.6.24.5-owrt/arch/a
default y
config MACH_GTWX5715
diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/Makefile linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/Makefile
--- linux-2.6.24.5/arch/arm/mach-ixp4xx/Makefile 2008-04-28 20:22:27.000000000 +0200
+++ linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/Makefile 2008-04-28 20:26:44.000000000 +0200
@@ -7,6 +7,7 @@
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
@@ -7,6 +7,7 @@ obj-pci-n :=
obj-pci-$(CONFIG_ARCH_IXDP4XX) += ixdp425-pci.o
obj-pci-$(CONFIG_MACH_AVILA) += avila-pci.o
@ -36,7 +38,7 @@ diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/Makefile linux-2.6.24.5-owrt/arch/
obj-pci-$(CONFIG_MACH_IXDPG425) += ixdpg425-pci.o
obj-pci-$(CONFIG_ARCH_ADI_COYOTE) += coyote-pci.o
obj-pci-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o
@@ -28,6 +29,7 @@
@@ -28,6 +29,7 @@ obj-y += common.o
obj-$(CONFIG_ARCH_IXDP4XX) += ixdp425-setup.o
obj-$(CONFIG_MACH_AVILA) += avila-setup.o
@ -44,9 +46,10 @@ diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/Makefile linux-2.6.24.5-owrt/arch/
obj-$(CONFIG_MACH_IXDPG425) += coyote-setup.o
obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o
obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-setup.o
diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/cambria-pci.c linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/cambria-pci.c
--- linux-2.6.24.5/arch/arm/mach-ixp4xx/cambria-pci.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/cambria-pci.c 2008-04-28 20:30:35.000000000 +0200
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-pci.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-pci.c
@@ -0,0 +1,74 @@
+/*
+ * arch/arch/mach-ixp4xx/cambria-pci.c
@ -122,9 +125,10 @@ diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/cambria-pci.c linux-2.6.24.5-owrt/
+}
+
+subsys_initcall(cambria_pci_init);
diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/cambria-setup.c linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/cambria-setup.c
--- linux-2.6.24.5/arch/arm/mach-ixp4xx/cambria-setup.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/cambria-setup.c 2008-04-28 21:07:16.000000000 +0200
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-setup.c
===================================================================
--- /dev/null
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-setup.c
@@ -0,0 +1,250 @@
+/*
+ * arch/arm/mach-ixp4xx/cambria-setup.c
@ -376,9 +380,10 @@ diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/cambria-setup.c linux-2.6.24.5-owr
+ .init_machine = cambria_init,
+MACHINE_END
+#endif
diff -Nur linux-2.6.24.5/include/asm-arm/arch-ixp4xx/hardware.h linux-2.6.24.5-owrt/include/asm-arm/arch-ixp4xx/hardware.h
--- linux-2.6.24.5/include/asm-arm/arch-ixp4xx/hardware.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.24.5-owrt/include/asm-arm/arch-ixp4xx/hardware.h 2008-04-28 21:07:16.000000000 +0200
Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/hardware.h
===================================================================
--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/hardware.h
+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/hardware.h
@@ -18,7 +18,7 @@
#define __ASM_ARCH_HARDWARE_H__

45
target/linux/ixp4xx/patches-2.6.25/200-npe_driver.patch
View File

@ -1,7 +1,7 @@
diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig
index f9cc2b6..8eda6ee 100644
--- a/drivers/net/arm/Kconfig
+++ b/drivers/net/arm/Kconfig
Index: linux-2.6.25.1/drivers/net/arm/Kconfig
===================================================================
--- linux-2.6.25.1.orig/drivers/net/arm/Kconfig
+++ linux-2.6.25.1/drivers/net/arm/Kconfig
@@ -47,3 +47,11 @@ config EP93XX_ETH
help
This is a driver for the ethernet hardware included in EP93xx CPUs.
@ -14,20 +14,19 @@ index f9cc2b6..8eda6ee 100644
+ help
+ Say Y here if you want to use built-in Ethernet ports
+ on IXP4xx processor.
diff --git a/drivers/net/arm/Makefile b/drivers/net/arm/Makefile
index a4c8682..7c812ac 100644
--- a/drivers/net/arm/Makefile
+++ b/drivers/net/arm/Makefile
Index: linux-2.6.25.1/drivers/net/arm/Makefile
===================================================================
--- linux-2.6.25.1.orig/drivers/net/arm/Makefile
+++ linux-2.6.25.1/drivers/net/arm/Makefile
@@ -9,3 +9,4 @@ obj-$(CONFIG_ARM_ETHER3) += ether3.o
obj-$(CONFIG_ARM_ETHER1) += ether1.o
obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o
obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o
+obj-$(CONFIG_IXP4XX_ETH) += ixp4xx_eth.o
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c
new file mode 100644
index 0000000..c617b64
Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
===================================================================
--- /dev/null
+++ b/drivers/net/arm/ixp4xx_eth.c
+++ linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
@@ -0,0 +1,1265 @@
+/*
+ * Intel IXP4xx Ethernet driver for Linux
@ -1294,11 +1293,11 @@ index 0000000..c617b64
+MODULE_ALIAS("platform:ixp4xx_eth");
+module_init(eth_init_module);
+module_exit(eth_cleanup_module);
diff --git a/arch/arm/mach-ixp4xx/ixp4xx_npe.c b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
index 83c137e..63a23fa 100644
--- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c
+++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
@@ -448,7 +448,9 @@ int npe_send_message(struct npe *npe, const void *msg, const char *what)
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c
@@ -448,7 +448,9 @@ int npe_send_message(struct npe *npe, co
return -ETIMEDOUT;
}
@ -1308,7 +1307,7 @@ index 83c137e..63a23fa 100644
return 0;
}
@@ -484,7 +486,9 @@ int npe_recv_message(struct npe *npe, void *msg, const char *what)
@@ -484,7 +486,9 @@ int npe_recv_message(struct npe *npe, vo
return -ETIMEDOUT;
}
@ -1318,11 +1317,11 @@ index 83c137e..63a23fa 100644
return 0;
}
diff --git a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
index e833013..fab94ea 100644
--- a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
+++ b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
@@ -184,6 +184,8 @@ void qmgr_release_queue(unsigned int queue)
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
@@ -184,6 +184,8 @@ void qmgr_release_queue(unsigned int que
case 3: mask[0] = 0xFF; break;
}

9
target/linux/ixp4xx/patches-2.6.25/201-npe_driver_print_license_location.patch
View File

@ -1,7 +1,8 @@
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/ixp4xx_npe.c linux-2.6.23-openwrt/arch/arm/mach-ixp4xx/ixp4xx_npe.c
--- linux-2.6.23/arch/arm/mach-ixp4xx/ixp4xx_npe.c 2007-10-22 22:18:15.000000000 +0200
+++ linux-2.6.23-openwrt/arch/arm/mach-ixp4xx/ixp4xx_npe.c 2007-10-22 22:32:48.000000000 +0200
@@ -585,6 +585,8 @@
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c
@@ -592,6 +592,8 @@ int npe_load_firmware(struct npe *npe, c
npe_reset(npe);
#endif

34
target/linux/ixp4xx/patches-2.6.25/202-npe_driver_switch_support.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
===================================================================
--- linux-2.6.24.2.orig/drivers/net/arm/ixp4xx_eth.c
+++ linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
--- linux-2.6.25.1.orig/drivers/net/arm/ixp4xx_eth.c
+++ linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
@@ -165,14 +165,15 @@ struct port {
struct net_device *netdev;
struct napi_struct napi;
@ -20,7 +20,7 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
};
/* NPE message structure */
@@ -316,13 +317,14 @@ static void mdio_write(struct net_device
@@ -316,12 +317,13 @@ static void mdio_write(struct net_device
spin_unlock_irqrestore(&mdio_lock, flags);
}
@ -32,12 +32,10 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
int cycles = 0;
- mdio_write(dev, phy_id, MII_BMCR, port->mii_bmcr | BMCR_RESET);
-
+ mdio_write(dev, phy_id, MII_BMCR, port->mii_bmcr[idx] | BMCR_RESET);
+
while (cycles < MAX_MII_RESET_RETRIES) {
if (!(mdio_read(dev, phy_id, MII_BMCR) & BMCR_RESET)) {
#if DEBUG_MDIO
@@ -335,12 +337,12 @@ static void phy_reset(struct net_device
cycles++;
}
@ -107,7 +105,7 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
+ }
+}
+#endif
+
+static void phy_power_down(struct net_device *dev, int idx)
+{
+ struct port *port = netdev_priv(dev);
@ -121,13 +119,13 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
+static void phy_power_up(struct net_device *dev, int idx)
+{
+ struct port *port = netdev_priv(dev);
+
+ mdio_write(dev, port->mii[idx].phy_id, MII_BMCR, port->mii_bmcr[idx]);
+}
static void mdio_thread(struct work_struct *work)
{
@@ -790,9 +848,12 @@ static int eth_ioctl(struct net_device *
@@ -792,9 +850,12 @@ static int eth_ioctl(struct net_device *
if (!netif_running(dev))
return -EINVAL;
@ -142,7 +140,7 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
return err;
}
@@ -944,7 +1005,8 @@ static int eth_open(struct net_device *d
@@ -947,7 +1008,8 @@ static int eth_open(struct net_device *d
}
}
@ -152,7 +150,7 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
memset(&msg, 0, sizeof(msg));
msg.cmd = NPE_VLAN_SETRXQOSENTRY;
@@ -1103,10 +1165,8 @@ static int eth_close(struct net_device *
@@ -1107,10 +1169,8 @@ static int eth_close(struct net_device *
printk(KERN_CRIT "%s: unable to disable loopback\n",
dev->name);
@ -165,7 +163,7 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
if (!ports_open)
qmgr_disable_irq(TXDONE_QUEUE);
@@ -1117,6 +1177,42 @@ static int eth_close(struct net_device *
@@ -1120,6 +1180,42 @@ static int eth_close(struct net_device *
return 0;
}
@ -208,7 +206,7 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
static int __devinit eth_init_one(struct platform_device *pdev)
{
struct port *port;
@@ -1189,20 +1285,7 @@ static int __devinit eth_init_one(struct
@@ -1192,20 +1288,7 @@ static int __devinit eth_init_one(struct
__raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
udelay(50);
@ -230,11 +228,11 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
INIT_DELAYED_WORK(&port->mdio_thread, mdio_thread);
return 0;
Index: linux-2.6.24.2/include/asm-arm/arch-ixp4xx/platform.h
Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/platform.h
===================================================================
--- linux-2.6.24.2.orig/include/asm-arm/arch-ixp4xx/platform.h
+++ linux-2.6.24.2/include/asm-arm/arch-ixp4xx/platform.h
@@ -106,12 +106,15 @@ struct sys_timer;
--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/platform.h
+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/platform.h
@@ -95,12 +95,15 @@ struct sys_timer;
#define IXP4XX_ETH_NPEB 0x10
#define IXP4XX_ETH_NPEC 0x20

6
target/linux/ixp4xx/patches-2.6.25/203-npe_driver_phy_reset_autoneg.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
===================================================================
--- linux-2.6.24.2.orig/drivers/net/arm/ixp4xx_eth.c
+++ linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
--- linux-2.6.25.1.orig/drivers/net/arm/ixp4xx_eth.c
+++ linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
@@ -322,8 +322,12 @@ static void phy_reset(struct net_device
struct port *port = netdev_priv(dev);
int phy_id = port->mii[idx].phy_id;

36
target/linux/ixp4xx/patches-2.6.25/204-npe_driver_ixp43x_support.patch
View File

@ -1,7 +1,8 @@
diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/ixp4xx_npe.c linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/ixp4xx_npe.c
--- linux-2.6.24.2/arch/arm/mach-ixp4xx/ixp4xx_npe.c 2008-04-22 12:24:29.000000000 +0200
+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/ixp4xx_npe.c 2008-04-24 13:26:56.000000000 +0200
@@ -571,8 +571,8 @@
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c
===================================================================
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c
@@ -575,8 +575,8 @@ int npe_load_firmware(struct npe *npe, c
for (i = 0; i < image->size; i++)
image->data[i] = swab32(image->data[i]);
@ -12,7 +13,7 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/ixp4xx_npe.c linux-2.6.24.2-owrt/a
"IXP42x\n");
goto err;
}
@@ -594,7 +594,7 @@
@@ -598,7 +598,7 @@ int npe_load_firmware(struct npe *npe, c
"revision 0x%X:%X\n", (image->id >> 16) & 0xFF,
(image->id >> 8) & 0xFF, image->id & 0xFF);
@ -21,9 +22,10 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/ixp4xx_npe.c linux-2.6.24.2-owrt/a
if (!npe->id)
instr_size = NPE_A_42X_INSTR_SIZE;
else
diff -Nur linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c linux-2.6.24.2-owrt/drivers/net/arm/ixp4xx_eth.c
--- linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c 2008-04-22 12:24:29.000000000 +0200
+++ linux-2.6.24.2-owrt/drivers/net/arm/ixp4xx_eth.c 2008-04-24 18:23:24.000000000 +0200
Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
===================================================================
--- linux-2.6.25.1.orig/drivers/net/arm/ixp4xx_eth.c
+++ linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
@@ -32,6 +32,7 @@
#include <linux/kernel.h>
#include <linux/mii.h>
@ -32,7 +34,7 @@ diff -Nur linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c linux-2.6.24.2-owrt/driver
#include <asm/arch/npe.h>
#include <asm/arch/qmgr.h>
@@ -1238,12 +1239,16 @@
@@ -1338,12 +1339,16 @@ static struct platform_driver drv = {
static int __init eth_init_module(void)
{
@ -53,10 +55,11 @@ diff -Nur linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c linux-2.6.24.2-owrt/driver
__raw_writel(DEFAULT_CORE_CNTRL, &mdio_regs->core_control);
return platform_driver_register(&drv);
diff -Nur linux-2.6.24.2/include/asm-arm/arch-ixp4xx/cpu.h linux-2.6.24.2-owrt/include/asm-arm/arch-ixp4xx/cpu.h
--- linux-2.6.24.2/include/asm-arm/arch-ixp4xx/cpu.h 2008-04-22 12:24:29.000000000 +0200
+++ linux-2.6.24.2-owrt/include/asm-arm/arch-ixp4xx/cpu.h 2008-04-24 18:15:29.000000000 +0200
@@ -34,6 +34,8 @@
Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/cpu.h
===================================================================
--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/cpu.h
+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/cpu.h
@@ -34,6 +34,8 @@ static inline u32 ixp4xx_read_feature_bi
val &= ~IXP4XX_FEATURE_RESERVED;
if (!cpu_is_ixp46x())
val &= ~IXP4XX_FEATURE_IXP46X_ONLY;
@ -65,9 +68,10 @@ diff -Nur linux-2.6.24.2/include/asm-arm/arch-ixp4xx/cpu.h linux-2.6.24.2-owrt/i
return val;
}
diff -Nur linux-2.6.24.2/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h linux-2.6.24.2-owrt/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
--- linux-2.6.24.2/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h 2008-04-22 12:24:29.000000000 +0200
+++ linux-2.6.24.2-owrt/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h 2008-04-24 18:15:13.000000000 +0200
Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
===================================================================
--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
@@ -628,11 +628,12 @@
#define IXP4XX_FEATURE_XSCALE_MAX_FREQ (3 << 22)
#define IXP4XX_FEATURE_RESERVED (0xFF << 24)

25
target/linux/ixp4xx/patches-2.6.25/210-npe_hss.patch
View File

@ -1,8 +1,8 @@
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index a3df09e..94e7aa7 100644
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -334,6 +334,15 @@ config DSCC4_PCI_RST
Index: linux-2.6.25.1/drivers/net/wan/Kconfig
===================================================================
--- linux-2.6.25.1.orig/drivers/net/wan/Kconfig
+++ linux-2.6.25.1/drivers/net/wan/Kconfig
@@ -338,6 +338,15 @@ config DSCC4_PCI_RST
Say Y if your card supports this feature.
@ -18,10 +18,10 @@ index a3df09e..94e7aa7 100644
config DLCI
tristate "Frame Relay DLCI support"
---help---
diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile
index d61fef3..1b1d116 100644
--- a/drivers/net/wan/Makefile
+++ b/drivers/net/wan/Makefile
Index: linux-2.6.25.1/drivers/net/wan/Makefile
===================================================================
--- linux-2.6.25.1.orig/drivers/net/wan/Makefile
+++ linux-2.6.25.1/drivers/net/wan/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_C101) += c101.o
obj-$(CONFIG_WANXL) += wanxl.o
obj-$(CONFIG_PCI200SYN) += pci200syn.o
@ -30,11 +30,10 @@ index d61fef3..1b1d116 100644
clean-files := wanxlfw.inc
$(obj)/wanxl.o: $(obj)/wanxlfw.inc
diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c
new file mode 100644
index 0000000..cf971b3
Index: linux-2.6.25.1/drivers/net/wan/ixp4xx_hss.c
===================================================================
--- /dev/null
+++ b/drivers/net/wan/ixp4xx_hss.c
+++ linux-2.6.25.1/drivers/net/wan/ixp4xx_hss.c
@@ -0,0 +1,2886 @@
+/*
+ * Intel IXP4xx HSS (synchronous serial port) driver for Linux

37
target/linux/ixp4xx/patches-2.6.25/294-eeprom_new_notifier.patch
View File

@ -1,6 +1,7 @@
diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c/chips/eeprom.c
--- linux-2.6.23.orig/drivers/i2c/chips/eeprom.c 2007-10-09 15:31:38.000000000 -0500
+++ linux-2.6.23/drivers/i2c/chips/eeprom.c 2007-10-11 00:57:25.000000000 -0500
Index: linux-2.6.25.1/drivers/i2c/chips/eeprom.c
===================================================================
--- linux-2.6.25.1.orig/drivers/i2c/chips/eeprom.c
+++ linux-2.6.25.1/drivers/i2c/chips/eeprom.c
@@ -33,6 +33,8 @@
#include <linux/jiffies.h>
#include <linux/i2c.h>
@ -9,8 +10,8 @@ diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c
+#include <linux/eeprom.h>
/* Addresses to scan */
static unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54,
@@ -41,26 +43,7 @@ static unsigned short normal_i2c[] = { 0
static const unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54,
@@ -41,26 +43,7 @@ static const unsigned short normal_i2c[]
/* Insmod parameters */
I2C_CLIENT_INSMOD_1(eeprom);
@ -38,7 +39,7 @@ diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c
static int eeprom_attach_adapter(struct i2c_adapter *adapter);
static int eeprom_detect(struct i2c_adapter *adapter, int address, int kind);
@@ -191,6 +174,7 @@ static int eeprom_detect(struct i2c_adap
@@ -197,6 +180,7 @@ static int eeprom_detect(struct i2c_adap
data->valid = 0;
mutex_init(&data->update_lock);
data->nature = UNKNOWN;
@ -46,7 +47,7 @@ diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c
/* Tell the I2C layer a new client has arrived */
if ((err = i2c_attach_client(new_client)))
@@ -214,6 +198,9 @@ static int eeprom_detect(struct i2c_adap
@@ -224,6 +208,9 @@ static int eeprom_detect(struct i2c_adap
if (err)
goto exit_detach;
@ -56,7 +57,7 @@ diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c
return 0;
exit_detach:
@@ -239,6 +226,41 @@ static int eeprom_detach_client(struct i
@@ -249,6 +236,41 @@ static int eeprom_detach_client(struct i
return 0;
}
@ -98,9 +99,10 @@ diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c
static int __init eeprom_init(void)
{
return i2c_add_driver(&eeprom_driver);
diff -uprN linux-2.6.23.orig/include/linux/eeprom.h linux-2.6.23/include/linux/eeprom.h
--- linux-2.6.23.orig/include/linux/eeprom.h 1969-12-31 18:00:00.000000000 -0600
+++ linux-2.6.23/include/linux/eeprom.h 2007-10-11 00:57:25.000000000 -0500
Index: linux-2.6.25.1/include/linux/eeprom.h
===================================================================
--- /dev/null
+++ linux-2.6.25.1/include/linux/eeprom.h
@@ -0,0 +1,71 @@
+#ifndef _LINUX_EEPROM_H
+#define _LINUX_EEPROM_H
@ -173,12 +175,13 @@ diff -uprN linux-2.6.23.orig/include/linux/eeprom.h linux-2.6.23/include/linux/e
+extern int unregister_eeprom_notifier(struct notifier_block *nb);
+
+#endif /* _LINUX_EEPROM_H */
diff -uprN linux-2.6.23.orig/include/linux/notifier.h linux-2.6.23/include/linux/notifier.h
--- linux-2.6.23.orig/include/linux/notifier.h 2007-10-09 15:31:38.000000000 -0500
+++ linux-2.6.23/include/linux/notifier.h 2007-10-11 00:57:25.000000000 -0500
@@ -231,5 +231,8 @@ static inline int notifier_to_errno(int
#define PM_SUSPEND_PREPARE 0x0003 /* Going to suspend the system */
#define PM_POST_SUSPEND 0x0004 /* Suspend finished */
Index: linux-2.6.25.1/include/linux/notifier.h
===================================================================
--- linux-2.6.25.1.orig/include/linux/notifier.h
+++ linux-2.6.25.1/include/linux/notifier.h
@@ -248,5 +248,8 @@ extern struct blocking_notifier_head reb
#define VT_WRITE 0x0003 /* A char got output */
#define VT_UPDATE 0x0004 /* A bigger update occurred */
+/* eeprom notifier chain */
+#define EEPROM_REGISTER 0x0001

6
target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c
===================================================================
--- linux-2.6.24.2.orig/arch/arm/mach-ixp4xx/avila-setup.c
+++ linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/avila-setup.c
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c
@@ -132,6 +132,31 @@ static struct platform_device avila_pata
.resource = avila_pata_resources,
};

14
target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c
===================================================================
--- linux-2.6.24.2.orig/arch/arm/mach-ixp4xx/avila-setup.c
+++ linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/avila-setup.c
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c
@@ -14,10 +14,18 @@
#include <linux/kernel.h>
#include <linux/init.h>
@ -35,9 +35,9 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
static struct flash_platform_data avila_flash_data = {
.map_name = "cfi_probe",
.width = 2,
@@ -192,10 +207,160 @@ static void __init avila_fixup(struct ma
t->hdr.size = 0;
}
@@ -163,10 +178,160 @@ static struct platform_device *avila_dev
&avila_uart
};
+static void __init avila_gw23xx_setup(void)
+{
@ -196,7 +196,7 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
avila_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
avila_flash_resource.end =
IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;
@@ -213,9 +378,28 @@ static void __init avila_init(void)
@@ -184,9 +349,28 @@ static void __init avila_init(void)
platform_device_register(&avila_pata);

22
target/linux/ixp4xx/patches-2.6.25/301-avila_led.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.24.2/include/asm-arm/arch-ixp4xx/avila.h
Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h
===================================================================
--- linux-2.6.24.2.orig/include/asm-arm/arch-ixp4xx/avila.h
+++ linux-2.6.24.2/include/asm-arm/arch-ixp4xx/avila.h
--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/avila.h
+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h
@@ -36,4 +36,6 @@
#define AVILA_PCI_INTC_PIN 9
#define AVILA_PCI_INTD_PIN 8
@ -10,10 +10,10 @@ Index: linux-2.6.24.2/include/asm-arm/arch-ixp4xx/avila.h
+/* User LEDs */
+#define AVILA_GW23XX_LED_USER_GPIO 3
+#define AVILA_GW23X7_LED_USER_GPIO 4
Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c
===================================================================
--- linux-2.6.24.2.orig/arch/arm/mach-ixp4xx/avila-setup.c
+++ linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/avila-setup.c
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c
@@ -26,6 +26,7 @@
# include <linux/eeprom.h>
#endif
@ -48,7 +48,7 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
static struct platform_device *avila_devices[] __initdata = {
&avila_i2c_gpio,
&avila_flash,
@@ -211,6 +231,8 @@ static void __init avila_gw23xx_setup(vo
@@ -182,6 +202,8 @@ static void __init avila_gw23xx_setup(vo
{
platform_device_register(&avila_npeb_device);
platform_device_register(&avila_npec_device);
@ -57,7 +57,7 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
}
#ifdef CONFIG_SENSORS_EEPROM
@@ -218,6 +240,8 @@ static void __init avila_gw2342_setup(vo
@@ -189,6 +211,8 @@ static void __init avila_gw2342_setup(vo
{
platform_device_register(&avila_npeb_device);
platform_device_register(&avila_npec_device);
@ -66,7 +66,7 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
}
static void __init avila_gw2345_setup(void)
@@ -228,22 +252,30 @@ static void __init avila_gw2345_setup(vo
@@ -199,22 +223,30 @@ static void __init avila_gw2345_setup(vo
avila_npec_data.phy = 5; /* port 5 of the KS8995 switch */
platform_device_register(&avila_npec_device);
@ -97,9 +97,9 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
}
static void __init avila_gw2355_setup(void)
@@ -254,11 +286,16 @@ static void __init avila_gw2355_setup(vo
@@ -225,11 +257,16 @@ static void __init avila_gw2355_setup(vo
avila_npec_data.phy = 5;
avila_npec_data.phy = 16;
platform_device_register(&avila_npec_device);
+
+ platform_device_register(&avila_leds_device);

14
target/linux/ixp4xx/patches-2.6.25/302-avila_gpio_device.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c
===================================================================
--- linux-2.6.24.2.orig/arch/arm/mach-ixp4xx/avila-setup.c
+++ linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/avila-setup.c
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c
@@ -192,10 +192,28 @@ static struct platform_device avila_leds
.dev.platform_data = &avila_leds_data,
};
@ -31,11 +31,11 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
+ &avila_gpio,
};
static char avila_rtc_probe[] __initdata = "rtc-ds1672.probe=0,0x68 ";
Index: linux-2.6.24.2/include/asm-arm/arch-ixp4xx/avila.h
static void __init avila_gw23xx_setup(void)
Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h
===================================================================
--- linux-2.6.24.2.orig/include/asm-arm/arch-ixp4xx/avila.h
+++ linux-2.6.24.2/include/asm-arm/arch-ixp4xx/avila.h
--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/avila.h
+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h
@@ -39,3 +39,6 @@
/* User LEDs */
#define AVILA_GW23XX_LED_USER_GPIO 3

26
target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c
===================================================================
--- linux-2.6.24.2.orig/arch/arm/mach-ixp4xx/avila-setup.c
+++ linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
@@ -276,6 +276,7 @@ static void __init avila_gw2345_setup(vo
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/avila-setup.c
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c
@@ -247,6 +247,7 @@ static void __init avila_gw2345_setup(vo
static void __init avila_gw2347_setup(void)
{
@ -10,7 +10,7 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
platform_device_register(&avila_npeb_device);
avila_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
@@ -310,6 +311,7 @@ static void __init avila_gw2355_setup(vo
@@ -281,6 +282,7 @@ static void __init avila_gw2355_setup(vo
static void __init avila_gw2357_setup(void)
{
@ -18,11 +18,11 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
platform_device_register(&avila_npeb_device);
avila_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
===================================================================
--- linux-2.6.24.2.orig/drivers/net/arm/ixp4xx_eth.c
+++ linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
@@ -347,6 +347,14 @@ static void phy_reset(struct net_device
--- linux-2.6.25.1.orig/drivers/net/arm/ixp4xx_eth.c
+++ linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
@@ -348,6 +348,14 @@ static void phy_reset(struct net_device
return;
}
@ -37,11 +37,11 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
/* restart auto negotiation */
bmcr = mdio_read(dev, phy_id, MII_BMCR);
bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART);
Index: linux-2.6.24.2/include/asm-arm/arch-ixp4xx/platform.h
Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/platform.h
===================================================================
--- linux-2.6.24.2.orig/include/asm-arm/arch-ixp4xx/platform.h
+++ linux-2.6.24.2/include/asm-arm/arch-ixp4xx/platform.h
@@ -115,6 +115,8 @@ struct eth_plat_info {
--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/platform.h
+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/platform.h
@@ -104,6 +104,8 @@ struct eth_plat_info {
u8 txreadyq;
u8 hwaddr[6];
u32 phy_mask;

16
target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.23.14/arch/arm/common/dmabounce.c
Index: linux-2.6.25.1/arch/arm/common/dmabounce.c
===================================================================
--- linux-2.6.23.14.orig/arch/arm/common/dmabounce.c 2008-01-24 22:03:28.475500801 +0100
+++ linux-2.6.23.14/arch/arm/common/dmabounce.c 2008-01-24 22:17:36.415822168 +0100
@@ -116,6 +116,10 @@
--- linux-2.6.25.1.orig/arch/arm/common/dmabounce.c
+++ linux-2.6.25.1/arch/arm/common/dmabounce.c
@@ -117,6 +117,10 @@ alloc_safe_buffer(struct dmabounce_devic
} else if (size <= device_info->large.size) {
pool = &device_info->large;
} else {
@ -13,11 +13,11 @@ Index: linux-2.6.23.14/arch/arm/common/dmabounce.c
pool = NULL;
}
Index: linux-2.6.23.14/arch/arm/mach-ixp4xx/Kconfig
Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
===================================================================
--- linux-2.6.23.14.orig/arch/arm/mach-ixp4xx/Kconfig 2008-01-24 22:10:29.331484012 +0100
+++ linux-2.6.23.14/arch/arm/mach-ixp4xx/Kconfig 2008-01-24 22:11:42.891675973 +0100
@@ -220,6 +220,11 @@
--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
@@ -236,6 +236,11 @@ config DMABOUNCE
default y
depends on PCI

6
target/linux/ixp4xx/patches-2.6.25/401-avila_pci_dev.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.23.14/include/asm-arm/arch-ixp4xx/avila.h
Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h
===================================================================
--- linux-2.6.23.14.orig/include/asm-arm/arch-ixp4xx/avila.h 2008-01-31 17:40:36.000000000 +0100
+++ linux-2.6.23.14/include/asm-arm/arch-ixp4xx/avila.h 2008-01-31 17:40:42.000000000 +0100
--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/avila.h
+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h
@@ -25,7 +25,7 @@
/*
* AVILA PCI IRQs

2
target/linux/ps3/Makefile
View File

@ -10,7 +10,7 @@ ARCH:=powerpc
BOARD:=ps3
BOARDNAME:=Sony PS3 Game Console
LINUX_VERSION:=2.6.25
LINUX_VERSION:=2.6.25.1
KERNEL_CC:=