refresh generic 2.6.24 patches
SVN-Revision: 11188
This commit is contained in:
parent
37044cf01e
commit
e582f614b6
57 changed files with 4022 additions and 3457 deletions
|
@ -1,8 +1,8 @@
|
|||
Index: linux-2.6.23/fs/Kconfig
|
||||
Index: linux-2.6.24.7/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.24.7.orig/fs/Kconfig
|
||||
+++ linux-2.6.24.7/fs/Kconfig
|
||||
@@ -1405,6 +1405,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.24.7/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.24.7.orig/fs/Makefile
|
||||
+++ linux-2.6.24.7/fs/Makefile
|
||||
@@ -72,6 +72,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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7.orig/include/linux/magic.h
|
||||
+++ linux-2.6.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7.orig/init/do_mounts_rd.c
|
||||
+++ linux-2.6.24.7/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;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Index: linux-2.6.23/include/linux/LzmaDecode.h
|
||||
Index: linux-2.6.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7.orig/lib/Makefile
|
||||
+++ linux-2.6.24.7/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
|
||||
|
@ -784,7 +784,7 @@ Index: linux-2.6.23/lib/Makefile
|
|||
|
||||
ifeq ($(CONFIG_DEBUG_KOBJECT),y)
|
||||
CFLAGS_kobject.o += -DDEBUG
|
||||
@@ -62,6 +62,7 @@
|
||||
@@ -64,6 +64,7 @@ obj-$(CONFIG_SMP) += percpu_counter.o
|
||||
obj-$(CONFIG_AUDIT_GENERIC) += audit.o
|
||||
|
||||
obj-$(CONFIG_SWIOTLB) += swiotlb.o
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Index: linux-2.6.23-rc6/fs/squashfs/inode.c
|
||||
Index: linux-2.6.24.7/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.24.7.orig/fs/squashfs/inode.c
|
||||
+++ linux-2.6.24.7/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)
|
||||
{
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
Index: linux-2.6.23-rc6/Makefile
|
||||
Index: linux-2.6.24.7/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.24.7.orig/Makefile
|
||||
+++ linux-2.6.24.7/Makefile
|
||||
@@ -527,6 +527,9 @@ KBUILD_CFLAGS += $(call cc-optio
|
||||
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,)
|
||||
|
||||
|
|
|
@ -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.24.7/fs/squashfs/inode.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/fs/squashfs/inode.c
|
||||
+++ linux-2.6.24.7/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
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
Index: linux-2.6.23/include/asm-mips/system.h
|
||||
Index: linux-2.6.24.7/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.24.7.orig/include/asm-mips/system.h
|
||||
+++ linux-2.6.24.7/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);
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||
Index: linux-2.6.24.7/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.24.7.orig/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||
+++ linux-2.6.24.7/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 @@
|
||||
@@ -294,12 +295,19 @@ struct mtd_info *cfi_cmdset_0002(struct
|
||||
|
||||
if (extp->MajorVersion != '1' ||
|
||||
(extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
|
||||
Index: linux-2.6.24.7/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.24.7.orig/drivers/mtd/chips/cfi_cmdset_0001.c
|
||||
+++ linux-2.6.24.7/drivers/mtd/chips/cfi_cmdset_0001.c
|
||||
@@ -944,7 +944,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 @@
|
||||
@@ -953,7 +953,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 @@
|
||||
@@ -1063,8 +1063,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 @@
|
||||
@@ -1076,65 +1076,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 @@
|
||||
@@ -1143,7 +1143,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 @@
|
||||
@@ -1374,7 +1375,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 @@
|
||||
@@ -1614,7 +1615,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 @@
|
||||
@@ -1749,7 +1750,7 @@ static int __xipram do_erase_oneblock(st
|
||||
|
||||
ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
|
||||
adr, len,
|
||||
|
|
|
@ -1,16 +1,16 @@
|
|||
Index: linux-2.6.23-rc6/fs/squashfs/Makefile
|
||||
Index: linux-2.6.24.7/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.24.7.orig/fs/squashfs/Makefile
|
||||
+++ linux-2.6.24.7/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.24.7/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.24.7.orig/fs/squashfs/squashfs.h
|
||||
+++ linux-2.6.24.7/fs/squashfs/squashfs.h
|
||||
@@ -24,6 +24,9 @@
|
||||
#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
|
||||
#undef CONFIG_SQUASHFS_1_0_COMPATIBILITY
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
Index: linux-2.6.23-rc6/arch/mips/kernel/head.S
|
||||
Index: linux-2.6.24.7/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.24.7.orig/arch/mips/kernel/head.S
|
||||
+++ linux-2.6.24.7/arch/mips/kernel/head.S
|
||||
@@ -120,6 +120,8 @@
|
||||
#endif
|
||||
.endm
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
Index: linux-2.6.23/arch/mips/mm/tlbex.c
|
||||
Index: linux-2.6.24.7/arch/mips/mm/tlbex.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/arch/mips/mm/tlbex.c 2007-10-10 04:31:38.000000000 +0800
|
||||
+++ linux-2.6.23/arch/mips/mm/tlbex.c 2007-10-10 13:52:34.000000000 +0800
|
||||
@@ -902,7 +902,6 @@
|
||||
--- linux-2.6.24.7.orig/arch/mips/mm/tlbex.c
|
||||
+++ linux-2.6.24.7/arch/mips/mm/tlbex.c
|
||||
@@ -902,7 +902,6 @@ static __init void build_tlb_write_entry
|
||||
case CPU_R10000:
|
||||
case CPU_R12000:
|
||||
case CPU_R14000:
|
||||
|
@ -10,7 +10,7 @@ Index: linux-2.6.23/arch/mips/mm/tlbex.c
|
|||
case CPU_SB1:
|
||||
case CPU_SB1A:
|
||||
case CPU_4KSC:
|
||||
@@ -933,6 +932,7 @@
|
||||
@@ -935,6 +934,7 @@ static __init void build_tlb_write_entry
|
||||
tlbw(p);
|
||||
break;
|
||||
|
||||
|
|
|
@ -1,20 +1,20 @@
|
|||
Index: linux-2.6.23/arch/mips/kernel/gdb-stub.c
|
||||
Index: linux-2.6.24.7/arch/mips/kernel/gdb-stub.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/arch/mips/kernel/gdb-stubc.c 2007-10-12 18:43:44.000000000 +0200
|
||||
+++ linux-2.6.23/arch/mips/kernel/gdb-stub.c 2007-11-16 08:35:51.000000000 +0100
|
||||
@@ -656,6 +656,7 @@
|
||||
*epc = (unsigned long)async_breakpoint;
|
||||
--- linux-2.6.24.7.orig/arch/mips/kernel/gdb-stub.c
|
||||
+++ linux-2.6.24.7/arch/mips/kernel/gdb-stub.c
|
||||
@@ -656,6 +656,7 @@ void set_async_breakpoint(unsigned long
|
||||
*epc = (unsigned long)async_breakpoint;
|
||||
}
|
||||
|
||||
|
||||
+#ifdef CONFIG_SMP
|
||||
static void kgdb_wait(void *arg)
|
||||
{
|
||||
unsigned flags;
|
||||
@@ -668,6 +669,7 @@
|
||||
|
||||
local_irq_restore(flags);
|
||||
unsigned flags;
|
||||
@@ -668,6 +669,7 @@ static void kgdb_wait(void *arg)
|
||||
|
||||
local_irq_restore(flags);
|
||||
}
|
||||
+#endif
|
||||
|
||||
|
||||
/*
|
||||
* GDB stub needs to call kgdb_wait on all processor with interrupts
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
|
||||
Index: linux-2.6.24.7/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.24.7.orig/drivers/mtd/devices/block2mtd.c
|
||||
+++ linux-2.6.24.7/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);
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
Index: linux-2.6.23-rc6/drivers/mtd/Kconfig
|
||||
Index: linux-2.6.24.7/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.24.7.orig/drivers/mtd/Kconfig
|
||||
+++ linux-2.6.24.7/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.24.7/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.24.7.orig/drivers/mtd/mtdpart.c
|
||||
+++ linux-2.6.24.7/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
|
||||
@@ -308,6 +310,312 @@
|
||||
@@ -308,6 +310,312 @@ int del_mtd_partitions(struct mtd_info *
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -354,7 +354,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
|
||||
@@ -320,168 +628,31 @@
|
||||
@@ -320,168 +628,31 @@ int add_mtd_partitions(struct mtd_info *
|
||||
int nbparts)
|
||||
{
|
||||
struct mtd_part *slave;
|
||||
|
@ -544,7 +544,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/mtdpart.c
|
|||
}
|
||||
}
|
||||
|
||||
@@ -557,6 +728,32 @@
|
||||
@@ -557,6 +728,32 @@ int parse_mtd_partitions(struct mtd_info
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -577,11 +577,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.24.7/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.24.7.orig/drivers/mtd/devices/block2mtd.c
|
||||
+++ linux-2.6.24.7/drivers/mtd/devices/block2mtd.c
|
||||
@@ -34,6 +34,8 @@ struct block2mtd_dev {
|
||||
struct block_device *blkdev;
|
||||
struct mtd_info mtd;
|
||||
struct mutex write_mutex;
|
||||
|
@ -590,7 +590,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;
|
||||
|
||||
|
@ -603,7 +603,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);
|
||||
|
@ -614,7 +614,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);
|
||||
|
@ -632,7 +632,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);
|
||||
|
@ -651,7 +651,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++;
|
||||
}
|
||||
|
@ -663,7 +663,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;
|
||||
|
@ -690,7 +690,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;
|
||||
|
@ -700,7 +700,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;
|
||||
|
@ -760,7 +760,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)) {
|
||||
|
@ -860,7 +860,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;
|
||||
|
@ -868,10 +868,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.24.7/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.24.7.orig/drivers/mtd/mtdchar.c
|
||||
+++ linux-2.6.24.7/drivers/mtd/mtdchar.c
|
||||
@@ -17,6 +17,7 @@
|
||||
|
||||
#include <linux/mtd/mtd.h>
|
||||
|
@ -880,7 +880,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/mtdchar.c
|
|||
|
||||
#include <asm/uaccess.h>
|
||||
|
||||
@@ -753,6 +754,13 @@
|
||||
@@ -754,6 +755,13 @@ static int mtd_ioctl(struct inode *inode
|
||||
file->f_pos = 0;
|
||||
break;
|
||||
}
|
||||
|
@ -894,11 +894,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.24.7/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.24.7.orig/include/linux/mtd/mtd.h
|
||||
+++ linux-2.6.24.7/include/linux/mtd/mtd.h
|
||||
@@ -98,6 +98,7 @@ struct mtd_oob_ops {
|
||||
uint8_t *oobbuf;
|
||||
};
|
||||
|
||||
|
@ -906,7 +906,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 @@
|
||||
@@ -202,6 +203,9 @@ struct mtd_info {
|
||||
struct module *owner;
|
||||
int usecount;
|
||||
|
||||
|
@ -916,10 +916,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.24.7/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.24.7.orig/include/linux/mtd/partitions.h
|
||||
+++ linux-2.6.24.7/include/linux/mtd/partitions.h
|
||||
@@ -36,6 +36,7 @@
|
||||
* erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
|
||||
*/
|
||||
|
@ -928,7 +928,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 */
|
||||
|
@ -936,7 +936,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 *);
|
||||
|
@ -944,11 +944,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.24.7/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.24.7.orig/include/mtd/mtd-abi.h
|
||||
+++ linux-2.6.24.7/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)
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
Index: linux-2.6.23.1/drivers/mtd/redboot.c
|
||||
Index: linux-2.6.24.7/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.24.7.orig/drivers/mtd/redboot.c
|
||||
+++ linux-2.6.24.7/drivers/mtd/redboot.c
|
||||
@@ -236,14 +236,21 @@ static int parse_redboot_partitions(stru
|
||||
#endif
|
||||
names += strlen(names)+1;
|
||||
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
--- 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
|
||||
Index: linux-2.6.24.7/net/netfilter/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/net/netfilter/Kconfig
|
||||
+++ linux-2.6.24.7/net/netfilter/Kconfig
|
||||
@@ -633,6 +633,27 @@ config NETFILTER_XT_MATCH_STATE
|
||||
|
||||
To compile it as a module, choose M here. If unsure, say N.
|
||||
|
@ -28,8 +30,10 @@
|
|||
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
|
||||
Index: linux-2.6.24.7/net/netfilter/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/net/netfilter/Makefile
|
||||
+++ linux-2.6.24.7/net/netfilter/Makefile
|
||||
@@ -73,6 +73,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_QUOTA) +
|
||||
obj-$(CONFIG_NETFILTER_XT_MATCH_REALM) += xt_realm.o
|
||||
obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.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.24.7/net/netfilter/xt_layer7.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/net/netfilter/regexp/regexp.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/net/netfilter/regexp/regexp.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/net/netfilter/regexp/regmagic.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/net/netfilter/regexp/regsub.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/net/netfilter/regexp/regsub.c
|
||||
@@ -0,0 +1,95 @@
|
||||
+/*
|
||||
+ * regsub
|
||||
|
@ -2025,8 +2039,10 @@
|
|||
+ }
|
||||
+ *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
|
||||
Index: linux-2.6.24.7/net/netfilter/nf_conntrack_core.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/net/netfilter/nf_conntrack_core.c
|
||||
+++ linux-2.6.24.7/net/netfilter/nf_conntrack_core.c
|
||||
@@ -206,6 +206,14 @@ destroy_conntrack(struct nf_conntrack *n
|
||||
* too. */
|
||||
nf_ct_remove_expectations(ct);
|
||||
|
@ -2042,8 +2058,10 @@
|
|||
/* 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
|
||||
Index: linux-2.6.24.7/net/netfilter/nf_conntrack_standalone.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/net/netfilter/nf_conntrack_standalone.c
|
||||
+++ linux-2.6.24.7/net/netfilter/nf_conntrack_standalone.c
|
||||
@@ -180,7 +180,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.24.7/include/net/netfilter/nf_conntrack.h
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/include/net/netfilter/nf_conntrack.h
|
||||
+++ linux-2.6.24.7/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.24.7/include/linux/netfilter/xt_layer7.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/include/linux/netfilter/xt_layer7.h
|
||||
@@ -0,0 +1,13 @@
|
||||
+#ifndef _XT_LAYER7_H
|
||||
+#define _XT_LAYER7_H
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Index: linux-2.6.24/include/linux/netfilter/xt_layer7.h
|
||||
Index: linux-2.6.24.7/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.24.7.orig/include/linux/netfilter/xt_layer7.h
|
||||
+++ linux-2.6.24.7/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.24.7/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.24.7.orig/net/netfilter/xt_layer7.c
|
||||
+++ linux-2.6.24.7/net/netfilter/xt_layer7.c
|
||||
@@ -297,34 +297,36 @@ static int match_no_append(struct nf_con
|
||||
}
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Index: linux-2.6.23.1/include/linux/netfilter_ipv4/ipt_ipp2p.h
|
||||
Index: linux-2.6.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7.orig/net/ipv4/netfilter/Kconfig
|
||||
+++ linux-2.6.24.7/net/ipv4/netfilter/Kconfig
|
||||
@@ -63,6 +63,12 @@ config IP_NF_MATCH_IPRANGE
|
||||
|
||||
To compile it as a module, choose M here. If unsure, say N.
|
||||
|
||||
|
@ -912,16 +912,16 @@ Index: linux-2.6.23.1/net/ipv4/netfilter/Kconfig
|
|||
config IP_NF_MATCH_TOS
|
||||
tristate "TOS match support"
|
||||
depends on IP_NF_IPTABLES
|
||||
Index: linux-2.6.23.1/net/ipv4/netfilter/Makefile
|
||||
Index: linux-2.6.24.7/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.24.7.orig/net/ipv4/netfilter/Makefile
|
||||
+++ linux-2.6.24.7/net/ipv4/netfilter/Makefile
|
||||
@@ -50,6 +50,8 @@ obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_
|
||||
obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.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
|
||||
|
|
|
@ -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.24.7/include/linux/netfilter_ipv4/ip_set.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/include/linux/netfilter_ipv4/ip_set_iphash.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/include/linux/netfilter_ipv4/ip_set_ipmap.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/include/linux/netfilter_ipv4/ip_set_ipporthash.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/include/linux/netfilter_ipv4/ip_set_iptree.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/include/linux/netfilter_ipv4/ip_set_iptreemap.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/include/linux/netfilter_ipv4/ip_set_jhash.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/include/linux/netfilter_ipv4/ip_set_macipmap.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/include/linux/netfilter_ipv4/ip_set_malloc.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/include/linux/netfilter_ipv4/ip_set_nethash.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/include/linux/netfilter_ipv4/ip_set_portmap.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/include/linux/netfilter_ipv4/ipt_set.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/net/ipv4/netfilter/ip_set.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/net/ipv4/netfilter/ip_set_iphash.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/net/ipv4/netfilter/ip_set_ipmap.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/net/ipv4/netfilter/ip_set_ipporthash.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/net/ipv4/netfilter/ip_set_iptree.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/net/ipv4/netfilter/ip_set_iptreemap.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/net/ipv4/netfilter/ip_set_macipmap.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/net/ipv4/netfilter/ip_set_nethash.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/net/ipv4/netfilter/ip_set_portmap.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/net/ipv4/netfilter/ipt_set.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/net/ipv4/netfilter/ipt_SET.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/net/ipv4/netfilter/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/net/ipv4/netfilter/Kconfig
|
||||
+++ linux-2.6.24.7/net/ipv4/netfilter/Kconfig
|
||||
@@ -408,5 +408,122 @@ config IP_NF_ARP_MANGLE
|
||||
Allows altering the ARP packet payload: source and destination
|
||||
hardware and network addresses.
|
||||
|
||||
|
@ -7664,10 +7688,11 @@ 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.24.7/net/ipv4/netfilter/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/net/ipv4/netfilter/Makefile
|
||||
+++ linux-2.6.24.7/net/ipv4/netfilter/Makefile
|
||||
@@ -49,6 +49,7 @@ obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_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
|
||||
|
@ -7675,7 +7700,7 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/Makefile linux-2.6.23.pom2patch.set/ne
|
|||
|
||||
obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
|
||||
|
||||
@@ -64,6 +65,18 @@
|
||||
@@ -64,6 +65,18 @@ obj-$(CONFIG_IP_NF_TARGET_SAME) += ipt_S
|
||||
obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
|
||||
obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
|
||||
obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Index: linux-2.6.23-rc6/include/linux/netfilter_ipv4/ipt_time.h
|
||||
Index: linux-2.6.24.7/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.24.7/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.24.7/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.24.7/net/ipv4/netfilter/ipt_time.c
|
||||
@@ -0,0 +1,180 @@
|
||||
+/*
|
||||
+ This is a module which is used for time matching
|
||||
|
@ -206,11 +206,11 @@ 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.24.7/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 @@
|
||||
--- linux-2.6.24.7.orig/net/ipv4/netfilter/Kconfig
|
||||
+++ linux-2.6.24.7/net/ipv4/netfilter/Kconfig
|
||||
@@ -78,6 +78,22 @@ config IP_NF_MATCH_TOS
|
||||
|
||||
To compile it as a module, choose M here. If unsure, say N.
|
||||
|
||||
|
@ -233,11 +233,11 @@ Index: linux-2.6.23-rc6/net/ipv4/netfilter/Kconfig
|
|||
config IP_NF_MATCH_RECENT
|
||||
tristate "recent match support"
|
||||
depends on IP_NF_IPTABLES
|
||||
Index: linux-2.6.23-rc6/net/ipv4/netfilter/Makefile
|
||||
Index: linux-2.6.24.7/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 @@
|
||||
--- linux-2.6.24.7.orig/net/ipv4/netfilter/Makefile
|
||||
+++ linux-2.6.24.7/net/ipv4/netfilter/Makefile
|
||||
@@ -50,6 +50,7 @@ obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_
|
||||
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
|
||||
|
|
|
@ -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.24.7/drivers/net/imq.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/drivers/net/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/drivers/net/Kconfig
|
||||
+++ linux-2.6.24.7/drivers/net/Kconfig
|
||||
@@ -112,6 +112,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.24.7/drivers/net/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/drivers/net/Makefile
|
||||
+++ linux-2.6.24.7/drivers/net/Makefile
|
||||
@@ -139,6 +139,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.24.7/include/linux/imq.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/include/linux/netfilter_ipv4/ipt_IMQ.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/include/linux/netfilter_ipv6/ip6t_IMQ.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/include/linux/skbuff.h
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/include/linux/skbuff.h
|
||||
+++ linux-2.6.24.7/include/linux/skbuff.h
|
||||
@@ -295,6 +295,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 @@
|
||||
@@ -1728,6 +1732,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.24.7/net/core/dev.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/net/core/dev.c
|
||||
+++ linux-2.6.24.7/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 @@
|
||||
@@ -1533,7 +1536,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.24.7/net/ipv4/netfilter/ipt_IMQ.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/net/ipv4/netfilter/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/net/ipv4/netfilter/Kconfig
|
||||
+++ linux-2.6.24.7/net/ipv4/netfilter/Kconfig
|
||||
@@ -333,6 +333,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_TOS
|
||||
tristate "TOS 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.24.7/net/ipv4/netfilter/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/net/ipv4/netfilter/Makefile
|
||||
+++ linux-2.6.24.7/net/ipv4/netfilter/Makefile
|
||||
@@ -58,6 +58,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.24.7/net/ipv6/netfilter/ip6t_IMQ.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/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.24.7/net/ipv6/netfilter/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/net/ipv6/netfilter/Kconfig
|
||||
+++ linux-2.6.24.7/net/ipv6/netfilter/Kconfig
|
||||
@@ -173,6 +173,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.24.7/net/ipv6/netfilter/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/net/ipv6/netfilter/Makefile
|
||||
+++ linux-2.6.24.7/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,11 @@
|
||||
Index: linux-2.6.24.7/net/sched/sch_generic.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/net/sched/sch_generic.c
|
||||
+++ linux-2.6.24.7/net/sched/sch_generic.c
|
||||
@@ -176,6 +176,11 @@ static inline int qdisc_restart(struct n
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -865,8 +880,8 @@ 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 {
|
||||
@@ -638,3 +643,4 @@
|
||||
unsigned long start_time = jiffies;
|
||||
@@ -650,3 +655,4 @@ EXPORT_SYMBOL(qdisc_destroy);
|
||||
EXPORT_SYMBOL(qdisc_reset);
|
||||
EXPORT_SYMBOL(qdisc_lock_tree);
|
||||
EXPORT_SYMBOL(qdisc_unlock_tree);
|
||||
|
|
|
@ -1,17 +1,17 @@
|
|||
Index: linux-2.6.24/include/linux/netfilter/oot_conntrack.h
|
||||
Index: linux-2.6.24.7/include/linux/netfilter/oot_conntrack.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24/include/linux/netfilter/oot_conntrack.h
|
||||
+++ linux-2.6.24.7/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.24.7/include/linux/netfilter/oot_trans.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24/include/linux/netfilter/oot_trans.h
|
||||
+++ linux-2.6.24.7/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.24.7/include/linux/netfilter/xt_CHAOS.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24/include/linux/netfilter/xt_CHAOS.h
|
||||
+++ linux-2.6.24.7/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.24.7/include/linux/netfilter/xt_portscan.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24/include/linux/netfilter/xt_portscan.h
|
||||
+++ linux-2.6.24.7/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.24.7/net/netfilter/find_match.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24/net/netfilter/find_match.c
|
||||
+++ linux-2.6.24.7/net/netfilter/find_match.c
|
||||
@@ -0,0 +1,39 @@
|
||||
+/*
|
||||
+ xt_request_find_match
|
||||
|
@ -103,10 +103,10 @@ 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.24.7/net/netfilter/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.24.orig/net/netfilter/Kconfig
|
||||
+++ linux-2.6.24/net/netfilter/Kconfig
|
||||
--- linux-2.6.24.7.orig/net/netfilter/Kconfig
|
||||
+++ linux-2.6.24.7/net/netfilter/Kconfig
|
||||
@@ -265,6 +265,14 @@ config NETFILTER_XTABLES
|
||||
|
||||
# alphabetically ordered list of targets
|
||||
|
@ -152,10 +152,10 @@ Index: linux-2.6.24/net/netfilter/Kconfig
|
|||
config NETFILTER_XT_MATCH_MULTIPORT
|
||||
tristate "Multiple port match support"
|
||||
depends on NETFILTER_XTABLES
|
||||
Index: linux-2.6.24/net/netfilter/Makefile
|
||||
Index: linux-2.6.24.7/net/netfilter/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.24.orig/net/netfilter/Makefile
|
||||
+++ linux-2.6.24/net/netfilter/Makefile
|
||||
--- linux-2.6.24.7.orig/net/netfilter/Makefile
|
||||
+++ linux-2.6.24.7/net/netfilter/Makefile
|
||||
@@ -49,6 +49,8 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK
|
||||
obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o
|
||||
obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o
|
||||
|
@ -170,10 +170,10 @@ Index: linux-2.6.24/net/netfilter/Makefile
|
|||
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.24.7/net/netfilter/xt_CHAOS.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24/net/netfilter/xt_CHAOS.c
|
||||
+++ linux-2.6.24.7/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.24.7/net/netfilter/xt_DELUDE.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24/net/netfilter/xt_DELUDE.c
|
||||
+++ linux-2.6.24.7/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.24.7/net/netfilter/xt_portscan.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24/net/netfilter/xt_portscan.c
|
||||
+++ linux-2.6.24.7/net/netfilter/xt_portscan.c
|
||||
@@ -0,0 +1,269 @@
|
||||
+/*
|
||||
+ * portscan match for netfilter
|
||||
|
@ -851,10 +851,10 @@ 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.24.7/drivers/char/random.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.orig/drivers/char/random.c
|
||||
+++ linux-2.6.24/drivers/char/random.c
|
||||
--- linux-2.6.24.7.orig/drivers/char/random.c
|
||||
+++ linux-2.6.24.7/drivers/char/random.c
|
||||
@@ -1564,6 +1564,8 @@ __u32 secure_tcp_sequence_number(__be32
|
||||
return seq;
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Index: linux-2.6.23/net/netfilter/Kconfig
|
||||
Index: linux-2.6.24.7/net/netfilter/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/net/netfilter/Kconfig
|
||||
+++ linux-2.6.23/net/netfilter/Kconfig
|
||||
--- linux-2.6.24.7.orig/net/netfilter/Kconfig
|
||||
+++ linux-2.6.24.7/net/netfilter/Kconfig
|
||||
@@ -401,6 +401,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.24.7/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.24.7.orig/net/netfilter/Makefile
|
||||
+++ linux-2.6.24.7/net/netfilter/Makefile
|
||||
@@ -47,6 +47,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG)
|
||||
obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE) += xt_NFQUEUE.o
|
||||
obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_NOTRACK.o
|
||||
obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.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_TRACE) += xt_TRACE.o
|
||||
obj-$(CONFIG_NETFILTER_XT_TARGET_CHAOS) += xt_CHAOS.o
|
||||
Index: linux-2.6.24.7/net/netfilter/xt_TARPIT.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.23/net/netfilter/xt_TARPIT.c
|
||||
+++ linux-2.6.24.7/net/netfilter/xt_TARPIT.c
|
||||
@@ -0,0 +1,279 @@
|
||||
+/*
|
||||
+ * Kernel module to capture and hold incoming TCP connections using
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
Index: linux-2.6.23-rc6/net/netfilter/Kconfig
|
||||
Index: linux-2.6.24.7/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.24.7.orig/net/netfilter/Kconfig
|
||||
+++ linux-2.6.24.7/net/netfilter/Kconfig
|
||||
@@ -143,7 +143,7 @@ config NF_CONNTRACK_FTP
|
||||
|
||||
config NF_CONNTRACK_H323
|
||||
tristate "H.323 protocol support (EXPERIMENTAL)"
|
||||
|
@ -11,7 +11,7 @@ Index: linux-2.6.23-rc6/net/netfilter/Kconfig
|
|||
help
|
||||
H.323 is a VoIP signalling protocol from ITU-T. As one of the most
|
||||
important VoIP protocols, it is widely used by voice hardware and
|
||||
@@ -403,7 +403,7 @@
|
||||
@@ -420,7 +420,7 @@ config NETFILTER_XT_TARGET_TARPIT
|
||||
|
||||
config NETFILTER_XT_TARGET_TCPMSS
|
||||
tristate '"TCPMSS" target support'
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Index: linux-2.6.23-rc9/include/linux/netfilter/nf_conntrack_rtsp.h
|
||||
Index: linux-2.6.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7.orig/net/ipv4/netfilter/Makefile
|
||||
+++ linux-2.6.24.7/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.24.7/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.24.7.orig/net/netfilter/Kconfig
|
||||
+++ linux-2.6.24.7/net/netfilter/Kconfig
|
||||
@@ -249,6 +249,16 @@ config NF_CONNTRACK_TFTP
|
||||
|
||||
To compile it as a module, choose M here. If unsure, say N.
|
||||
|
||||
|
@ -331,11 +331,11 @@ Index: linux-2.6.23-rc9/net/netfilter/Kconfig
|
|||
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
|
||||
Index: linux-2.6.24.7/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.24.7.orig/net/netfilter/Makefile
|
||||
+++ linux-2.6.24.7/net/netfilter/Makefile
|
||||
@@ -33,6 +33,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.24.7/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.24.7.orig/net/ipv4/netfilter/Kconfig
|
||||
+++ linux-2.6.24.7/net/ipv4/netfilter/Kconfig
|
||||
@@ -296,6 +296,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.24.7/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.24.7/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.24.7/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.24.7/net/ipv4/netfilter/nf_nat_rtsp.c
|
||||
@@ -0,0 +1,496 @@
|
||||
+/*
|
||||
+ * RTSP extension for TCP NAT alteration
|
||||
|
|
|
@ -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.24.7/include/linux/pkt_sched.h
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/include/linux/pkt_sched.h
|
||||
+++ linux-2.6.24.7/include/linux/pkt_sched.h
|
||||
@@ -155,8 +155,37 @@ struct tc_sfq_qopt
|
||||
*
|
||||
* 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.24.7/net/sched/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/net/sched/Kconfig
|
||||
+++ linux-2.6.24.7/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.24.7/net/sched/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/net/sched/Makefile
|
||||
+++ linux-2.6.24.7/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.24.7/net/sched/sch_esfq.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/net/sched/sch_esfq.c
|
||||
@@ -0,0 +1,702 @@
|
||||
+/*
|
||||
+ * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline.
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
Index: linux-2.6.23-rc6/arch/mips/Makefile
|
||||
Index: linux-2.6.24.7/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.24.7.orig/arch/mips/Makefile
|
||||
+++ linux-2.6.24.7/arch/mips/Makefile
|
||||
@@ -576,6 +576,9 @@ core-$(CONFIG_TOSHIBA_RBTX4938) += arch/
|
||||
cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
|
||||
load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
Index: linux-2.6.23-rc6/fs/jffs2/build.c
|
||||
Index: linux-2.6.24.7/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.24.7.orig/fs/jffs2/build.c
|
||||
+++ linux-2.6.24.7/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.24.7/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.24.7.orig/fs/jffs2/scan.c
|
||||
+++ linux-2.6.24.7/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;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Index: linux-2.6.23-rc6/include/asm-powerpc/segment.h
|
||||
Index: linux-2.6.24.7/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.24.7/include/asm-powerpc/segment.h
|
||||
@@ -0,0 +1,6 @@
|
||||
+#ifndef _ASM_SEGMENT_H
|
||||
+#define _ASM_SEGMENT_H
|
||||
|
|
|
@ -1,35 +1,35 @@
|
|||
Index: linux-2.6.23/drivers/net/r8169.c
|
||||
Index: linux-2.6.24.7/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.24.7.orig/drivers/net/r8169.c
|
||||
+++ linux-2.6.24.7/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;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
Index: linux-2.6.23/fs/Kconfig
|
||||
Index: linux-2.6.24.7/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.24.7.orig/fs/Kconfig
|
||||
+++ linux-2.6.24.7/fs/Kconfig
|
||||
@@ -468,6 +468,9 @@ config OCFS2_DEBUG_FS
|
||||
this option for debugging only as it is likely to decrease
|
||||
performance of the filesystem.
|
||||
|
||||
+config MINI_FO
|
||||
+ tristate "Mini fanout overlay filesystem"
|
||||
|
@ -12,22 +12,22 @@ Index: linux-2.6.23/fs/Kconfig
|
|||
config MINIX_FS
|
||||
tristate "Minix fs support"
|
||||
help
|
||||
Index: linux-2.6.23/fs/Makefile
|
||||
Index: linux-2.6.24.7/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.24.7.orig/fs/Makefile
|
||||
+++ linux-2.6.24.7/fs/Makefile
|
||||
@@ -76,6 +76,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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24.7/fs/mini_fo/super.c
|
||||
@@ -0,0 +1,281 @@
|
||||
+/*
|
||||
+ * Copyright (c) 1997-2003 Erez Zadok
|
||||
|
|
|
@ -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.24.7/lib/kobject_uevent.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/lib/kobject_uevent.c
|
||||
+++ linux-2.6.24.7/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,7 +31,7 @@
|
|||
/**
|
||||
* kobject_action_type - translate action string to numeric type
|
||||
*
|
||||
@@ -173,9 +186,7 @@
|
||||
@@ -173,9 +186,7 @@ int kobject_uevent_env(struct kobject *k
|
||||
}
|
||||
|
||||
/* we will send an event, so request a new sequence number */
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
Index: linux-2.6.23.1/sound/core/Kconfig
|
||||
Index: linux-2.6.24.7/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.24.7.orig/sound/core/Kconfig
|
||||
+++ linux-2.6.24.7/sound/core/Kconfig
|
||||
@@ -9,7 +9,7 @@ config SND_PCM
|
||||
depends on SND
|
||||
|
||||
config SND_HWDEP
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
Index: linux-2.6.23-rc9/drivers/leds/Kconfig
|
||||
Index: linux-2.6.24.7/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.24.7.orig/drivers/leds/Kconfig
|
||||
+++ linux-2.6.24.7/drivers/leds/Kconfig
|
||||
@@ -146,4 +146,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.24.7/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.24.7.orig/drivers/leds/Makefile
|
||||
+++ linux-2.6.24.7/drivers/leds/Makefile
|
||||
@@ -24,3 +24,4 @@ obj-$(CONFIG_LEDS_CM_X270)
|
||||
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
|
||||
|
|
|
@ -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.24.7/drivers/leds/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/drivers/leds/Kconfig
|
||||
+++ linux-2.6.24.7/drivers/leds/Kconfig
|
||||
@@ -81,6 +81,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.24.7/drivers/leds/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/drivers/leds/Makefile
|
||||
+++ linux-2.6.24.7/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
|
||||
|
|
|
@ -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.24.7/drivers/leds/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/drivers/leds/Kconfig
|
||||
+++ linux-2.6.24.7/drivers/leds/Kconfig
|
||||
@@ -156,4 +156,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.24.7/drivers/leds/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/drivers/leds/Makefile
|
||||
+++ linux-2.6.24.7/drivers/leds/Makefile
|
||||
@@ -26,3 +26,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
|
||||
|
|
|
@ -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.24.7/drivers/rtc/rtc-ds1672.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/drivers/rtc/rtc-ds1672.c
|
||||
+++ linux-2.6.24.7/drivers/rtc/rtc-ds1672.c
|
||||
@@ -13,10 +13,10 @@
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/rtc.h>
|
||||
|
|
|
@ -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.24.7/drivers/input/misc/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/drivers/input/misc/Kconfig
|
||||
+++ linux-2.6.24.7/drivers/input/misc/Kconfig
|
||||
@@ -183,4 +183,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.24.7/drivers/input/misc/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/drivers/input/misc/Makefile
|
||||
+++ linux-2.6.24.7/drivers/input/misc/Makefile
|
||||
@@ -18,3 +18,4 @@ obj-$(CONFIG_INPUT_POWERMATE) += powerm
|
||||
obj-$(CONFIG_INPUT_YEALINK) += yealink.o
|
||||
obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o
|
||||
obj-$(CONFIG_INPUT_UINPUT) += uinput.o
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
Index: linux-2.6.23-rc6/fs/Kconfig
|
||||
Index: linux-2.6.24.7/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.24.7.orig/fs/Kconfig
|
||||
+++ linux-2.6.24.7/fs/Kconfig
|
||||
@@ -420,6 +420,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.24.7/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.24.7.orig/fs/Makefile
|
||||
+++ linux-2.6.24.7/fs/Makefile
|
||||
@@ -120,3 +120,4 @@ obj-$(CONFIG_HPPFS) += hppfs/
|
||||
obj-$(CONFIG_DEBUG_FS) += debugfs/
|
||||
obj-$(CONFIG_OCFS2_FS) += ocfs2/
|
||||
obj-$(CONFIG_GFS2_FS) += gfs2/
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
Index: linux-2.6.23/drivers/net/phy/phy.c
|
||||
Index: linux-2.6.24.7/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.24.7.orig/drivers/net/phy/phy.c
|
||||
+++ linux-2.6.24.7/drivers/net/phy/phy.c
|
||||
@@ -345,6 +345,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.24.7/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.24.7.orig/include/linux/phy.h
|
||||
+++ linux-2.6.24.7/include/linux/phy.h
|
||||
@@ -398,6 +398,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);
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
diff -Nur linux-2.6.24.2/include/linux/atmbr2684.h linux-2.6.24.2-copy/include/linux/atmbr2684.h
|
||||
--- linux-2.6.24.2/include/linux/atmbr2684.h 2008-02-11 05:51:11.000000000 +0000
|
||||
+++ linux-2.6.24.2-copy/include/linux/atmbr2684.h 2008-03-27 01:08:42.000000000 +0000
|
||||
Index: linux-2.6.24.7/include/linux/atmbr2684.h
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/include/linux/atmbr2684.h
|
||||
+++ linux-2.6.24.7/include/linux/atmbr2684.h
|
||||
@@ -14,6 +14,9 @@
|
||||
#define BR2684_MEDIA_FDDI (3)
|
||||
#define BR2684_MEDIA_802_6 (4) /* 802.6 */
|
||||
|
@ -38,7 +39,7 @@ diff -Nur linux-2.6.24.2/include/linux/atmbr2684.h linux-2.6.24.2-copy/include/l
|
|||
};
|
||||
|
||||
/*
|
||||
@@ -55,10 +65,10 @@
|
||||
@@ -55,10 +65,10 @@ struct atm_newif_br2684 {
|
||||
#define BR2684_FIND_BYNUM (1)
|
||||
#define BR2684_FIND_BYIFNAME (2)
|
||||
struct br2684_if_spec {
|
||||
|
@ -52,7 +53,7 @@ diff -Nur linux-2.6.24.2/include/linux/atmbr2684.h linux-2.6.24.2-copy/include/l
|
|||
} spec;
|
||||
};
|
||||
|
||||
@@ -68,16 +78,16 @@
|
||||
@@ -68,16 +78,16 @@ struct br2684_if_spec {
|
||||
* is per-backend specific
|
||||
*/
|
||||
struct atm_backend_br2684 {
|
||||
|
@ -78,7 +79,7 @@ diff -Nur linux-2.6.24.2/include/linux/atmbr2684.h linux-2.6.24.2-copy/include/l
|
|||
};
|
||||
|
||||
/*
|
||||
@@ -86,8 +96,8 @@
|
||||
@@ -86,8 +96,8 @@ struct atm_backend_br2684 {
|
||||
* efficient per-if in/out filters, this support will be removed
|
||||
*/
|
||||
struct br2684_filter {
|
||||
|
@ -89,7 +90,7 @@ diff -Nur linux-2.6.24.2/include/linux/atmbr2684.h linux-2.6.24.2-copy/include/l
|
|||
};
|
||||
|
||||
struct br2684_filter_set {
|
||||
@@ -95,7 +105,13 @@
|
||||
@@ -95,7 +105,13 @@ struct br2684_filter_set {
|
||||
struct br2684_filter filter;
|
||||
};
|
||||
|
||||
|
@ -103,9 +104,10 @@ diff -Nur linux-2.6.24.2/include/linux/atmbr2684.h linux-2.6.24.2-copy/include/l
|
|||
|
||||
#endif /* _LINUX_ATMBR2684_H */
|
||||
+
|
||||
diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
||||
--- linux-2.6.24.2/net/atm/br2684.c 2008-02-11 05:51:11.000000000 +0000
|
||||
+++ linux-2.6.24.2-copy/net/atm/br2684.c 2008-03-27 03:24:17.000000000 +0000
|
||||
Index: linux-2.6.24.7/net/atm/br2684.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/net/atm/br2684.c
|
||||
+++ linux-2.6.24.7/net/atm/br2684.c
|
||||
@@ -1,8 +1,10 @@
|
||||
/*
|
||||
-Experimental ethernet netdevice using ATM AAL5 as underlying carrier
|
||||
|
@ -121,7 +123,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
@@ -39,21 +41,35 @@
|
||||
@@ -39,21 +41,35 @@ static void skb_debug(const struct sk_bu
|
||||
#define skb_debug(skb) do {} while (0)
|
||||
#endif
|
||||
|
||||
|
@ -164,7 +166,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
enum br2684_encaps encaps;
|
||||
struct list_head brvccs;
|
||||
#ifdef CONFIG_ATM_BR2684_IPFILTER
|
||||
@@ -66,9 +82,10 @@
|
||||
@@ -66,9 +82,10 @@ struct br2684_dev {
|
||||
struct net_device *net_dev;
|
||||
struct list_head br2684_devs;
|
||||
int number;
|
||||
|
@ -176,7 +178,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
};
|
||||
|
||||
/*
|
||||
@@ -84,7 +101,7 @@
|
||||
@@ -84,7 +101,7 @@ static LIST_HEAD(br2684_devs);
|
||||
|
||||
static inline struct br2684_dev *BRPRIV(const struct net_device *net_dev)
|
||||
{
|
||||
|
@ -185,7 +187,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
}
|
||||
|
||||
static inline struct net_device *list_entry_brdev(const struct list_head *le)
|
||||
@@ -94,7 +111,7 @@
|
||||
@@ -94,7 +111,7 @@ static inline struct net_device *list_en
|
||||
|
||||
static inline struct br2684_vcc *BR2684_VCC(const struct atm_vcc *atmvcc)
|
||||
{
|
||||
|
@ -194,7 +196,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
}
|
||||
|
||||
static inline struct br2684_vcc *list_entry_brvcc(const struct list_head *le)
|
||||
@@ -132,10 +149,11 @@
|
||||
@@ -132,10 +149,11 @@ static struct net_device *br2684_find_de
|
||||
* otherwise false
|
||||
*/
|
||||
static int br2684_xmit_vcc(struct sk_buff *skb, struct br2684_dev *brdev,
|
||||
|
@ -207,7 +209,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
if (skb_headroom(skb) < minheadroom) {
|
||||
struct sk_buff *skb2 = skb_realloc_headroom(skb, minheadroom);
|
||||
brvcc->copies_needed++;
|
||||
@@ -146,23 +164,48 @@
|
||||
@@ -146,23 +164,48 @@ static int br2684_xmit_vcc(struct sk_buf
|
||||
}
|
||||
skb = skb2;
|
||||
}
|
||||
|
@ -266,7 +268,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
atomic_add(skb->truesize, &sk_atm(atmvcc)->sk_wmem_alloc);
|
||||
ATM_SKB(skb)->atm_options = atmvcc->atm_options;
|
||||
brdev->stats.tx_packets++;
|
||||
@@ -172,10 +215,9 @@
|
||||
@@ -172,10 +215,9 @@ static int br2684_xmit_vcc(struct sk_buf
|
||||
}
|
||||
|
||||
static inline struct br2684_vcc *pick_outgoing_vcc(struct sk_buff *skb,
|
||||
|
@ -279,7 +281,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
}
|
||||
|
||||
static int br2684_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
@@ -199,11 +241,10 @@
|
||||
@@ -199,11 +241,10 @@ static int br2684_start_xmit(struct sk_b
|
||||
/*
|
||||
* We should probably use netif_*_queue() here, but that
|
||||
* involves added complication. We need to walk before
|
||||
|
@ -294,7 +296,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
brdev->stats.tx_errors++;
|
||||
brdev->stats.tx_fifo_errors++;
|
||||
}
|
||||
@@ -217,12 +258,11 @@
|
||||
@@ -217,12 +258,11 @@ static struct net_device_stats *br2684_g
|
||||
return &BRPRIV(dev)->stats;
|
||||
}
|
||||
|
||||
|
@ -308,7 +310,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
static int br2684_mac_addr(struct net_device *dev, void *p)
|
||||
{
|
||||
int err = my_eth_mac_addr(dev, p);
|
||||
@@ -233,7 +273,7 @@
|
||||
@@ -233,7 +273,7 @@ static int br2684_mac_addr(struct net_de
|
||||
|
||||
#ifdef CONFIG_ATM_BR2684_IPFILTER
|
||||
/* this IOCTL is experimental. */
|
||||
|
@ -317,7 +319,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
{
|
||||
struct br2684_vcc *brvcc;
|
||||
struct br2684_filter_set fs;
|
||||
@@ -243,13 +283,12 @@
|
||||
@@ -243,13 +283,12 @@ static int br2684_setfilt(struct atm_vcc
|
||||
if (fs.ifspec.method != BR2684_FIND_BYNOTHING) {
|
||||
/*
|
||||
* This is really a per-vcc thing, but we can also search
|
||||
|
@ -333,7 +335,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
brvcc = NULL;
|
||||
else
|
||||
brvcc = list_entry_brvcc(brdev->brvccs.next);
|
||||
@@ -267,15 +306,16 @@
|
||||
@@ -267,15 +306,16 @@ static inline int
|
||||
packet_fails_filter(__be16 type, struct br2684_vcc *brvcc, struct sk_buff *skb)
|
||||
{
|
||||
if (brvcc->filter.netmask == 0)
|
||||
|
@ -354,7 +356,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
*/
|
||||
return 1; /* drop */
|
||||
}
|
||||
@@ -299,7 +339,6 @@
|
||||
@@ -299,7 +339,6 @@ static void br2684_push(struct atm_vcc *
|
||||
struct br2684_vcc *brvcc = BR2684_VCC(atmvcc);
|
||||
struct net_device *net_dev = brvcc->device;
|
||||
struct br2684_dev *brdev = BRPRIV(net_dev);
|
||||
|
@ -362,7 +364,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
|
||||
pr_debug("br2684_push\n");
|
||||
|
||||
@@ -320,35 +359,58 @@
|
||||
@@ -320,35 +359,58 @@ static void br2684_push(struct atm_vcc *
|
||||
atm_return(atmvcc, skb->truesize);
|
||||
pr_debug("skb from brdev %p\n", brdev);
|
||||
if (brvcc->encaps == e_llc) {
|
||||
|
@ -436,7 +438,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
#ifdef CONFIG_ATM_BR2684_IPFILTER
|
||||
if (unlikely(packet_fails_filter(skb->protocol, brvcc, skb))) {
|
||||
brdev->stats.rx_dropped++;
|
||||
@@ -372,11 +434,12 @@
|
||||
@@ -372,11 +434,12 @@ static void br2684_push(struct atm_vcc *
|
||||
netif_rx(skb);
|
||||
}
|
||||
|
||||
|
@ -453,7 +455,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
int err;
|
||||
struct br2684_vcc *brvcc;
|
||||
struct sk_buff *skb;
|
||||
@@ -395,7 +458,7 @@
|
||||
@@ -395,7 +458,7 @@ Note: we do not have explicit unassign,
|
||||
net_dev = br2684_find_dev(&be.ifspec);
|
||||
if (net_dev == NULL) {
|
||||
printk(KERN_ERR
|
||||
|
@ -462,7 +464,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
err = -ENXIO;
|
||||
goto error;
|
||||
}
|
||||
@@ -411,13 +474,15 @@
|
||||
@@ -411,13 +474,15 @@ Note: we do not have explicit unassign,
|
||||
}
|
||||
if (be.fcs_in != BR2684_FCSIN_NO || be.fcs_out != BR2684_FCSOUT_NO ||
|
||||
be.fcs_auto || be.has_vpiid || be.send_padding || (be.encaps !=
|
||||
|
@ -482,7 +484,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
if (list_empty(&brdev->brvccs) && !brdev->mac_was_set) {
|
||||
unsigned char *esi = atmvcc->dev->esi;
|
||||
if (esi[0] | esi[1] | esi[2] | esi[3] | esi[4] | esi[5])
|
||||
@@ -430,7 +495,7 @@
|
||||
@@ -430,7 +495,7 @@ Note: we do not have explicit unassign,
|
||||
brvcc->device = net_dev;
|
||||
brvcc->atmvcc = atmvcc;
|
||||
atmvcc->user_back = brvcc;
|
||||
|
@ -491,7 +493,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
brvcc->old_push = atmvcc->push;
|
||||
barrier();
|
||||
atmvcc->push = br2684_push;
|
||||
@@ -461,7 +526,7 @@
|
||||
@@ -461,7 +526,7 @@ Note: we do not have explicit unassign,
|
||||
}
|
||||
__module_get(THIS_MODULE);
|
||||
return 0;
|
||||
|
@ -500,7 +502,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
write_unlock_irq(&devs_lock);
|
||||
kfree(brvcc);
|
||||
return err;
|
||||
@@ -482,25 +547,52 @@
|
||||
@@ -482,25 +547,52 @@ static void br2684_setup(struct net_devi
|
||||
INIT_LIST_HEAD(&brdev->brvccs);
|
||||
}
|
||||
|
||||
|
@ -555,7 +557,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
if (!netdev)
|
||||
return -ENOMEM;
|
||||
|
||||
@@ -516,6 +608,7 @@
|
||||
@@ -516,6 +608,7 @@ static int br2684_create(void __user *ar
|
||||
}
|
||||
|
||||
write_lock_irq(&devs_lock);
|
||||
|
@ -563,7 +565,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
brdev->number = list_empty(&br2684_devs) ? 1 :
|
||||
BRPRIV(list_entry_brdev(br2684_devs.prev))->number + 1;
|
||||
list_add_tail(&brdev->br2684_devs, &br2684_devs);
|
||||
@@ -528,16 +621,16 @@
|
||||
@@ -528,16 +621,16 @@ static int br2684_create(void __user *ar
|
||||
* -ENOIOCTLCMD for any unrecognized ioctl
|
||||
*/
|
||||
static int br2684_ioctl(struct socket *sock, unsigned int cmd,
|
||||
|
@ -584,7 +586,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
err = get_user(b, (atm_backend_t __user *) argp);
|
||||
if (err)
|
||||
return -EFAULT;
|
||||
@@ -549,7 +642,6 @@
|
||||
@@ -549,7 +642,6 @@ static int br2684_ioctl(struct socket *s
|
||||
return br2684_regvcc(atmvcc, argp);
|
||||
else
|
||||
return br2684_create(argp);
|
||||
|
@ -592,7 +594,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
#ifdef CONFIG_ATM_BR2684_IPFILTER
|
||||
case BR2684_SETFILT:
|
||||
if (atmvcc->push != br2684_push)
|
||||
@@ -557,6 +649,7 @@
|
||||
@@ -557,6 +649,7 @@ static int br2684_ioctl(struct socket *s
|
||||
if (!capable(CAP_NET_ADMIN))
|
||||
return -EPERM;
|
||||
err = br2684_setfilt(atmvcc, argp);
|
||||
|
@ -600,7 +602,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
return err;
|
||||
#endif /* CONFIG_ATM_BR2684_IPFILTER */
|
||||
}
|
||||
@@ -564,24 +657,25 @@
|
||||
@@ -564,24 +657,25 @@ static int br2684_ioctl(struct socket *s
|
||||
}
|
||||
|
||||
static struct atm_ioctl br2684_ioctl_ops = {
|
||||
|
@ -631,7 +633,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
{
|
||||
read_unlock(&devs_lock);
|
||||
}
|
||||
@@ -589,7 +683,7 @@
|
||||
@@ -589,7 +683,7 @@ static void br2684_seq_stop(struct seq_f
|
||||
static int br2684_seq_show(struct seq_file *seq, void *v)
|
||||
{
|
||||
const struct br2684_dev *brdev = list_entry(v, struct br2684_dev,
|
||||
|
@ -640,7 +642,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
const struct net_device *net_dev = brdev->net_dev;
|
||||
const struct br2684_vcc *brvcc;
|
||||
DECLARE_MAC_BUF(mac);
|
||||
@@ -601,21 +695,19 @@
|
||||
@@ -601,21 +695,19 @@ static int br2684_seq_show(struct seq_fi
|
||||
brdev->mac_was_set ? "set" : "auto");
|
||||
|
||||
list_for_each_entry(brvcc, &brdev->brvccs, brvccs) {
|
||||
|
@ -672,7 +674,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
#undef bs
|
||||
#undef b1
|
||||
#endif /* CONFIG_ATM_BR2684_IPFILTER */
|
||||
@@ -625,9 +717,9 @@
|
||||
@@ -625,9 +717,9 @@ static int br2684_seq_show(struct seq_fi
|
||||
|
||||
static const struct seq_operations br2684_seq_ops = {
|
||||
.start = br2684_seq_start,
|
||||
|
@ -685,7 +687,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
};
|
||||
|
||||
static int br2684_proc_open(struct inode *inode, struct file *file)
|
||||
@@ -636,26 +728,28 @@
|
||||
@@ -636,26 +728,28 @@ static int br2684_proc_open(struct inode
|
||||
}
|
||||
|
||||
static const struct file_operations br2684_proc_ops = {
|
||||
|
@ -723,7 +725,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
|
|||
}
|
||||
|
||||
static void __exit br2684_exit(void)
|
||||
@@ -689,3 +783,4 @@
|
||||
@@ -689,3 +783,4 @@ module_exit(br2684_exit);
|
||||
MODULE_AUTHOR("Marcell GAL");
|
||||
MODULE_DESCRIPTION("RFC2684 bridged protocols over ATM/AAL5");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,8 +1,8 @@
|
|||
Index: linux-2.6.23-rc6/drivers/usb/serial/usb-serial.c
|
||||
Index: linux-2.6.24.7/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.24.7.orig/drivers/usb/serial/usb-serial.c
|
||||
+++ linux-2.6.24.7/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 @@
|
||||
@@ -894,7 +895,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 @@
|
||||
@@ -1306,3 +1307,5 @@ MODULE_LICENSE("GPL");
|
||||
|
||||
module_param(debug, bool, S_IRUGO | S_IWUSR);
|
||||
MODULE_PARM_DESC(debug, "Debug enabled or not");
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
Index: linux-2.6.23.14/init/main.c
|
||||
Index: linux-2.6.24.7/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.24.7.orig/init/main.c
|
||||
+++ linux-2.6.24.7/init/main.c
|
||||
@@ -773,7 +773,7 @@ static int noinline init_post(void)
|
||||
numa_default_policy();
|
||||
|
||||
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
|
||||
|
|
|
@ -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.24.7/fs/jffs2/erase.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/fs/jffs2/erase.c
|
||||
+++ linux-2.6.24.7/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));
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Index: linux-2.6.23-rc6/include/linux/time.h
|
||||
Index: linux-2.6.24.7/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.24.7.orig/include/linux/time.h
|
||||
+++ linux-2.6.24.7/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 @@
|
||||
@@ -231,4 +235,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.24.7/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.24.7.orig/include/linux/types.h
|
||||
+++ linux-2.6.24.7/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 */
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
Index: linux-2.6.23-rc6/scripts/genksyms/parse.c_shipped
|
||||
Index: linux-2.6.24.7/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.24.7.orig/scripts/genksyms/parse.c_shipped
|
||||
+++ linux-2.6.24.7/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.24.7/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.24.7.orig/scripts/genksyms/parse.y
|
||||
+++ linux-2.6.24.7/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.24.7/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.24.7.orig/scripts/kallsyms.c
|
||||
+++ linux-2.6.24.7/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.24.7/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.24.7.orig/scripts/kconfig/Makefile
|
||||
+++ linux-2.6.24.7/scripts/kconfig/Makefile
|
||||
@@ -90,6 +90,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.24.7/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.24.7.orig/scripts/mod/mk_elfconfig.c
|
||||
+++ linux-2.6.24.7/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.24.7/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.24.7.orig/scripts/mod/modpost.h
|
||||
+++ linux-2.6.24.7/scripts/mod/modpost.h
|
||||
@@ -7,7 +7,11 @@
|
||||
#include <sys/mman.h>
|
||||
#include <fcntl.h>
|
||||
|
|
|
@ -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.24.7/drivers/net/wireless/hostap/hostap_ap.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/drivers/net/wireless/hostap/hostap_ap.c
|
||||
+++ linux-2.6.24.7/drivers/net/wireless/hostap/hostap_ap.c
|
||||
@@ -2358,13 +2358,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 @@
|
||||
@@ -2429,13 +2429,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.24.7/drivers/net/wireless/hostap/hostap_config.h
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/drivers/net/wireless/hostap/hostap_config.h
|
||||
+++ linux-2.6.24.7/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.24.7/drivers/net/wireless/hostap/hostap.h
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/drivers/net/wireless/hostap/hostap.h
|
||||
+++ linux-2.6.24.7/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.24.7/drivers/net/wireless/hostap/hostap_hw.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/drivers/net/wireless/hostap/hostap_hw.c
|
||||
+++ linux-2.6.24.7/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.24.7/drivers/net/wireless/hostap/hostap_info.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/drivers/net/wireless/hostap/hostap_info.c
|
||||
+++ linux-2.6.24.7/drivers/net/wireless/hostap/hostap_info.c
|
||||
@@ -433,6 +433,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.24.7/drivers/net/wireless/hostap/hostap_ioctl.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/drivers/net/wireless/hostap/hostap_ioctl.c
|
||||
+++ linux-2.6.24.7/drivers/net/wireless/hostap/hostap_ioctl.c
|
||||
@@ -1501,23 +1501,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 @@
|
||||
@@ -4077,3 +4074,35 @@ int hostap_ioctl(struct net_device *dev,
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
Index: linux-2.6.23-rc6/include/linux/stddef.h
|
||||
Index: linux-2.6.24.7/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.24.7.orig/include/linux/stddef.h
|
||||
+++ linux-2.6.24.7/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
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
Index: linux-2.6.23-rc6/scripts/gen_initramfs_list.sh
|
||||
Index: linux-2.6.24.7/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.24.7.orig/scripts/gen_initramfs_list.sh
|
||||
+++ linux-2.6.24.7/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")
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Index: linux-2.6.23.9/arch/i386/boot/tools/build.c
|
||||
Index: linux-2.6.24.7/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.24.7.orig/arch/x86/boot/tools/build.c
|
||||
+++ linux-2.6.24.7/arch/x86/boot/tools/build.c
|
||||
@@ -29,7 +29,6 @@
|
||||
#include <stdarg.h>
|
||||
#include <sys/types.h>
|
||||
|
|
|
@ -1,21 +1,21 @@
|
|||
Index: linux-2.6.23.14/arch/arm/Kconfig
|
||||
Index: linux-2.6.24.7/arch/arm/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.23.14.orig/arch/arm/Kconfig 2008-01-26 02:46:18.000000000 +0100
|
||||
+++ linux-2.6.23.14/arch/arm/Kconfig 2008-01-26 02:46:33.000000000 +0100
|
||||
@@ -1039,6 +1039,8 @@
|
||||
--- linux-2.6.24.7.orig/arch/arm/Kconfig
|
||||
+++ linux-2.6.24.7/arch/arm/Kconfig
|
||||
@@ -1054,6 +1054,8 @@ source "drivers/ssb/Kconfig"
|
||||
|
||||
source "drivers/leds/Kconfig"
|
||||
source "drivers/mfd/Kconfig"
|
||||
|
||||
+source "drivers/gpio/Kconfig"
|
||||
+
|
||||
source "drivers/media/Kconfig"
|
||||
|
||||
source "drivers/video/Kconfig"
|
||||
Index: linux-2.6.23.14/drivers/Kconfig
|
||||
Index: linux-2.6.24.7/drivers/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.23.14.orig/drivers/Kconfig 2008-01-26 02:45:44.000000000 +0100
|
||||
+++ linux-2.6.23.14/drivers/Kconfig 2008-01-26 02:46:05.000000000 +0100
|
||||
@@ -74,6 +74,8 @@
|
||||
--- linux-2.6.24.7.orig/drivers/Kconfig
|
||||
+++ linux-2.6.24.7/drivers/Kconfig
|
||||
@@ -78,6 +78,8 @@ source "drivers/mmc/Kconfig"
|
||||
|
||||
source "drivers/leds/Kconfig"
|
||||
|
||||
|
@ -24,11 +24,11 @@ Index: linux-2.6.23.14/drivers/Kconfig
|
|||
source "drivers/infiniband/Kconfig"
|
||||
|
||||
source "drivers/edac/Kconfig"
|
||||
Index: linux-2.6.23.14/drivers/Makefile
|
||||
Index: linux-2.6.24.7/drivers/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.23.14.orig/drivers/Makefile 2008-01-26 02:44:13.000000000 +0100
|
||||
+++ linux-2.6.23.14/drivers/Makefile 2008-01-26 02:44:42.000000000 +0100
|
||||
@@ -91,3 +91,4 @@
|
||||
--- linux-2.6.24.7.orig/drivers/Makefile
|
||||
+++ linux-2.6.24.7/drivers/Makefile
|
||||
@@ -91,3 +91,4 @@ obj-$(CONFIG_PPC_PS3) += ps3/
|
||||
obj-$(CONFIG_OF) += of/
|
||||
obj-$(CONFIG_SSB) += ssb/
|
||||
obj-$(CONFIG_VIRTIO) += virtio/
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Index: linux-2.6.23.16/drivers/spi/Kconfig
|
||||
Index: linux-2.6.24.7/drivers/spi/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/spi/Kconfig
|
||||
+++ linux-2.6.23.16/drivers/spi/Kconfig
|
||||
--- linux-2.6.24.7.orig/drivers/spi/Kconfig
|
||||
+++ linux-2.6.24.7/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.24.7/drivers/spi/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/spi/Makefile
|
||||
+++ linux-2.6.23.16/drivers/spi/Makefile
|
||||
--- linux-2.6.24.7.orig/drivers/spi/Makefile
|
||||
+++ linux-2.6.24.7/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
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Index: linux-2.6.24.5/drivers/w1/masters/Kconfig
|
||||
Index: linux-2.6.24.7/drivers/w1/masters/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.24.5.orig/drivers/w1/masters/Kconfig
|
||||
+++ linux-2.6.24.5/drivers/w1/masters/Kconfig
|
||||
--- linux-2.6.24.7.orig/drivers/w1/masters/Kconfig
|
||||
+++ linux-2.6.24.7/drivers/w1/masters/Kconfig
|
||||
@@ -42,5 +42,15 @@ config W1_MASTER_DS1WM
|
||||
in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like
|
||||
hx4700.
|
||||
|
@ -18,19 +18,19 @@ Index: linux-2.6.24.5/drivers/w1/masters/Kconfig
|
|||
+
|
||||
endmenu
|
||||
|
||||
Index: linux-2.6.24.5/drivers/w1/masters/Makefile
|
||||
Index: linux-2.6.24.7/drivers/w1/masters/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.24.5.orig/drivers/w1/masters/Makefile
|
||||
+++ linux-2.6.24.5/drivers/w1/masters/Makefile
|
||||
--- linux-2.6.24.7.orig/drivers/w1/masters/Makefile
|
||||
+++ linux-2.6.24.7/drivers/w1/masters/Makefile
|
||||
@@ -6,3 +6,4 @@ obj-$(CONFIG_W1_MASTER_MATROX) += matro
|
||||
obj-$(CONFIG_W1_MASTER_DS2490) += ds2490.o
|
||||
obj-$(CONFIG_W1_MASTER_DS2482) += ds2482.o
|
||||
obj-$(CONFIG_W1_MASTER_DS1WM) += ds1wm.o
|
||||
+obj-$(CONFIG_W1_MASTER_GPIO) += w1-gpio.o
|
||||
Index: linux-2.6.24.5/drivers/w1/masters/w1-gpio.c
|
||||
Index: linux-2.6.24.7/drivers/w1/masters/w1-gpio.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.5/drivers/w1/masters/w1-gpio.c
|
||||
+++ linux-2.6.24.7/drivers/w1/masters/w1-gpio.c
|
||||
@@ -0,0 +1,124 @@
|
||||
+/*
|
||||
+ * w1-gpio - GPIO w1 bus master driver
|
||||
|
@ -156,10 +156,10 @@ Index: linux-2.6.24.5/drivers/w1/masters/w1-gpio.c
|
|||
+MODULE_DESCRIPTION("GPIO w1 bus master driver");
|
||||
+MODULE_AUTHOR("Ville Syrjala <syrjala@sci.fi>");
|
||||
+MODULE_LICENSE("GPL");
|
||||
Index: linux-2.6.24.5/include/linux/w1-gpio.h
|
||||
Index: linux-2.6.24.7/include/linux/w1-gpio.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.5/include/linux/w1-gpio.h
|
||||
+++ linux-2.6.24.7/include/linux/w1-gpio.h
|
||||
@@ -0,0 +1,23 @@
|
||||
+/*
|
||||
+ * w1-gpio interface to platform code
|
||||
|
|
|
@ -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.24.7/include/asm-ppc/io.h
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/include/asm-ppc/io.h
|
||||
+++ linux-2.6.24.7/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);
|
||||
|
||||
|
|
|
@ -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.24.7/arch/arm/tools/mach-types
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/arch/arm/tools/mach-types
|
||||
+++ linux-2.6.24.7/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
|
||||
#
|
||||
@@ -266,7 +266,7 @@
|
||||
@@ -266,7 +266,7 @@ stork_egg ARCH_STORK_EGG STORK_EGG 24
|
||||
wismo SA1100_WISMO WISMO 249
|
||||
ezlinx ARCH_EZLINX EZLINX 250
|
||||
at91rm9200 ARCH_AT91RM9200 AT91RM9200 251
|
||||
|
@ -18,7 +20,7 @@
|
|||
neptune ARCH_NEPTUNE NEPTUNE 253
|
||||
hackkit SA1100_HACKKIT HACKKIT 254
|
||||
pxa_wins30 ARCH_PXA_WINS30 PXA_WINS30 255
|
||||
@@ -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
|
||||
|
@ -34,7 +36,7 @@
|
|||
rcube ARCH_RCUBE RCUBE 374
|
||||
rea_olv ARCH_REA_OLV REA_OLV 375
|
||||
pxa_iphone ARCH_PXA_IPHONE PXA_IPHONE 376
|
||||
@@ -661,7 +661,6 @@
|
||||
@@ -661,7 +661,6 @@ a9200ec MACH_A9200EC A9200EC 645
|
||||
pnx0105 MACH_PNX0105 PNX0105 646
|
||||
adcpoecpu MACH_ADCPOECPU ADCPOECPU 647
|
||||
csb637 MACH_CSB637 CSB637 648
|
||||
|
@ -42,7 +44,7 @@
|
|||
mb9200 MACH_MB9200 MB9200 650
|
||||
kulun MACH_KULUN KULUN 651
|
||||
snapper MACH_SNAPPER SNAPPER 652
|
||||
@@ -953,7 +952,6 @@
|
||||
@@ -953,7 +952,6 @@ fred_jack MACH_FRED_JACK FRED_JACK 93
|
||||
ttg_color1 MACH_TTG_COLOR1 TTG_COLOR1 940
|
||||
nxeb500hmi MACH_NXEB500HMI NXEB500HMI 941
|
||||
netdcu8 MACH_NETDCU8 NETDCU8 942
|
||||
|
@ -50,7 +52,7 @@
|
|||
ng_fvx538 MACH_NG_FVX538 NG_FVX538 944
|
||||
ng_fvs338 MACH_NG_FVS338 NG_FVS338 945
|
||||
pnx4103 MACH_PNX4103 PNX4103 946
|
||||
@@ -1148,7 +1146,7 @@
|
||||
@@ -1148,7 +1146,7 @@ aidx270 MACH_AIDX270 AIDX270 1134
|
||||
rema MACH_REMA REMA 1135
|
||||
bps1000 MACH_BPS1000 BPS1000 1136
|
||||
hw90350 MACH_HW90350 HW90350 1137
|
||||
|
@ -59,7 +61,7 @@
|
|||
bluetouch MACH_BLUETOUCH BLUETOUCH 1139
|
||||
vstms MACH_VSTMS VSTMS 1140
|
||||
xsbase270 MACH_XSBASE270 XSBASE270 1141
|
||||
@@ -1214,7 +1212,7 @@
|
||||
@@ -1214,7 +1212,7 @@ osstbox MACH_OSSTBOX OSSTBOX 1203
|
||||
kbat9261 MACH_KBAT9261 KBAT9261 1204
|
||||
ct1100 MACH_CT1100 CT1100 1205
|
||||
akcppxa MACH_AKCPPXA AKCPPXA 1206
|
||||
|
@ -68,7 +70,7 @@
|
|||
hitrack MACH_HITRACK HITRACK 1208
|
||||
syme1 MACH_SYME1 SYME1 1209
|
||||
syhl1 MACH_SYHL1 SYHL1 1210
|
||||
@@ -1299,7 +1297,7 @@
|
||||
@@ -1299,7 +1297,7 @@ xp179 MACH_XP179 XP179 1290
|
||||
h4300 MACH_H4300 H4300 1291
|
||||
goramo_mlr MACH_GORAMO_MLR GORAMO_MLR 1292
|
||||
mxc30020evb MACH_MXC30020EVB MXC30020EVB 1293
|
||||
|
@ -77,7 +79,7 @@
|
|||
adsportalplus MACH_ADSPORTALPLUS ADSPORTALPLUS 1295
|
||||
mmsp2plus MACH_MMSP2PLUS MMSP2PLUS 1296
|
||||
em_x270 MACH_EM_X270 EM_X270 1297
|
||||
@@ -1367,3 +1365,346 @@
|
||||
@@ -1367,3 +1365,346 @@ db88f5281 MACH_DB88F5281 DB88F5281 13
|
||||
csb726 MACH_CSB726 CSB726 1359
|
||||
tik27 MACH_TIK27 TIK27 1360
|
||||
mx_uc7420 MACH_MX_UC7420 MX_UC7420 1361
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
--- linux-2.6.24.2/drivers/mtd/chips/cfi_cmdset_0001.c 2008-04-22 12:24:09.000000000 +0200
|
||||
+++ linux-2.6.24.2-owrt/drivers/mtd/chips/cfi_cmdset_0001.c 2008-04-22 19:47:38.000000000 +0200
|
||||
@@ -277,7 +277,7 @@
|
||||
Index: linux-2.6.24.7/drivers/mtd/chips/cfi_cmdset_0001.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/drivers/mtd/chips/cfi_cmdset_0001.c
|
||||
+++ linux-2.6.24.7/drivers/mtd/chips/cfi_cmdset_0001.c
|
||||
@@ -277,7 +277,7 @@ read_pri_intelext(struct map_info *map,
|
||||
return NULL;
|
||||
|
||||
if (extp->MajorVersion != '1' ||
|
||||
|
|
Loading…
Reference in a new issue