mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-25 03:01:09 +02:00
[kernel] generic-2.6/2.6.24: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14450 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
32e68db8d0
commit
95316451cb
@ -1,6 +1,6 @@
|
||||
--- a/fs/Kconfig
|
||||
+++ b/fs/Kconfig
|
||||
@@ -1405,6 +1405,71 @@
|
||||
@@ -1405,6 +1405,71 @@ config CRAMFS
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
@ -74,7 +74,7 @@
|
||||
depends on BLOCK
|
||||
--- a/fs/Makefile
|
||||
+++ b/fs/Makefile
|
||||
@@ -72,6 +72,7 @@
|
||||
@@ -72,6 +72,7 @@ obj-$(CONFIG_JBD) += jbd/
|
||||
obj-$(CONFIG_JBD2) += jbd2/
|
||||
obj-$(CONFIG_EXT2_FS) += ext2/
|
||||
obj-$(CONFIG_CRAMFS) += cramfs/
|
||||
@ -4128,7 +4128,7 @@
|
||||
#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:
|
||||
@ -4136,7 +4136,7 @@
|
||||
* 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;
|
||||
@ -4144,7 +4144,7 @@
|
||||
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;
|
||||
@ -4152,7 +4152,7 @@
|
||||
memset(buf, 0xe5, size);
|
||||
|
||||
/*
|
||||
@@ -101,6 +105,15 @@
|
||||
@@ -101,6 +105,15 @@ identify_ramdisk_image(int fd, int start
|
||||
goto done;
|
||||
}
|
||||
|
||||
|
@ -769,7 +769,7 @@
|
||||
+}
|
||||
--- a/lib/Makefile
|
||||
+++ b/lib/Makefile
|
||||
@@ -14,7 +14,7 @@
|
||||
@@ -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 \
|
||||
@ -778,7 +778,7 @@
|
||||
|
||||
ifeq ($(CONFIG_DEBUG_KOBJECT),y)
|
||||
CFLAGS_kobject.o += -DDEBUG
|
||||
@@ -64,6 +64,7 @@
|
||||
@@ -64,6 +64,7 @@ obj-$(CONFIG_SMP) += percpu_counter.o
|
||||
obj-$(CONFIG_AUDIT_GENERIC) += audit.o
|
||||
|
||||
obj-$(CONFIG_SWIOTLB) += swiotlb.o
|
||||
|
@ -38,7 +38,7 @@
|
||||
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 *);
|
||||
|
||||
|
||||
@ -50,7 +50,7 @@
|
||||
|
||||
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;
|
||||
|
||||
@ -66,7 +66,7 @@
|
||||
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;
|
||||
@ -75,7 +75,7 @@
|
||||
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");
|
||||
|
||||
@ -95,7 +95,7 @@
|
||||
destroy_inodecache();
|
||||
}
|
||||
|
||||
@@ -2064,7 +2098,9 @@
|
||||
@@ -2064,7 +2098,9 @@ out:
|
||||
|
||||
static void __exit exit_squashfs_fs(void)
|
||||
{
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -527,6 +527,9 @@
|
||||
@@ -527,6 +527,9 @@ KBUILD_CFLAGS += $(call cc-optio
|
||||
NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
|
||||
CHECKFLAGS += $(NOSTDINC_FLAGS)
|
||||
|
||||
|
@ -8,7 +8,7 @@
|
||||
#include <linux/squashfs_fs_sb.h>
|
||||
#include <linux/squashfs_fs_i.h>
|
||||
#include <linux/buffer_head.h>
|
||||
@@ -2125,7 +2126,7 @@
|
||||
@@ -2125,7 +2126,7 @@ static void squashfs_destroy_inode(struc
|
||||
}
|
||||
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/include/asm-mips/system.h
|
||||
+++ b/include/asm-mips/system.h
|
||||
@@ -185,7 +185,7 @@
|
||||
@@ -185,7 +185,7 @@ extern __u64 __xchg_u64_unsupported_on_3
|
||||
if something tries to do an invalid xchg(). */
|
||||
extern void __xchg_called_with_bad_pointer(void);
|
||||
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
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,6 +1,6 @@
|
||||
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
|
||||
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
|
||||
@@ -944,7 +944,7 @@
|
||||
@@ -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,
|
||||
@ -9,7 +9,7 @@
|
||||
{
|
||||
struct cfi_private *cfi = map->fldrv_priv;
|
||||
struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
|
||||
@@ -953,7 +953,7 @@
|
||||
@@ -953,7 +953,7 @@ static int __xipram xip_wait_for_operati
|
||||
flstate_t oldstate, newstate;
|
||||
|
||||
start = xip_currtime();
|
||||
@ -18,7 +18,7 @@
|
||||
if (usec == 0)
|
||||
usec = 500000;
|
||||
done = 0;
|
||||
@@ -1063,8 +1063,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)
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
|
||||
#else
|
||||
|
||||
@@ -1076,65 +1076,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,
|
||||
@ -130,7 +130,7 @@
|
||||
/* Done and happy. */
|
||||
chip->state = FL_STATUS;
|
||||
return 0;
|
||||
@@ -1143,7 +1143,8 @@
|
||||
@@ -1143,7 +1143,8 @@ static int inval_cache_and_wait_for_oper
|
||||
#endif
|
||||
|
||||
#define WAIT_TIMEOUT(map, chip, adr, udelay) \
|
||||
@ -140,7 +140,7 @@
|
||||
|
||||
|
||||
static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len)
|
||||
@@ -1374,7 +1375,7 @@
|
||||
@@ -1374,7 +1375,7 @@ static int __xipram do_write_oneword(str
|
||||
|
||||
ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
|
||||
adr, map_bankwidth(map),
|
||||
@ -149,7 +149,7 @@
|
||||
if (ret) {
|
||||
xip_enable(map, chip, adr);
|
||||
printk(KERN_ERR "%s: word write error (status timeout)\n", map->name);
|
||||
@@ -1614,7 +1615,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,
|
||||
@ -158,7 +158,7 @@
|
||||
if (ret) {
|
||||
map_write(map, CMD(0x70), cmd_adr);
|
||||
chip->state = FL_STATUS;
|
||||
@@ -1749,7 +1750,7 @@
|
||||
@@ -1749,7 +1750,7 @@ static int __xipram do_erase_oneblock(st
|
||||
|
||||
ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
|
||||
adr, len,
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/mm/tlbex.c
|
||||
+++ b/arch/mips/mm/tlbex.c
|
||||
@@ -902,7 +902,6 @@
|
||||
@@ -902,7 +902,6 @@ static __init void build_tlb_write_entry
|
||||
case CPU_R10000:
|
||||
case CPU_R12000:
|
||||
case CPU_R14000:
|
||||
@ -8,7 +8,7 @@
|
||||
case CPU_SB1:
|
||||
case CPU_SB1A:
|
||||
case CPU_4KSC:
|
||||
@@ -935,6 +934,7 @@
|
||||
@@ -935,6 +934,7 @@ static __init void build_tlb_write_entry
|
||||
tlbw(p);
|
||||
break;
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/kernel/gdb-stub.c
|
||||
+++ b/arch/mips/kernel/gdb-stub.c
|
||||
@@ -656,6 +656,7 @@
|
||||
@@ -656,6 +656,7 @@ void set_async_breakpoint(unsigned long
|
||||
*epc = (unsigned long)async_breakpoint;
|
||||
}
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
static void kgdb_wait(void *arg)
|
||||
{
|
||||
unsigned flags;
|
||||
@@ -668,6 +669,7 @@
|
||||
@@ -668,6 +669,7 @@ static void kgdb_wait(void *arg)
|
||||
|
||||
local_irq_restore(flags);
|
||||
}
|
||||
|
@ -8,7 +8,7 @@
|
||||
#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 */
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
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 */
|
||||
@ -45,7 +45,7 @@
|
||||
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;
|
||||
@ -68,7 +68,7 @@
|
||||
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)
|
||||
{
|
||||
@ -80,7 +80,7 @@
|
||||
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);
|
||||
|
||||
@ -89,7 +89,7 @@
|
||||
token[i] = strsep(&str, ",");
|
||||
|
||||
if (str)
|
||||
@@ -411,8 +420,10 @@
|
||||
@@ -411,8 +420,10 @@ static int block2mtd_setup2(const char *
|
||||
parse_err("illegal erase size");
|
||||
}
|
||||
}
|
||||
@ -101,7 +101,7 @@
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -446,7 +457,7 @@
|
||||
@@ -446,7 +457,7 @@ static int block2mtd_setup(const char *v
|
||||
|
||||
|
||||
module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/drivers/mtd/Kconfig
|
||||
+++ b/drivers/mtd/Kconfig
|
||||
@@ -47,6 +47,16 @@
|
||||
@@ -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.
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
|
||||
/* 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))
|
||||
@ -37,7 +37,7 @@
|
||||
|
||||
/*
|
||||
* 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;
|
||||
}
|
||||
|
||||
@ -350,7 +350,7 @@
|
||||
/*
|
||||
* 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;
|
||||
@ -540,7 +540,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
@@ -557,6 +728,32 @@
|
||||
@@ -557,6 +728,32 @@ int parse_mtd_partitions(struct mtd_info
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -575,7 +575,7 @@
|
||||
EXPORT_SYMBOL_GPL(deregister_mtd_parser);
|
||||
--- a/drivers/mtd/devices/block2mtd.c
|
||||
+++ b/drivers/mtd/devices/block2mtd.c
|
||||
@@ -34,6 +34,8 @@
|
||||
@@ -34,6 +34,8 @@ struct block2mtd_dev {
|
||||
struct block_device *blkdev;
|
||||
struct mtd_info mtd;
|
||||
struct mutex write_mutex;
|
||||
@ -584,7 +584,7 @@
|
||||
};
|
||||
|
||||
|
||||
@@ -86,6 +88,12 @@
|
||||
@@ -86,6 +88,12 @@ static int block2mtd_erase(struct mtd_in
|
||||
size_t len = instr->len;
|
||||
int err;
|
||||
|
||||
@ -597,7 +597,7 @@
|
||||
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);
|
||||
@ -608,7 +608,7 @@
|
||||
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);
|
||||
@ -626,7 +626,7 @@
|
||||
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);
|
||||
@ -645,7 +645,7 @@
|
||||
|
||||
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++;
|
||||
}
|
||||
@ -657,7 +657,7 @@
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
@ -684,7 +684,7 @@
|
||||
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;
|
||||
@ -694,7 +694,7 @@
|
||||
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;
|
||||
@ -754,7 +754,7 @@
|
||||
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)) {
|
||||
@ -854,7 +854,7 @@
|
||||
|
||||
/* 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;
|
||||
@ -872,7 +872,7 @@
|
||||
|
||||
#include <asm/uaccess.h>
|
||||
|
||||
@@ -754,6 +755,13 @@
|
||||
@@ -754,6 +755,13 @@ static int mtd_ioctl(struct inode *inode
|
||||
file->f_pos = 0;
|
||||
break;
|
||||
}
|
||||
@ -888,7 +888,7 @@
|
||||
ret = -ENOTTY;
|
||||
--- a/include/linux/mtd/mtd.h
|
||||
+++ b/include/linux/mtd/mtd.h
|
||||
@@ -98,6 +98,7 @@
|
||||
@@ -98,6 +98,7 @@ struct mtd_oob_ops {
|
||||
uint8_t *oobbuf;
|
||||
};
|
||||
|
||||
@ -896,7 +896,7 @@
|
||||
struct mtd_info {
|
||||
u_char type;
|
||||
u_int32_t flags;
|
||||
@@ -202,6 +203,9 @@
|
||||
@@ -202,6 +203,9 @@ struct mtd_info {
|
||||
struct module *owner;
|
||||
int usecount;
|
||||
|
||||
@ -916,7 +916,7 @@
|
||||
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 */
|
||||
@ -924,7 +924,7 @@
|
||||
};
|
||||
|
||||
#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 *);
|
||||
@ -934,7 +934,7 @@
|
||||
* Functions dealing with the various ways of partitioning the space
|
||||
--- a/include/mtd/mtd-abi.h
|
||||
+++ b/include/mtd/mtd-abi.h
|
||||
@@ -95,6 +95,7 @@
|
||||
@@ -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,6 +1,6 @@
|
||||
--- a/drivers/mtd/redboot.c
|
||||
+++ b/drivers/mtd/redboot.c
|
||||
@@ -236,14 +236,21 @@
|
||||
@@ -236,14 +236,21 @@ static int parse_redboot_partitions(stru
|
||||
#endif
|
||||
names += strlen(names)+1;
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/include/linux/mtd/nand.h
|
||||
+++ b/include/linux/mtd/nand.h
|
||||
@@ -573,6 +573,7 @@
|
||||
@@ -573,6 +573,7 @@ struct platform_nand_chip {
|
||||
int chip_delay;
|
||||
unsigned int options;
|
||||
const char **part_probe_types;
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
--- a/drivers/mtd/nand/plat_nand.c
|
||||
+++ b/drivers/mtd/nand/plat_nand.c
|
||||
@@ -70,7 +70,18 @@
|
||||
@@ -70,7 +70,18 @@ static int __init plat_nand_probe(struct
|
||||
platform_set_drvdata(pdev, data);
|
||||
|
||||
/* Scan to find existance of the device */
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/net/netfilter/Kconfig
|
||||
+++ b/net/netfilter/Kconfig
|
||||
@@ -633,6 +633,27 @@
|
||||
@@ -633,6 +633,27 @@ config NETFILTER_XT_MATCH_STATE
|
||||
|
||||
To compile it as a module, choose M here. If unsure, say N.
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
depends on NETFILTER_XTABLES
|
||||
--- a/net/netfilter/Makefile
|
||||
+++ b/net/netfilter/Makefile
|
||||
@@ -73,6 +73,7 @@
|
||||
@@ -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
|
||||
obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
|
||||
@ -2027,7 +2027,7 @@
|
||||
+}
|
||||
--- a/net/netfilter/nf_conntrack_core.c
|
||||
+++ b/net/netfilter/nf_conntrack_core.c
|
||||
@@ -206,6 +206,14 @@
|
||||
@@ -206,6 +206,14 @@ destroy_conntrack(struct nf_conntrack *n
|
||||
* too. */
|
||||
nf_ct_remove_expectations(ct);
|
||||
|
||||
@ -2044,7 +2044,7 @@
|
||||
BUG_ON(hlist_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnode));
|
||||
--- a/net/netfilter/nf_conntrack_standalone.c
|
||||
+++ b/net/netfilter/nf_conntrack_standalone.c
|
||||
@@ -180,7 +180,12 @@
|
||||
@@ -180,7 +180,12 @@ static int ct_seq_show(struct seq_file *
|
||||
return -ENOSPC;
|
||||
#endif
|
||||
|
||||
@ -2060,7 +2060,7 @@
|
||||
return 0;
|
||||
--- a/include/net/netfilter/nf_conntrack.h
|
||||
+++ b/include/net/netfilter/nf_conntrack.h
|
||||
@@ -124,6 +124,22 @@
|
||||
@@ -124,6 +124,22 @@ struct nf_conn
|
||||
u_int32_t secmark;
|
||||
#endif
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/include/linux/netfilter/xt_layer7.h
|
||||
+++ b/include/linux/netfilter/xt_layer7.h
|
||||
@@ -8,6 +8,7 @@
|
||||
@@ -8,6 +8,7 @@ struct xt_layer7_info {
|
||||
char protocol[MAX_PROTOCOL_LEN];
|
||||
char pattern[MAX_PATTERN_LEN];
|
||||
u_int8_t invert;
|
||||
@ -10,7 +10,7 @@
|
||||
#endif /* _XT_LAYER7_H */
|
||||
--- a/net/netfilter/xt_layer7.c
|
||||
+++ b/net/netfilter/xt_layer7.c
|
||||
@@ -297,34 +297,36 @@
|
||||
@@ -297,34 +297,36 @@ static int match_no_append(struct nf_con
|
||||
}
|
||||
|
||||
/* add the new app data to the conntrack. Return number of bytes added. */
|
||||
@ -61,7 +61,7 @@
|
||||
return length;
|
||||
}
|
||||
|
||||
@@ -411,7 +413,7 @@
|
||||
@@ -411,7 +413,7 @@ match(const struct sk_buff *skbin,
|
||||
const struct xt_layer7_info * info = matchinfo;
|
||||
enum ip_conntrack_info master_ctinfo, ctinfo;
|
||||
struct nf_conn *master_conntrack, *conntrack;
|
||||
@ -70,7 +70,7 @@
|
||||
unsigned int pattern_result, appdatalen;
|
||||
regexp * comppattern;
|
||||
|
||||
@@ -439,8 +441,8 @@
|
||||
@@ -439,8 +441,8 @@ match(const struct sk_buff *skbin,
|
||||
master_conntrack = master_ct(master_conntrack);
|
||||
|
||||
/* if we've classified it or seen too many packets */
|
||||
@ -81,7 +81,7 @@
|
||||
|
||||
pattern_result = match_no_append(conntrack, master_conntrack,
|
||||
ctinfo, master_ctinfo, info);
|
||||
@@ -473,6 +475,25 @@
|
||||
@@ -473,6 +475,25 @@ match(const struct sk_buff *skbin,
|
||||
/* the return value gets checked later, when we're ready to use it */
|
||||
comppattern = compile_and_cache(info->pattern, info->protocol);
|
||||
|
||||
|
@ -893,7 +893,7 @@
|
||||
+
|
||||
--- a/net/ipv4/netfilter/Kconfig
|
||||
+++ b/net/ipv4/netfilter/Kconfig
|
||||
@@ -63,6 +63,12 @@
|
||||
@@ -63,6 +63,12 @@ config IP_NF_MATCH_IPRANGE
|
||||
|
||||
To compile it as a module, choose M here. If unsure, say N.
|
||||
|
||||
@ -908,7 +908,7 @@
|
||||
depends on IP_NF_IPTABLES
|
||||
--- a/net/ipv4/netfilter/Makefile
|
||||
+++ b/net/ipv4/netfilter/Makefile
|
||||
@@ -50,6 +50,8 @@
|
||||
@@ -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
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
--- a/include/linux/netfilter_ipv4/Kbuild
|
||||
+++ b/include/linux/netfilter_ipv4/Kbuild
|
||||
@@ -45,3 +45,14 @@
|
||||
|
||||
@@ -45,3 +45,14 @@ header-y += ipt_ttl.h
|
||||
|
||||
unifdef-y += ip_queue.h
|
||||
unifdef-y += ip_tables.h
|
||||
+
|
||||
@ -7534,7 +7534,7 @@
|
||||
+module_exit(ipt_SET_fini);
|
||||
--- a/net/ipv4/netfilter/Kconfig
|
||||
+++ b/net/ipv4/netfilter/Kconfig
|
||||
@@ -408,5 +408,122 @@
|
||||
@@ -408,5 +408,122 @@ config IP_NF_ARP_MANGLE
|
||||
Allows altering the ARP packet payload: source and destination
|
||||
hardware and network addresses.
|
||||
|
||||
@ -7659,7 +7659,7 @@
|
||||
|
||||
--- a/net/ipv4/netfilter/Makefile
|
||||
+++ b/net/ipv4/netfilter/Makefile
|
||||
@@ -49,6 +49,7 @@
|
||||
@@ -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
|
||||
@ -7667,7 +7667,7 @@
|
||||
|
||||
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
|
||||
|
@ -204,7 +204,7 @@
|
||||
+}
|
||||
--- a/net/ipv4/netfilter/Kconfig
|
||||
+++ b/net/ipv4/netfilter/Kconfig
|
||||
@@ -78,6 +78,22 @@
|
||||
@@ -78,6 +78,22 @@ config IP_NF_MATCH_TOS
|
||||
|
||||
To compile it as a module, choose M here. If unsure, say N.
|
||||
|
||||
@ -229,7 +229,7 @@
|
||||
depends on IP_NF_IPTABLES
|
||||
--- a/net/ipv4/netfilter/Makefile
|
||||
+++ b/net/ipv4/netfilter/Makefile
|
||||
@@ -50,6 +50,7 @@
|
||||
@@ -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
|
||||
|
@ -412,7 +412,7 @@
|
||||
+MODULE_LICENSE("GPL");
|
||||
--- a/drivers/net/Kconfig
|
||||
+++ b/drivers/net/Kconfig
|
||||
@@ -112,6 +112,129 @@
|
||||
@@ -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,7 +544,7 @@
|
||||
select CRC32
|
||||
--- a/drivers/net/Makefile
|
||||
+++ b/drivers/net/Makefile
|
||||
@@ -139,6 +139,7 @@
|
||||
@@ -139,6 +139,7 @@ obj-$(CONFIG_SLHC) += slhc.o
|
||||
obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
|
||||
|
||||
obj-$(CONFIG_DUMMY) += dummy.o
|
||||
@ -588,7 +588,7 @@
|
||||
+#endif /* _IP6T_IMQ_H */
|
||||
--- a/include/linux/skbuff.h
|
||||
+++ b/include/linux/skbuff.h
|
||||
@@ -295,6 +295,10 @@
|
||||
@@ -295,6 +295,10 @@ struct sk_buff {
|
||||
struct nf_conntrack *nfct;
|
||||
struct sk_buff *nfct_reasm;
|
||||
#endif
|
||||
@ -599,7 +599,7 @@
|
||||
#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
|
||||
@ -622,7 +622,7 @@
|
||||
#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)) {
|
||||
@ -709,7 +709,7 @@
|
||||
+MODULE_LICENSE("GPL");
|
||||
--- a/net/ipv4/netfilter/Kconfig
|
||||
+++ b/net/ipv4/netfilter/Kconfig
|
||||
@@ -333,6 +333,17 @@
|
||||
@@ -333,6 +333,17 @@ config IP_NF_MANGLE
|
||||
|
||||
To compile it as a module, choose M here. If unsure, say N.
|
||||
|
||||
@ -729,7 +729,7 @@
|
||||
depends on IP_NF_MANGLE
|
||||
--- a/net/ipv4/netfilter/Makefile
|
||||
+++ b/net/ipv4/netfilter/Makefile
|
||||
@@ -58,6 +58,7 @@
|
||||
@@ -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
|
||||
@ -811,7 +811,7 @@
|
||||
+MODULE_LICENSE("GPL");
|
||||
--- a/net/ipv6/netfilter/Kconfig
|
||||
+++ b/net/ipv6/netfilter/Kconfig
|
||||
@@ -173,6 +173,15 @@
|
||||
@@ -173,6 +173,15 @@ config IP6_NF_MANGLE
|
||||
|
||||
To compile it as a module, choose M here. If unsure, say N.
|
||||
|
||||
@ -839,7 +839,7 @@
|
||||
|
||||
--- a/net/sched/sch_generic.c
|
||||
+++ b/net/sched/sch_generic.c
|
||||
@@ -176,6 +176,11 @@
|
||||
@@ -176,6 +176,11 @@ static inline int qdisc_restart(struct n
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -851,7 +851,7 @@
|
||||
void __qdisc_run(struct net_device *dev)
|
||||
{
|
||||
unsigned long start_time = jiffies;
|
||||
@@ -650,3 +655,4 @@
|
||||
@@ -650,3 +655,4 @@ EXPORT_SYMBOL(qdisc_destroy);
|
||||
EXPORT_SYMBOL(qdisc_reset);
|
||||
EXPORT_SYMBOL(qdisc_lock_tree);
|
||||
EXPORT_SYMBOL(qdisc_unlock_tree);
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/include/linux/netfilter/Kbuild
|
||||
+++ b/include/linux/netfilter/Kbuild
|
||||
@@ -3,6 +3,7 @@
|
||||
@@ -3,6 +3,7 @@ header-y += nf_conntrack_tuple_common.h
|
||||
header-y += nfnetlink_conntrack.h
|
||||
header-y += nfnetlink_log.h
|
||||
header-y += nfnetlink_queue.h
|
||||
@ -105,7 +105,7 @@
|
||||
+#define xt_request_find_match xt_request_find_match_lo
|
||||
--- a/net/netfilter/Kconfig
|
||||
+++ b/net/netfilter/Kconfig
|
||||
@@ -265,6 +265,14 @@
|
||||
@@ -265,6 +265,14 @@ config NETFILTER_XTABLES
|
||||
|
||||
# alphabetically ordered list of targets
|
||||
|
||||
@ -120,7 +120,7 @@
|
||||
config NETFILTER_XT_TARGET_CLASSIFY
|
||||
tristate '"CLASSIFY" target support'
|
||||
depends on NETFILTER_XTABLES
|
||||
@@ -292,6 +300,14 @@
|
||||
@@ -292,6 +300,14 @@ config NETFILTER_XT_TARGET_CONNMARK
|
||||
<file:Documentation/kbuild/modules.txt>. The module will be called
|
||||
ipt_CONNMARK.ko. If unsure, say `N'.
|
||||
|
||||
@ -135,7 +135,7 @@
|
||||
config NETFILTER_XT_TARGET_DSCP
|
||||
tristate '"DSCP" target support'
|
||||
depends on NETFILTER_XTABLES
|
||||
@@ -556,6 +572,14 @@
|
||||
@@ -556,6 +572,14 @@ config NETFILTER_XT_MATCH_POLICY
|
||||
|
||||
To compile it as a module, choose M here. If unsure, say N.
|
||||
|
||||
@ -152,7 +152,7 @@
|
||||
depends on NETFILTER_XTABLES
|
||||
--- a/net/netfilter/Makefile
|
||||
+++ b/net/netfilter/Makefile
|
||||
@@ -49,6 +49,8 @@
|
||||
@@ -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
|
||||
obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.o
|
||||
@ -161,7 +161,7 @@
|
||||
|
||||
# matches
|
||||
obj-$(CONFIG_NETFILTER_XT_MATCH_COMMENT) += xt_comment.o
|
||||
@@ -79,3 +81,4 @@
|
||||
@@ -79,3 +81,4 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_STRING)
|
||||
obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
|
||||
obj-$(CONFIG_NETFILTER_XT_MATCH_TIME) += xt_time.o
|
||||
obj-$(CONFIG_NETFILTER_XT_MATCH_U32) += xt_u32.o
|
||||
@ -843,7 +843,7 @@
|
||||
+MODULE_ALIAS("ipt_portscan");
|
||||
--- a/drivers/char/random.c
|
||||
+++ b/drivers/char/random.c
|
||||
@@ -1564,6 +1564,8 @@
|
||||
@@ -1564,6 +1564,8 @@ __u32 secure_tcp_sequence_number(__be32
|
||||
return seq;
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/net/netfilter/Kconfig
|
||||
+++ b/net/netfilter/Kconfig
|
||||
@@ -401,6 +401,23 @@
|
||||
@@ -401,6 +401,23 @@ config NETFILTER_XT_TARGET_CONNSECMARK
|
||||
|
||||
To compile it as a module, choose M here. If unsure, say N.
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
depends on NETFILTER_XTABLES && (IPV6 || IPV6=n)
|
||||
--- a/net/netfilter/Makefile
|
||||
+++ b/net/netfilter/Makefile
|
||||
@@ -47,6 +47,7 @@
|
||||
@@ -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_SECMARK) += xt_SECMARK.o
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/net/netfilter/Kconfig
|
||||
+++ b/net/netfilter/Kconfig
|
||||
@@ -143,7 +143,7 @@
|
||||
@@ -143,7 +143,7 @@ config NF_CONNTRACK_FTP
|
||||
|
||||
config NF_CONNTRACK_H323
|
||||
tristate "H.323 protocol support (EXPERIMENTAL)"
|
||||
@ -9,7 +9,7 @@
|
||||
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
|
||||
@@ -420,7 +420,7 @@
|
||||
@@ -420,7 +420,7 @@ config NETFILTER_XT_TARGET_TARPIT
|
||||
|
||||
config NETFILTER_XT_TARGET_TCPMSS
|
||||
tristate '"TCPMSS" target support'
|
||||
|
@ -294,7 +294,7 @@
|
||||
+#endif /* _NETFILTER_MIME_H */
|
||||
--- a/net/ipv4/netfilter/Makefile
|
||||
+++ b/net/ipv4/netfilter/Makefile
|
||||
@@ -23,6 +23,7 @@
|
||||
@@ -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
|
||||
@ -304,7 +304,7 @@
|
||||
obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
|
||||
--- a/net/netfilter/Kconfig
|
||||
+++ b/net/netfilter/Kconfig
|
||||
@@ -249,6 +249,16 @@
|
||||
@@ -249,6 +249,16 @@ config NF_CONNTRACK_TFTP
|
||||
|
||||
To compile it as a module, choose M here. If unsure, say N.
|
||||
|
||||
@ -323,7 +323,7 @@
|
||||
depends on EXPERIMENTAL && NF_CONNTRACK && NETFILTER_NETLINK
|
||||
--- a/net/netfilter/Makefile
|
||||
+++ b/net/netfilter/Makefile
|
||||
@@ -33,6 +33,7 @@
|
||||
@@ -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
|
||||
@ -333,7 +333,7 @@
|
||||
obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
|
||||
--- a/net/ipv4/netfilter/Kconfig
|
||||
+++ b/net/ipv4/netfilter/Kconfig
|
||||
@@ -296,6 +296,11 @@
|
||||
@@ -296,6 +296,11 @@ config NF_NAT_IRC
|
||||
depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
|
||||
default NF_NAT && NF_CONNTRACK_IRC
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/include/linux/pkt_sched.h
|
||||
+++ b/include/linux/pkt_sched.h
|
||||
@@ -155,8 +155,37 @@
|
||||
@@ -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.
|
||||
@ -40,7 +40,7 @@
|
||||
enum
|
||||
--- a/net/sched/Kconfig
|
||||
+++ b/net/sched/Kconfig
|
||||
@@ -139,6 +139,37 @@
|
||||
@@ -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,7 +80,7 @@
|
||||
---help---
|
||||
--- a/net/sched/Makefile
|
||||
+++ b/net/sched/Makefile
|
||||
@@ -23,6 +23,7 @@
|
||||
@@ -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
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/Makefile
|
||||
+++ b/arch/mips/Makefile
|
||||
@@ -576,6 +576,9 @@
|
||||
@@ -576,6 +576,9 @@ core-$(CONFIG_TOSHIBA_RBTX4938) += arch/
|
||||
cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
|
||||
load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/fs/jffs2/build.c
|
||||
+++ b/fs/jffs2/build.c
|
||||
@@ -105,6 +105,17 @@
|
||||
@@ -105,6 +105,17 @@ static int jffs2_build_filesystem(struct
|
||||
dbg_fsbuild("scanned flash completely\n");
|
||||
jffs2_dbg_dump_block_lists_nolock(c);
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
/* Now scan the directory tree, increasing nlink according to every dirent found. */
|
||||
--- a/fs/jffs2/scan.c
|
||||
+++ b/fs/jffs2/scan.c
|
||||
@@ -142,9 +142,12 @@
|
||||
@@ -142,9 +142,12 @@ int jffs2_scan_medium(struct jffs2_sb_in
|
||||
|
||||
/* reset summary info for next eraseblock scan */
|
||||
jffs2_sum_reset_collected(s);
|
||||
@ -36,7 +36,7 @@
|
||||
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
@@ -545,6 +548,17 @@
|
||||
@@ -545,6 +548,17 @@ static int jffs2_scan_eraseblock (struct
|
||||
return err;
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/r8169.c
|
||||
+++ b/drivers/net/r8169.c
|
||||
@@ -1537,7 +1537,7 @@
|
||||
@@ -1537,7 +1537,7 @@ static const struct rtl_cfg_info {
|
||||
.hw_start = rtl_hw_start_8169,
|
||||
.region = 1,
|
||||
.align = 0,
|
||||
@ -9,7 +9,7 @@
|
||||
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
|
||||
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
|
||||
.msi = 0
|
||||
@@ -1546,7 +1546,7 @@
|
||||
@@ -1546,7 +1546,7 @@ static const struct rtl_cfg_info {
|
||||
.hw_start = rtl_hw_start_8168,
|
||||
.region = 2,
|
||||
.align = 8,
|
||||
@ -18,7 +18,7 @@
|
||||
TxErr | TxOK | RxOK | RxErr,
|
||||
.napi_event = TxErr | TxOK | RxOK | RxOverflow,
|
||||
.msi = RTL_FEATURE_MSI
|
||||
@@ -1555,7 +1555,7 @@
|
||||
@@ -1555,7 +1555,7 @@ static const struct rtl_cfg_info {
|
||||
.hw_start = rtl_hw_start_8101,
|
||||
.region = 2,
|
||||
.align = 8,
|
||||
@ -27,7 +27,7 @@
|
||||
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
|
||||
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
|
||||
.msi = RTL_FEATURE_MSI
|
||||
@@ -2903,10 +2903,12 @@
|
||||
@@ -2903,10 +2903,12 @@ static irqreturn_t rtl8169_interrupt(int
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/fs/Kconfig
|
||||
+++ b/fs/Kconfig
|
||||
@@ -468,6 +468,9 @@
|
||||
@@ -468,6 +468,9 @@ config OCFS2_DEBUG_FS
|
||||
this option for debugging only as it is likely to decrease
|
||||
performance of the filesystem.
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
help
|
||||
--- a/fs/Makefile
|
||||
+++ b/fs/Makefile
|
||||
@@ -76,6 +76,7 @@
|
||||
@@ -76,6 +76,7 @@ obj-$(CONFIG_SQUASHFS) += squashfs/
|
||||
obj-y += ramfs/
|
||||
obj-$(CONFIG_HUGETLBFS) += hugetlbfs/
|
||||
obj-$(CONFIG_CODA_FS) += coda/
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/lib/kobject_uevent.c
|
||||
+++ b/lib/kobject_uevent.c
|
||||
@@ -27,7 +27,8 @@
|
||||
@@ -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 +10,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 +29,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,6 +1,6 @@
|
||||
--- a/sound/core/Kconfig
|
||||
+++ b/sound/core/Kconfig
|
||||
@@ -9,7 +9,7 @@
|
||||
@@ -9,7 +9,7 @@ config SND_PCM
|
||||
depends on SND
|
||||
|
||||
config SND_HWDEP
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/drivers/leds/Kconfig
|
||||
+++ b/drivers/leds/Kconfig
|
||||
@@ -146,4 +146,8 @@
|
||||
@@ -146,4 +146,8 @@ config LEDS_TRIGGER_HEARTBEAT
|
||||
load average.
|
||||
If unsure, say Y.
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
endif # NEW_LEDS
|
||||
--- a/drivers/leds/Makefile
|
||||
+++ b/drivers/leds/Makefile
|
||||
@@ -24,3 +24,4 @@
|
||||
@@ -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,6 +1,6 @@
|
||||
--- a/drivers/leds/Kconfig
|
||||
+++ b/drivers/leds/Kconfig
|
||||
@@ -81,6 +81,12 @@
|
||||
@@ -81,6 +81,12 @@ config LEDS_WRAP
|
||||
help
|
||||
This option enables support for the PCEngines WRAP programmable LEDs.
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
depends on LEDS_CLASS && ARCH_H1940
|
||||
--- a/drivers/leds/Makefile
|
||||
+++ b/drivers/leds/Makefile
|
||||
@@ -14,6 +14,7 @@
|
||||
@@ -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
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/drivers/leds/Kconfig
|
||||
+++ b/drivers/leds/Kconfig
|
||||
@@ -156,4 +156,11 @@
|
||||
@@ -156,4 +156,11 @@ config LEDS_TRIGGER_MORSE
|
||||
tristate "LED Morse Trigger"
|
||||
depends on LEDS_TRIGGERS
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
endif # NEW_LEDS
|
||||
--- a/drivers/leds/Makefile
|
||||
+++ b/drivers/leds/Makefile
|
||||
@@ -26,3 +26,4 @@
|
||||
@@ -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,6 +1,6 @@
|
||||
--- a/drivers/input/misc/Kconfig
|
||||
+++ b/drivers/input/misc/Kconfig
|
||||
@@ -183,4 +183,20 @@
|
||||
@@ -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.
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
endif
|
||||
--- a/drivers/input/misc/Makefile
|
||||
+++ b/drivers/input/misc/Makefile
|
||||
@@ -18,3 +18,4 @@
|
||||
@@ -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,6 +1,6 @@
|
||||
--- a/drivers/char/Kconfig
|
||||
+++ b/drivers/char/Kconfig
|
||||
@@ -946,6 +946,13 @@
|
||||
@@ -946,6 +946,13 @@ config CS5535_GPIO
|
||||
|
||||
If compiled as a module, it will be called cs5535_gpio.
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
depends on CPU_VR41XX
|
||||
--- a/drivers/char/Makefile
|
||||
+++ b/drivers/char/Makefile
|
||||
@@ -93,6 +93,7 @@
|
||||
@@ -93,6 +93,7 @@ obj-$(CONFIG_SCx200_GPIO) += scx200_gpio
|
||||
obj-$(CONFIG_PC8736x_GPIO) += pc8736x_gpio.o
|
||||
obj-$(CONFIG_NSC_GPIO) += nsc_gpio.o
|
||||
obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio.o
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/fs/Kconfig
|
||||
+++ b/fs/Kconfig
|
||||
@@ -420,6 +420,7 @@
|
||||
@@ -420,6 +420,7 @@ config FS_POSIX_ACL
|
||||
|
||||
source "fs/xfs/Kconfig"
|
||||
source "fs/gfs2/Kconfig"
|
||||
@ -10,7 +10,7 @@
|
||||
tristate "OCFS2 file system support"
|
||||
--- a/fs/Makefile
|
||||
+++ b/fs/Makefile
|
||||
@@ -120,3 +120,4 @@
|
||||
@@ -120,3 +120,4 @@ obj-$(CONFIG_HPPFS) += hppfs/
|
||||
obj-$(CONFIG_DEBUG_FS) += debugfs/
|
||||
obj-$(CONFIG_OCFS2_FS) += ocfs2/
|
||||
obj-$(CONFIG_GFS2_FS) += gfs2/
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/phy/phy.c
|
||||
+++ b/drivers/net/phy/phy.c
|
||||
@@ -345,6 +345,50 @@
|
||||
@@ -345,6 +345,50 @@ int phy_ethtool_gset(struct phy_device *
|
||||
}
|
||||
EXPORT_SYMBOL(phy_ethtool_gset);
|
||||
|
||||
@ -53,7 +53,7 @@
|
||||
* @phydev: the phy_device struct
|
||||
--- a/include/linux/phy.h
|
||||
+++ b/include/linux/phy.h
|
||||
@@ -398,6 +398,7 @@
|
||||
@@ -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);
|
||||
|
@ -37,7 +37,7 @@
|
||||
};
|
||||
|
||||
/*
|
||||
@@ -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 {
|
||||
@ -51,7 +51,7 @@
|
||||
} spec;
|
||||
};
|
||||
|
||||
@@ -68,16 +78,16 @@
|
||||
@@ -68,16 +78,16 @@ struct br2684_if_spec {
|
||||
* is per-backend specific
|
||||
*/
|
||||
struct atm_backend_br2684 {
|
||||
@ -77,7 +77,7 @@
|
||||
};
|
||||
|
||||
/*
|
||||
@@ -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 {
|
||||
@ -88,7 +88,7 @@
|
||||
};
|
||||
|
||||
struct br2684_filter_set {
|
||||
@@ -95,7 +105,13 @@
|
||||
@@ -95,7 +105,13 @@ struct br2684_filter_set {
|
||||
struct br2684_filter filter;
|
||||
};
|
||||
|
||||
@ -119,7 +119,7 @@
|
||||
|
||||
#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
|
||||
|
||||
@ -162,7 +162,7 @@
|
||||
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;
|
||||
@ -174,7 +174,7 @@
|
||||
};
|
||||
|
||||
/*
|
||||
@@ -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)
|
||||
{
|
||||
@ -183,7 +183,7 @@
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
@ -192,7 +192,7 @@
|
||||
}
|
||||
|
||||
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,
|
||||
@ -205,7 +205,7 @@
|
||||
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;
|
||||
}
|
||||
@ -264,7 +264,7 @@
|
||||
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,
|
||||
@ -277,7 +277,7 @@
|
||||
}
|
||||
|
||||
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
|
||||
@ -292,7 +292,7 @@
|
||||
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;
|
||||
}
|
||||
|
||||
@ -306,7 +306,7 @@
|
||||
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. */
|
||||
@ -315,7 +315,7 @@
|
||||
{
|
||||
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
|
||||
@ -331,7 +331,7 @@
|
||||
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)
|
||||
@ -352,7 +352,7 @@
|
||||
*/
|
||||
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);
|
||||
@ -360,7 +360,7 @@
|
||||
|
||||
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) {
|
||||
@ -434,7 +434,7 @@
|
||||
#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);
|
||||
}
|
||||
|
||||
@ -451,7 +451,7 @@
|
||||
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
|
||||
@ -460,7 +460,7 @@
|
||||
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 !=
|
||||
@ -480,7 +480,7 @@
|
||||
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;
|
||||
@ -489,7 +489,7 @@
|
||||
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;
|
||||
@ -498,7 +498,7 @@
|
||||
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);
|
||||
}
|
||||
|
||||
@ -553,7 +553,7 @@
|
||||
if (!netdev)
|
||||
return -ENOMEM;
|
||||
|
||||
@@ -516,6 +608,7 @@
|
||||
@@ -516,6 +608,7 @@ static int br2684_create(void __user *ar
|
||||
}
|
||||
|
||||
write_lock_irq(&devs_lock);
|
||||
@ -561,7 +561,7 @@
|
||||
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,
|
||||
@ -582,7 +582,7 @@
|
||||
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);
|
||||
@ -590,7 +590,7 @@
|
||||
#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);
|
||||
@ -598,7 +598,7 @@
|
||||
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 = {
|
||||
@ -629,7 +629,7 @@
|
||||
{
|
||||
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,
|
||||
@ -638,7 +638,7 @@
|
||||
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) {
|
||||
@ -670,7 +670,7 @@
|
||||
#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,
|
||||
@ -683,7 +683,7 @@
|
||||
};
|
||||
|
||||
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 = {
|
||||
@ -721,7 +721,7 @@
|
||||
}
|
||||
|
||||
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,6 +1,6 @@
|
||||
--- a/drivers/usb/serial/usb-serial.c
|
||||
+++ b/drivers/usb/serial/usb-serial.c
|
||||
@@ -58,6 +58,7 @@
|
||||
@@ -58,6 +58,7 @@ static struct usb_driver usb_serial_driv
|
||||
drivers depend on it.
|
||||
*/
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
static int debug;
|
||||
static struct usb_serial *serial_table[SERIAL_TTY_MINORS]; /* initially all NULL */
|
||||
static DEFINE_MUTEX(table_lock);
|
||||
@@ -894,7 +895,7 @@
|
||||
@@ -894,7 +895,7 @@ int usb_serial_probe(struct usb_interfac
|
||||
dev_err(&interface->dev, "No free urbs available\n");
|
||||
goto probe_error;
|
||||
}
|
||||
@ -17,7 +17,7 @@
|
||||
port->bulk_in_size = buffer_size;
|
||||
port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
|
||||
port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL);
|
||||
@@ -1306,3 +1307,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,6 +1,6 @@
|
||||
--- a/init/main.c
|
||||
+++ b/init/main.c
|
||||
@@ -773,7 +773,7 @@
|
||||
@@ -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,6 +1,6 @@
|
||||
--- a/fs/jffs2/erase.c
|
||||
+++ b/fs/jffs2/erase.c
|
||||
@@ -35,6 +35,8 @@
|
||||
@@ -35,6 +35,8 @@ static void jffs2_erase_block(struct jff
|
||||
{
|
||||
int ret;
|
||||
uint32_t bad_offset;
|
||||
@ -9,7 +9,7 @@
|
||||
#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));
|
||||
|
@ -11,7 +11,7 @@
|
||||
#include <linux/types.h>
|
||||
|
||||
#ifdef __KERNEL__
|
||||
@@ -231,4 +235,6 @@
|
||||
@@ -231,4 +235,6 @@ struct itimerval {
|
||||
*/
|
||||
#define TIMER_ABSTIME 0x01
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#define DECLARE_BITMAP(name,bits) \
|
||||
@@ -161,6 +169,8 @@
|
||||
@@ -161,6 +169,8 @@ typedef unsigned long blkcnt_t;
|
||||
|
||||
#endif /* __KERNEL_STRICT_NAMES */
|
||||
|
||||
|
@ -62,7 +62,7 @@
|
||||
|
||||
--- a/scripts/kconfig/Makefile
|
||||
+++ b/scripts/kconfig/Makefile
|
||||
@@ -90,6 +90,9 @@
|
||||
@@ -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))
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/wireless/hostap/hostap_ap.c
|
||||
+++ b/drivers/net/wireless/hostap/hostap_ap.c
|
||||
@@ -2358,13 +2358,13 @@
|
||||
@@ -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)
|
||||
@ -20,7 +20,7 @@
|
||||
qual[count].updated = sta->last_rx_updated;
|
||||
|
||||
sta->last_rx_updated = IW_QUAL_DBM;
|
||||
@@ -2429,13 +2429,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)
|
||||
@ -54,7 +54,7 @@
|
||||
#endif /* HOSTAP_CONFIG_H */
|
||||
--- a/drivers/net/wireless/hostap/hostap.h
|
||||
+++ b/drivers/net/wireless/hostap/hostap.h
|
||||
@@ -89,6 +89,7 @@
|
||||
@@ -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);
|
||||
@ -64,7 +64,7 @@
|
||||
#endif /* HOSTAP_H */
|
||||
--- a/drivers/net/wireless/hostap/hostap_hw.c
|
||||
+++ b/drivers/net/wireless/hostap/hostap_hw.c
|
||||
@@ -933,6 +933,7 @@
|
||||
@@ -933,6 +933,7 @@ static int hfa384x_set_rid(struct net_de
|
||||
prism2_hw_reset(dev);
|
||||
}
|
||||
|
||||
@ -74,7 +74,7 @@
|
||||
|
||||
--- a/drivers/net/wireless/hostap/hostap_info.c
|
||||
+++ b/drivers/net/wireless/hostap/hostap_info.c
|
||||
@@ -433,6 +433,11 @@
|
||||
@@ -433,6 +433,11 @@ static void handle_info_queue_linkstatus
|
||||
}
|
||||
|
||||
/* Get BSSID if we have a valid AP address */
|
||||
@ -88,7 +88,7 @@
|
||||
netif_carrier_on(local->ddev);
|
||||
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
|
||||
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
|
||||
@@ -1501,23 +1501,20 @@
|
||||
@@ -1501,23 +1501,20 @@ static int prism2_txpower_hfa386x_to_dBm
|
||||
val = 255;
|
||||
|
||||
tmp = val;
|
||||
@ -116,7 +116,7 @@
|
||||
|
||||
return (unsigned char) tmp;
|
||||
}
|
||||
@@ -4077,3 +4074,35 @@
|
||||
@@ -4077,3 +4074,35 @@ int hostap_ioctl(struct net_device *dev,
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/include/linux/stddef.h
|
||||
+++ b/include/linux/stddef.h
|
||||
@@ -16,6 +16,7 @@
|
||||
@@ -16,6 +16,7 @@ enum {
|
||||
false = 0,
|
||||
true = 1
|
||||
};
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
#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,6 +1,6 @@
|
||||
--- a/scripts/gen_initramfs_list.sh
|
||||
+++ b/scripts/gen_initramfs_list.sh
|
||||
@@ -125,7 +125,7 @@
|
||||
@@ -125,7 +125,7 @@ parse() {
|
||||
str="${ftype} ${name} ${location} ${str}"
|
||||
;;
|
||||
"nod")
|
||||
@ -9,7 +9,7 @@
|
||||
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,6 +1,6 @@
|
||||
--- a/drivers/spi/Kconfig
|
||||
+++ b/drivers/spi/Kconfig
|
||||
@@ -100,6 +100,11 @@
|
||||
@@ -100,6 +100,11 @@ config SPI_BUTTERFLY
|
||||
inexpensive battery powered microcontroller evaluation board.
|
||||
This same cable can be used to flash new firmware.
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
|
||||
--- a/drivers/spi/Makefile
|
||||
+++ b/drivers/spi/Makefile
|
||||
@@ -16,6 +16,7 @@
|
||||
@@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_BFIN) += spi_bfin5xx.
|
||||
obj-$(CONFIG_SPI_BITBANG) += spi_bitbang.o
|
||||
obj-$(CONFIG_SPI_AU1550) += au1550_spi.o
|
||||
obj-$(CONFIG_SPI_BUTTERFLY) += spi_butterfly.o
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/drivers/w1/masters/Kconfig
|
||||
+++ b/drivers/w1/masters/Kconfig
|
||||
@@ -42,5 +42,15 @@
|
||||
@@ -42,5 +42,15 @@ config W1_MASTER_DS1WM
|
||||
in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like
|
||||
hx4700.
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
--- a/drivers/w1/masters/Makefile
|
||||
+++ b/drivers/w1/masters/Makefile
|
||||
@@ -6,3 +6,4 @@
|
||||
@@ -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
|
||||
|
@ -32,7 +32,7 @@ and didn't make it with the ppc32 equivalent. Thanks.
|
||||
---
|
||||
--- a/include/asm-ppc/io.h
|
||||
+++ b/include/asm-ppc/io.h
|
||||
@@ -413,11 +413,21 @@
|
||||
@@ -413,11 +413,21 @@ static inline unsigned int ioread16(void
|
||||
return readw(addr);
|
||||
}
|
||||
|
||||
@ -54,7 +54,7 @@ and didn't make it with the ppc32 equivalent. Thanks.
|
||||
static inline void iowrite8(u8 val, void __iomem *addr)
|
||||
{
|
||||
writeb(val, addr);
|
||||
@@ -428,11 +438,21 @@
|
||||
@@ -428,11 +438,21 @@ static inline void iowrite16(u16 val, vo
|
||||
writew(val, addr);
|
||||
}
|
||||
|
||||
|
@ -9,7 +9,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 +18,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 +34,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 +42,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 +50,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 +59,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 +68,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 +77,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,6 @@
|
||||
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
|
||||
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
|
||||
@@ -277,7 +277,7 @@
|
||||
@@ -277,7 +277,7 @@ read_pri_intelext(struct map_info *map,
|
||||
return NULL;
|
||||
|
||||
if (extp->MajorVersion != '1' ||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- linux-2.6.24.7/crypto/Kconfig 2008-05-07 01:22:34.000000000 +0200
|
||||
+++ linux-2.6.24.7.new/crypto/Kconfig 2009-01-06 12:14:43.000000000 +0100
|
||||
@@ -20,7 +20,7 @@
|
||||
--- a/crypto/Kconfig
|
||||
+++ b/crypto/Kconfig
|
||||
@@ -20,7 +20,7 @@ menuconfig CRYPTO
|
||||
if CRYPTO
|
||||
|
||||
config CRYPTO_ALGAPI
|
||||
@ -9,7 +9,7 @@
|
||||
help
|
||||
This option provides the API for cryptographic algorithms.
|
||||
|
||||
@@ -29,15 +29,15 @@
|
||||
@@ -29,15 +29,15 @@ config CRYPTO_ABLKCIPHER
|
||||
select CRYPTO_BLKCIPHER
|
||||
|
||||
config CRYPTO_AEAD
|
||||
|
Loading…
Reference in New Issue
Block a user