kernel: remove imq support, refresh patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25641 3c298f89-4303-0410-b956-a3cf2f4a3e73
2024-11-23 21:27:31 +02:00 · 2011-02-21 02:06:51 +00:00 · 2011-02-21 02:06:51 +00:00 · 55664ae04b
commit 55664ae04b
parent 5e317a6c87
156 changed files with 404 additions and 11052 deletions
--- a/include/netfilter.mk
+++ b/include/netfilter.mk
@ -107,12 +107,6 @@ $(eval $(call nf_add,IPT_FILTER,CONFIG_IP_NF_MATCH_STRING, $(P_V4)ipt_string))
 $(eval $(call nf_add,IPT_FILTER,CONFIG_NETFILTER_XT_MATCH_STRING, $(P_XT)xt_string))


-# imq
-
-$(eval $(call nf_add,IPT_IMQ,CONFIG_IP_NF_TARGET_IMQ, $(P_V4)ipt_IMQ))
-$(eval $(call nf_add,IPT_IMQ,CONFIG_NETFILTER_XT_TARGET_IMQ, $(P_XT)xt_IMQ))
-
-
 # ipopt

 $(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_TARGET_DSCP, $(P_V4)ipt_DSCP))
@ -200,7 +194,6 @@ $(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MATCH_OWNER, $(P_V6)ip6t_owner))
 $(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MATCH_OPTS, $(P_V6)ip6t_hbh))
 $(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MATCH_RT, $(P_V6)ip6t_rt))

-$(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_TARGET_IMQ, $(P_V6)ip6t_IMQ))
 $(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_TARGET_LOG, $(P_V6)ip6t_LOG))
 $(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_TARGET_REJECT, $(P_V6)ip6t_REJECT))
 $(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_TARGET_ROUTE, $(P_V6)ip6t_ROUTE))
@ -331,7 +324,6 @@ IPT_BUILTIN += $(IPT_CONNTRACK-y)
 IPT_BUILTIN += $(IPT_CONNTRACK_EXTRA-y)
 IPT_BUILTIN += $(IPT_EXTRA-y)
 IPT_BUILTIN += $(IPT_FILTER-y)
-IPT_BUILTIN += $(IPT_IMQ-y)
 IPT_BUILTIN += $(IPT_IPOPT-y)
 IPT_BUILTIN += $(IPT_IPRANGE-y)
 IPT_BUILTIN += $(IPT_IPSEC-y)
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@ -228,30 +228,6 @@ endef
 $(eval $(call KernelPackage,ipt-nathelper-extra))


-define KernelPackage/ipt-imq
-  TITLE:=Intermediate Queueing support
-  KCONFIG:= \
-	CONFIG_IMQ \
-	CONFIG_IMQ_BEHAVIOR_BA=y \
-	CONFIG_IMQ_NUM_DEVS=2 \
-	CONFIG_NETFILTER_XT_TARGET_IMQ
-  FILES:= \
-	$(LINUX_DIR)/drivers/net/imq.ko \
-	$(foreach mod,$(IPT_IMQ-m),$(LINUX_DIR)/net/$(mod).ko)
-  AUTOLOAD:=$(call AutoLoad,46,$(notdir \
-	imq \
-	$(IPT_IMQ-m) \
-  ))
-  $(call AddDepends/ipt)
-endef
-
-define KernelPackage/ipt-imq/description
- Kernel support for Intermediate Queueing devices
-endef
-
-$(eval $(call KernelPackage,ipt-imq))
-
-
 define KernelPackage/ipt-queue
  TITLE:=Module for user-space packet queueing
  KCONFIG:=$(KCONFIG_IPT_QUEUE)
--- a/target/linux/ar71xx/Makefile
+++ b/target/linux/ar71xx/Makefile
@ -13,7 +13,7 @@ FEATURES:=squashfs jffs2 targz
 CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time
 SUBTARGETS:=generic nand

-LINUX_VERSION:=2.6.32.29
+LINUX_VERSION:=2.6.37.1

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/ar71xx/patches-2.6.36/003-ar71xx_usb_host.patch
+++ b/target/linux/ar71xx/patches-2.6.36/003-ar71xx_usb_host.patch
@ -30,7 +30,7 @@
 	depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
 --- a/drivers/usb/host/ehci-hcd.c
 +++ b/drivers/usb/host/ehci-hcd.c
-@@ -1197,6 +1197,11 @@ MODULE_LICENSE ("GPL");
+@@ -1210,6 +1210,11 @@ MODULE_LICENSE ("GPL");
 #define	PLATFORM_DRIVER		ehci_atmel_driver
 #endif
 
--- a/target/linux/ar71xx/patches-2.6.36/005-ar71xx_mac_driver.patch
+++ b/target/linux/ar71xx/patches-2.6.36/005-ar71xx_mac_driver.patch
@ -1,6 +1,6 @@
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig
-@@ -2168,6 +2168,8 @@ config ACENIC_OMIT_TIGON_I
+@@ -2045,6 +2045,8 @@ config ACENIC_OMIT_TIGON_I
 
 	  The safe and default value for this is N.
 
--- a/target/linux/ar71xx/patches-2.6.36/102-mtd_m25p80_add_myloader_parser.patch
+++ b/target/linux/ar71xx/patches-2.6.36/102-mtd_m25p80_add_myloader_parser.patch
@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -933,6 +933,16 @@ static int __devinit m25p_probe(struct s
+@@ -929,6 +929,16 @@ static int __devinit m25p_probe(struct s
 					part_probes, &parts, 0);
 		}
 
--- a/target/linux/ar71xx/patches-2.6.36/104-mtd_m25p80_add_redboot_parser.patch
+++ b/target/linux/ar71xx/patches-2.6.36/104-mtd_m25p80_add_redboot_parser.patch
@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -943,6 +943,15 @@ static int __devinit m25p_probe(struct s
+@@ -939,6 +939,15 @@ static int __devinit m25p_probe(struct s
 		}
 #endif
 
--- a/target/linux/ar71xx/patches-2.6.36/107-mtd-SST39VF6401B-support.patch
+++ b/target/linux/ar71xx/patches-2.6.36/107-mtd-SST39VF6401B-support.patch
@ -1,6 +1,6 @@
 --- a/drivers/mtd/chips/jedec_probe.c
 +++ b/drivers/mtd/chips/jedec_probe.c
-@@ -148,6 +148,7 @@
+@@ -149,6 +149,7 @@
 #define SST39LF160	0x2782
 #define SST39VF1601	0x234b
 #define SST39VF3201	0x235b
@ -8,7 +8,7 @@
 #define SST39WF1601	0x274b
 #define SST39WF1602	0x274a
 #define SST39LF512	0x00D4
-@@ -1568,6 +1569,18 @@ static const struct amd_flash_info jedec
+@@ -1582,6 +1583,18 @@ static const struct amd_flash_info jedec
 			ERASEINFO(0x10000,64),
 		}
 	}, {
--- a/target/linux/ar71xx/patches-2.6.36/108-mtd_fix_cfi_cmdset_0002_status_check.patch
+++ b/target/linux/ar71xx/patches-2.6.36/108-mtd_fix_cfi_cmdset_0002_status_check.patch
@ -1,6 +1,6 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -1218,8 +1218,8 @@ static int __xipram do_write_oneword(str
+@@ -1215,8 +1215,8 @@ static int __xipram do_write_oneword(str
 			break;
 		}
 
@ -11,7 +11,7 @@
 
 		/* Latency issues. Drop the lock, wait a while and retry */
 		UDELAY(map, chip, adr, 1);
-@@ -1235,6 +1235,8 @@ static int __xipram do_write_oneword(str
+@@ -1232,6 +1232,8 @@ static int __xipram do_write_oneword(str
 
 		ret = -EIO;
 	}
@ -20,7 +20,7 @@
 	xip_enable(map, chip, adr);
  op_done:
 	chip->state = FL_READY;
-@@ -1581,7 +1583,6 @@ static int cfi_amdstd_write_buffers(stru
+@@ -1578,7 +1580,6 @@ static int cfi_amdstd_write_buffers(stru
 	return 0;
 }
 
@ -28,7 +28,7 @@
 /*
  * Handle devices with one erase region, that only implement
  * the chip erase command.
-@@ -1645,8 +1646,8 @@ static int __xipram do_erase_chip(struct
+@@ -1642,8 +1643,8 @@ static int __xipram do_erase_chip(struct
 			chip->erase_suspended = 0;
 		}
 
@ -39,7 +39,7 @@
 
 		if (time_after(jiffies, timeo)) {
 			printk(KERN_WARNING "MTD %s(): software timeout\n",
-@@ -1666,6 +1667,7 @@ static int __xipram do_erase_chip(struct
+@@ -1663,6 +1664,7 @@ static int __xipram do_erase_chip(struct
 		ret = -EIO;
 	}
 
@ -47,7 +47,7 @@
 	chip->state = FL_READY;
 	xip_enable(map, chip, adr);
 	put_chip(map, chip, adr);
-@@ -1733,9 +1735,9 @@ static int __xipram do_erase_oneblock(st
+@@ -1730,9 +1732,9 @@ static int __xipram do_erase_oneblock(st
 			chip->erase_suspended = 0;
 		}
 
@ -59,7 +59,7 @@
 		}
 
 		if (time_after(jiffies, timeo)) {
-@@ -1757,6 +1759,7 @@ static int __xipram do_erase_oneblock(st
+@@ -1754,6 +1756,7 @@ static int __xipram do_erase_oneblock(st
 		ret = -EIO;
 	}
 
--- a/target/linux/ar71xx/patches-2.6.36/109-mtd-wrt160nl-trx-parser.patch
+++ b/target/linux/ar71xx/patches-2.6.36/109-mtd-wrt160nl-trx-parser.patch
@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -952,6 +952,16 @@ static int __devinit m25p_probe(struct s
+@@ -948,6 +948,16 @@ static int __devinit m25p_probe(struct s
 					part_probes, &parts, 0);
 		}
 #endif
--- a/target/linux/ar71xx/patches-2.6.36/110-usb-ehci-add-war-for-synopsys-hc-bug.patch
+++ b/target/linux/ar71xx/patches-2.6.36/110-usb-ehci-add-war-for-synopsys-hc-bug.patch
@ -12,9 +12,9 @@
 /* makes sure the async qh will become idle */
 --- a/drivers/usb/host/ehci.h
 +++ b/drivers/usb/host/ehci.h
-@@ -131,6 +131,7 @@ struct ehci_hcd {			/* one per controlle
- 	unsigned		need_io_watchdog:1;
+@@ -132,6 +132,7 @@ struct ehci_hcd {			/* one per controlle
 	unsigned		broken_periodic:1;
+ 	unsigned		amd_l1_fix:1;
 	unsigned		fs_i_thresh:1;	/* Intel iso scheduling */
 +	unsigned		has_synopsys_hc_bug:1; /* Synopsys HC */
 
--- a/target/linux/ar71xx/patches-2.6.36/111-mtd-cfi_cmdset_0002-force-word-write.patch
+++ b/target/linux/ar71xx/patches-2.6.36/111-mtd-cfi_cmdset_0002-force-word-write.patch
@ -35,7 +35,7 @@
 
 /* Atmel chips don't use the same PRI format as AMD chips */
 static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param)
-@@ -1392,6 +1396,7 @@ static int cfi_amdstd_write_words(struct
+@@ -1389,6 +1393,7 @@ static int cfi_amdstd_write_words(struct
 /*
  * FIXME: interleaved mode not tested, and probably not supported!
  */
@ -43,7 +43,7 @@
 static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
 				    unsigned long adr, const u_char *buf,
 				    int len)
-@@ -1503,7 +1508,6 @@ static int __xipram do_write_buffer(stru
+@@ -1500,7 +1505,6 @@ static int __xipram do_write_buffer(stru
 	return ret;
 }
 
@ -51,7 +51,7 @@
 static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
 				    size_t *retlen, const u_char *buf)
 {
-@@ -1582,6 +1586,7 @@ static int cfi_amdstd_write_buffers(stru
+@@ -1579,6 +1583,7 @@ static int cfi_amdstd_write_buffers(stru
 
 	return 0;
 }
--- a/target/linux/ar71xx/patches-2.6.36/400-2.6.35-fix-nand_scan_ident-options.patch
+++ b/target/linux/ar71xx/patches-2.6.36/400-2.6.35-fix-nand_scan_ident-options.patch
@ -1,6 +1,6 @@
 --- a/drivers/mtd/nand/rb4xx_nand.c
 +++ b/drivers/mtd/nand/rb4xx_nand.c
-@@ -220,7 +220,7 @@ static int __init rb4xx_nand_probe(struc
+@@ -223,7 +223,7 @@ static int __init rb4xx_nand_probe(struc
 
 	platform_set_drvdata(pdev, info);
 
--- a/target/linux/ar71xx/patches-2.6.37/001-ar71xx_core.patch
+++ b/target/linux/ar71xx/patches-2.6.37/001-ar71xx_core.patch
@ -16,7 +16,7 @@
 cflags-$(CONFIG_CPU_DADDI_WORKAROUNDS)	+= $(call cc-option,-mno-daddi,)
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -63,6 +63,23 @@ config AR7
+@@ -65,6 +65,23 @@ config AR7
 	  Support for the Texas Instruments AR7 System-on-a-Chip
 	  family: TNETD7100, 7200 and 7300.
 
@ -40,7 +40,7 @@
 config BCM47XX
 	bool "Broadcom BCM47XX based boards"
 	select CEVT_R4K
-@@ -715,6 +732,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
+@@ -717,6 +734,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
 endchoice
 
 source "arch/mips/alchemy/Kconfig"
--- a/target/linux/ar71xx/patches-2.6.37/003-ar71xx_usb_host.patch
+++ b/target/linux/ar71xx/patches-2.6.37/003-ar71xx_usb_host.patch
@ -30,7 +30,7 @@
 	depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
 --- a/drivers/usb/host/ehci-hcd.c
 +++ b/drivers/usb/host/ehci-hcd.c
-@@ -1216,6 +1216,11 @@ MODULE_LICENSE ("GPL");
+@@ -1229,6 +1229,11 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER		ehci_octeon_driver
 #endif
 
--- a/target/linux/ar71xx/patches-2.6.37/005-ar71xx_mac_driver.patch
+++ b/target/linux/ar71xx/patches-2.6.37/005-ar71xx_mac_driver.patch
@ -1,6 +1,6 @@
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig
-@@ -2191,6 +2191,8 @@ config ACENIC_OMIT_TIGON_I
+@@ -2068,6 +2068,8 @@ config ACENIC_OMIT_TIGON_I
 
 	  The safe and default value for this is N.
 
--- a/target/linux/ar71xx/patches-2.6.37/006-ar71xx_wdt_driver.patch
+++ b/target/linux/ar71xx/patches-2.6.37/006-ar71xx_wdt_driver.patch
@ -1,6 +1,6 @@
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig
-@@ -927,6 +927,13 @@ config BCM63XX_WDT
+@@ -930,6 +930,13 @@ config BCM63XX_WDT
 	  To compile this driver as a loadable module, choose M here.
 	  The module will be called bcm63xx_wdt.
 
--- a/target/linux/ar71xx/patches-2.6.37/102-mtd_m25p80_add_myloader_parser.patch
+++ b/target/linux/ar71xx/patches-2.6.37/102-mtd_m25p80_add_myloader_parser.patch
@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -937,6 +937,16 @@ static int __devinit m25p_probe(struct s
+@@ -933,6 +933,16 @@ static int __devinit m25p_probe(struct s
 					part_probes, &parts, 0);
 		}
 
--- a/target/linux/ar71xx/patches-2.6.37/104-mtd_m25p80_add_redboot_parser.patch
+++ b/target/linux/ar71xx/patches-2.6.37/104-mtd_m25p80_add_redboot_parser.patch
@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -947,6 +947,15 @@ static int __devinit m25p_probe(struct s
+@@ -943,6 +943,15 @@ static int __devinit m25p_probe(struct s
 		}
 #endif
 
--- a/target/linux/ar71xx/patches-2.6.37/107-mtd-SST39VF6401B-support.patch
+++ b/target/linux/ar71xx/patches-2.6.37/107-mtd-SST39VF6401B-support.patch
@ -1,6 +1,6 @@
 --- a/drivers/mtd/chips/jedec_probe.c
 +++ b/drivers/mtd/chips/jedec_probe.c
-@@ -148,6 +148,7 @@
+@@ -149,6 +149,7 @@
 #define SST39LF160	0x2782
 #define SST39VF1601	0x234b
 #define SST39VF3201	0x235b
@ -8,7 +8,7 @@
 #define SST39WF1601	0x274b
 #define SST39WF1602	0x274a
 #define SST39LF512	0x00D4
-@@ -1568,6 +1569,18 @@ static const struct amd_flash_info jedec
+@@ -1582,6 +1583,18 @@ static const struct amd_flash_info jedec
 			ERASEINFO(0x10000,64),
 		}
 	}, {
--- a/target/linux/ar71xx/patches-2.6.37/108-mtd_fix_cfi_cmdset_0002_status_check.patch
+++ b/target/linux/ar71xx/patches-2.6.37/108-mtd_fix_cfi_cmdset_0002_status_check.patch
@ -1,6 +1,6 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -1231,8 +1231,8 @@ static int __xipram do_write_oneword(str
+@@ -1228,8 +1228,8 @@ static int __xipram do_write_oneword(str
 			break;
 		}
 
@ -11,7 +11,7 @@
 
 		/* Latency issues. Drop the lock, wait a while and retry */
 		UDELAY(map, chip, adr, 1);
-@@ -1248,6 +1248,8 @@ static int __xipram do_write_oneword(str
+@@ -1245,6 +1245,8 @@ static int __xipram do_write_oneword(str
 
 		ret = -EIO;
 	}
@ -20,7 +20,7 @@
 	xip_enable(map, chip, adr);
  op_done:
 	chip->state = FL_READY;
-@@ -1579,7 +1581,6 @@ static int cfi_amdstd_write_buffers(stru
+@@ -1576,7 +1578,6 @@ static int cfi_amdstd_write_buffers(stru
 	return 0;
 }
 
@ -28,7 +28,7 @@
 /*
  * Handle devices with one erase region, that only implement
  * the chip erase command.
-@@ -1643,8 +1644,8 @@ static int __xipram do_erase_chip(struct
+@@ -1640,8 +1641,8 @@ static int __xipram do_erase_chip(struct
 			chip->erase_suspended = 0;
 		}
 
@ -39,7 +39,7 @@
 
 		if (time_after(jiffies, timeo)) {
 			printk(KERN_WARNING "MTD %s(): software timeout\n",
-@@ -1664,6 +1665,7 @@ static int __xipram do_erase_chip(struct
+@@ -1661,6 +1662,7 @@ static int __xipram do_erase_chip(struct
 		ret = -EIO;
 	}
 
@ -47,7 +47,7 @@
 	chip->state = FL_READY;
 	xip_enable(map, chip, adr);
 	put_chip(map, chip, adr);
-@@ -1731,9 +1733,9 @@ static int __xipram do_erase_oneblock(st
+@@ -1728,9 +1730,9 @@ static int __xipram do_erase_oneblock(st
 			chip->erase_suspended = 0;
 		}
 
@ -59,7 +59,7 @@
 		}
 
 		if (time_after(jiffies, timeo)) {
-@@ -1755,6 +1757,7 @@ static int __xipram do_erase_oneblock(st
+@@ -1752,6 +1754,7 @@ static int __xipram do_erase_oneblock(st
 		ret = -EIO;
 	}
 
--- a/target/linux/ar71xx/patches-2.6.37/109-mtd-wrt160nl-trx-parser.patch
+++ b/target/linux/ar71xx/patches-2.6.37/109-mtd-wrt160nl-trx-parser.patch
@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -956,6 +956,16 @@ static int __devinit m25p_probe(struct s
+@@ -952,6 +952,16 @@ static int __devinit m25p_probe(struct s
 					part_probes, &parts, 0);
 		}
 #endif
--- a/target/linux/ar71xx/patches-2.6.37/110-usb-ehci-add-war-for-synopsys-hc-bug.patch
+++ b/target/linux/ar71xx/patches-2.6.37/110-usb-ehci-add-war-for-synopsys-hc-bug.patch
@ -12,8 +12,8 @@
 /* makes sure the async qh will become idle */
 --- a/drivers/usb/host/ehci.h
 +++ b/drivers/usb/host/ehci.h
-@@ -133,6 +133,7 @@ struct ehci_hcd {			/* one per controlle
- 	unsigned		broken_periodic:1;
+@@ -134,6 +134,7 @@ struct ehci_hcd {			/* one per controlle
+ 	unsigned		amd_l1_fix:1;
 	unsigned		fs_i_thresh:1;	/* Intel iso scheduling */
 	unsigned		use_dummy_qh:1;	/* AMD Frame List table quirk*/
 +	unsigned		has_synopsys_hc_bug:1; /* Synopsys HC */
--- a/target/linux/ar71xx/patches-2.6.37/111-mtd-cfi_cmdset_0002-force-word-write.patch
+++ b/target/linux/ar71xx/patches-2.6.37/111-mtd-cfi_cmdset_0002-force-word-write.patch
@ -35,7 +35,7 @@
 
 /* Atmel chips don't use the same PRI format as AMD chips */
 static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param)
-@@ -1391,6 +1395,7 @@ static int cfi_amdstd_write_words(struct
+@@ -1388,6 +1392,7 @@ static int cfi_amdstd_write_words(struct
 /*
  * FIXME: interleaved mode not tested, and probably not supported!
  */
@ -43,7 +43,7 @@
 static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
 				    unsigned long adr, const u_char *buf,
 				    int len)
-@@ -1501,7 +1506,6 @@ static int __xipram do_write_buffer(stru
+@@ -1498,7 +1503,6 @@ static int __xipram do_write_buffer(stru
 	return ret;
 }
 
@ -51,7 +51,7 @@
 static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
 				    size_t *retlen, const u_char *buf)
 {
-@@ -1580,6 +1584,7 @@ static int cfi_amdstd_write_buffers(stru
+@@ -1577,6 +1581,7 @@ static int cfi_amdstd_write_buffers(stru
 
 	return 0;
 }
--- a/target/linux/ar71xx/patches-2.6.37/205-wndr3700-usb-led-driver.patch
+++ b/target/linux/ar71xx/patches-2.6.37/205-wndr3700-usb-led-driver.patch
@ -1,8 +1,8 @@
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
-@@ -347,6 +347,13 @@ config LEDS_TRIGGERS
- 
- if LEDS_TRIGGERS
+@@ -377,6 +377,13 @@ config LEDS_TRIGGERS
+ 	  These triggers allow kernel events to drive the LEDs and can
+ 	  be configured via sysfs. If unsure, say Y.
 
 +config LEDS_WNDR3700_USB
 +	tristate "NETGEAR WNDR3700 USB LED driver"
--- a/target/linux/ar71xx/patches-2.6.37/207-rb750-led-driver.patch
+++ b/target/linux/ar71xx/patches-2.6.37/207-rb750-led-driver.patch
@ -1,6 +1,6 @@
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
-@@ -354,6 +354,10 @@ config LEDS_WNDR3700_USB
+@@ -384,6 +384,10 @@ config LEDS_WNDR3700_USB
 	  This option enables support for the USB LED found on the
 	  NETGEAR WNDR3700 board.
 
--- a/target/linux/ar71xx/patches-2.6.37/300-mips_fw_myloader.patch
+++ b/target/linux/ar71xx/patches-2.6.37/300-mips_fw_myloader.patch
@ -10,7 +10,7 @@
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -907,6 +907,9 @@ config MIPS_NILE4
+@@ -909,6 +909,9 @@ config MIPS_NILE4
 config MIPS_DISABLE_OBSOLETE_IDE
 	bool
 
--- a/target/linux/ar71xx/patches-2.6.37/400-2.6.35-fix-nand_scan_ident-options.patch
+++ b/target/linux/ar71xx/patches-2.6.37/400-2.6.35-fix-nand_scan_ident-options.patch
@ -1,6 +1,6 @@
 --- a/drivers/mtd/nand/rb4xx_nand.c
 +++ b/drivers/mtd/nand/rb4xx_nand.c
-@@ -220,7 +220,7 @@ static int __init rb4xx_nand_probe(struc
+@@ -223,7 +223,7 @@ static int __init rb4xx_nand_probe(struc
 
 	platform_set_drvdata(pdev, info);
 
--- a/target/linux/ar71xx/patches-2.6.37/901-get_c0_compare_irq_function.patch
+++ b/target/linux/ar71xx/patches-2.6.37/901-get_c0_compare_irq_function.patch
@ -8,7 +8,7 @@
 
 extern void check_wait(void);
 extern asmlinkage void r4k_wait(void);
-@@ -1552,6 +1553,8 @@ void __cpuinit per_cpu_trap_init(void)
+@@ -1578,6 +1579,8 @@ void __cpuinit per_cpu_trap_init(void)
 	if (cpu_has_mips_r2) {
 		cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP;
 		cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7;
--- a/target/linux/generic/config-2.6.30
+++ b/target/linux/generic/config-2.6.30
@ -805,12 +805,6 @@ CONFIG_IDE_PROC_FS=y
 # CONFIG_IKCONFIG is not set
 # CONFIG_IKCONFIG_PROC is not set
 # CONFIG_IMAGE_CMDLINE_HACK is not set
-# CONFIG_IMQ is not set
-# CONFIG_IMQ_BEHAVIOR_AA is not set
-# CONFIG_IMQ_BEHAVIOR_AB is not set
-# CONFIG_IMQ_BEHAVIOR_BA is not set
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-CONFIG_IMQ_NUM_DEVS=2
 CONFIG_INET=y
 # CONFIG_INET6_AH is not set
 # CONFIG_INET6_ESP is not set
--- a/target/linux/generic/config-2.6.31
+++ b/target/linux/generic/config-2.6.31
@ -799,12 +799,6 @@ CONFIG_IDE_PROC_FS=y
 # CONFIG_IKCONFIG is not set
 # CONFIG_IKCONFIG_PROC is not set
 # CONFIG_IMAGE_CMDLINE_HACK is not set
-# CONFIG_IMQ is not set
-# CONFIG_IMQ_BEHAVIOR_AA is not set
-# CONFIG_IMQ_BEHAVIOR_AB is not set
-# CONFIG_IMQ_BEHAVIOR_BA is not set
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-CONFIG_IMQ_NUM_DEVS=2
 CONFIG_INET=y
 # CONFIG_INET6_AH is not set
 # CONFIG_INET6_ESP is not set
--- a/target/linux/generic/config-2.6.32
+++ b/target/linux/generic/config-2.6.32
@ -857,12 +857,6 @@ CONFIG_IDE_PROC_FS=y
 # CONFIG_IKCONFIG is not set
 # CONFIG_IKCONFIG_PROC is not set
 # CONFIG_IMAGE_CMDLINE_HACK is not set
-# CONFIG_IMQ is not set
-# CONFIG_IMQ_BEHAVIOR_AA is not set
-# CONFIG_IMQ_BEHAVIOR_AB is not set
-# CONFIG_IMQ_BEHAVIOR_BA is not set
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-CONFIG_IMQ_NUM_DEVS=2
 CONFIG_INET=y
 # CONFIG_INET6_AH is not set
 # CONFIG_INET6_ESP is not set
--- a/target/linux/generic/config-2.6.34
+++ b/target/linux/generic/config-2.6.34
@ -894,12 +894,6 @@ CONFIG_IDE_PROC_FS=y
 # CONFIG_IKCONFIG is not set
 # CONFIG_IKCONFIG_PROC is not set
 # CONFIG_IMAGE_CMDLINE_HACK is not set
-# CONFIG_IMQ is not set
-# CONFIG_IMQ_BEHAVIOR_AA is not set
-# CONFIG_IMQ_BEHAVIOR_AB is not set
-# CONFIG_IMQ_BEHAVIOR_BA is not set
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-CONFIG_IMQ_NUM_DEVS=2
 CONFIG_INET=y
 # CONFIG_INET6_AH is not set
 # CONFIG_INET6_ESP is not set
--- a/target/linux/generic/config-2.6.35
+++ b/target/linux/generic/config-2.6.35
@ -929,12 +929,6 @@ CONFIG_IDE_PROC_FS=y
 # CONFIG_IKCONFIG is not set
 # CONFIG_IKCONFIG_PROC is not set
 # CONFIG_IMAGE_CMDLINE_HACK is not set
-# CONFIG_IMQ is not set
-# CONFIG_IMQ_BEHAVIOR_AA is not set
-# CONFIG_IMQ_BEHAVIOR_AB is not set
-# CONFIG_IMQ_BEHAVIOR_BA is not set
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-CONFIG_IMQ_NUM_DEVS=2
 CONFIG_INET=y
 # CONFIG_INET6_AH is not set
 # CONFIG_INET6_ESP is not set
--- a/target/linux/generic/config-2.6.36
+++ b/target/linux/generic/config-2.6.36
@ -877,12 +877,6 @@ CONFIG_IDE_PROC_FS=y
 # CONFIG_IKCONFIG is not set
 # CONFIG_IKCONFIG_PROC is not set
 # CONFIG_IMAGE_CMDLINE_HACK is not set
-# CONFIG_IMQ is not set
-# CONFIG_IMQ_BEHAVIOR_AA is not set
-# CONFIG_IMQ_BEHAVIOR_AB is not set
-# CONFIG_IMQ_BEHAVIOR_BA is not set
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-CONFIG_IMQ_NUM_DEVS=2
 CONFIG_INET=y
 # CONFIG_INET6_AH is not set
 # CONFIG_INET6_ESP is not set
--- a/target/linux/generic/config-2.6.37
+++ b/target/linux/generic/config-2.6.37
@ -897,12 +897,6 @@ CONFIG_IDE_PROC_FS=y
 # CONFIG_IKCONFIG is not set
 # CONFIG_IKCONFIG_PROC is not set
 # CONFIG_IMAGE_CMDLINE_HACK is not set
-# CONFIG_IMQ is not set
-# CONFIG_IMQ_BEHAVIOR_AA is not set
-# CONFIG_IMQ_BEHAVIOR_AB is not set
-# CONFIG_IMQ_BEHAVIOR_BA is not set
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-CONFIG_IMQ_NUM_DEVS=2
 CONFIG_INET=y
 # CONFIG_INET6_AH is not set
 # CONFIG_INET6_ESP is not set
--- a/target/linux/generic/config-2.6.38
+++ b/target/linux/generic/config-2.6.38
@ -903,12 +903,6 @@ CONFIG_IDE_PROC_FS=y
 # CONFIG_IKCONFIG is not set
 # CONFIG_IKCONFIG_PROC is not set
 # CONFIG_IMAGE_CMDLINE_HACK is not set
-# CONFIG_IMQ_BEHAVIOR_AA is not set
-# CONFIG_IMQ_BEHAVIOR_AB is not set
-# CONFIG_IMQ_BEHAVIOR_BA is not set
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-# CONFIG_IMQ is not set
-CONFIG_IMQ_NUM_DEVS=2
 # CONFIG_INET6_AH is not set
 # CONFIG_INET6_ESP is not set
 # CONFIG_INET6_IPCOMP is not set
--- a/target/linux/generic/patches-2.6.30/150-netfilter_imq.patch
+++ b/target/linux/generic/patches-2.6.30/150-netfilter_imq.patch
--- a/target/linux/generic/patches-2.6.30/180-netfilter_depends.patch
+++ b/target/linux/generic/patches-2.6.30/180-netfilter_depends.patch
@ -8,7 +8,7 @@
 	depends on NETFILTER_ADVANCED
 	help
 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -505,7 +504,6 @@ config NETFILTER_XT_TARGET_SECMARK
+@@ -493,7 +492,6 @@ config NETFILTER_XT_TARGET_SECMARK
 
 config NETFILTER_XT_TARGET_TCPMSS
 	tristate '"TCPMSS" target support'
--- a/target/linux/generic/patches-2.6.30/205-skb_padding.patch
+++ b/target/linux/generic/patches-2.6.30/205-skb_padding.patch
@ -1,6 +1,6 @@
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -1369,11 +1369,18 @@ static inline int skb_network_offset(con
+@@ -1351,11 +1351,18 @@ static inline int skb_network_offset(con
  *
  * Various parts of the networking layer expect at least 32 bytes of
  * headroom, you should not reduce this.
@ -19,7 +19,7 @@
 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
 
 static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
-@@ -1463,9 +1470,9 @@ static inline void __skb_queue_purge(str
+@@ -1445,9 +1452,9 @@ static inline void __skb_queue_purge(str
 static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
 					      gfp_t gfp_mask)
 {
@ -31,7 +31,7 @@
 	return skb;
 }
 
-@@ -1538,7 +1545,7 @@ static inline int __skb_cow(struct sk_bu
+@@ -1520,7 +1527,7 @@ static inline int __skb_cow(struct sk_bu
 		delta = headroom - skb_headroom(skb);
 
 	if (delta || cloned)
@ -42,7 +42,7 @@
 }
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c
-@@ -327,9 +327,9 @@ struct sk_buff *__netdev_alloc_skb(struc
+@@ -250,9 +250,9 @@ struct sk_buff *__netdev_alloc_skb(struc
 	int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1;
 	struct sk_buff *skb;
 
--- a/target/linux/generic/patches-2.6.30/601-phy-add-aneg-done-function.patch
+++ b/target/linux/generic/patches-2.6.30/601-phy-add-aneg-done-function.patch
@ -1,6 +1,6 @@
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
-@@ -393,9 +393,18 @@ struct phy_driver {
+@@ -379,9 +379,18 @@ struct phy_driver {
 	 */
 	int (*config_aneg)(struct phy_device *phydev);
 
@ -21,7 +21,7 @@
 
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
-@@ -695,6 +695,9 @@ int genphy_update_link(struct phy_device
+@@ -590,6 +590,9 @@ int genphy_update_link(struct phy_device
 {
 	int status;
 
--- a/target/linux/generic/patches-2.6.30/680-phy_ar8216.patch
+++ b/target/linux/generic/patches-2.6.30/680-phy_ar8216.patch
@ -1,7 +1,7 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -100,6 +100,10 @@ config IP175C_PHY
- 	tristate "Driver for IC+ IP175C/IP178C switches"
+@@ -100,6 +100,10 @@ config IP17XX_PHY
+ 	tristate "Driver for IC+ IP17xx switches"
 	select SWCONFIG
 
 +config AR8216_PHY
@ -15,7 +15,7 @@
 +++ b/drivers/net/phy/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
 obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
+ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
 obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
 +obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
 obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
--- a/target/linux/generic/patches-2.6.30/690-phy_rtl8306.patch
+++ b/target/linux/generic/patches-2.6.30/690-phy_rtl8306.patch
@ -14,7 +14,7 @@
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
+ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
 obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
 obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
 +obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
--- a/target/linux/generic/patches-2.6.30/691-phy_rtl8366.patch
+++ b/target/linux/generic/patches-2.6.30/691-phy_rtl8366.patch
@ -32,7 +32,7 @@
 endif # PHYLIB
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -19,6 +19,9 @@ obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
+@@ -19,6 +19,9 @@ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
 obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
 obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
 obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
--- a/target/linux/generic/patches-2.6.30/940-wireless_mesh_header.patch
+++ b/target/linux/generic/patches-2.6.30/940-wireless_mesh_header.patch
@ -11,7 +11,7 @@
 #  define LL_MAX_HEADER 96
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -387,7 +387,7 @@ struct sk_buff {
+@@ -378,7 +378,7 @@ struct sk_buff {
 #ifdef CONFIG_IPV6_NDISC_NODETYPE
 	__u8			ndisc_nodetype:2;
 #endif
--- a/target/linux/generic/patches-2.6.30/971-ocf_20100325.patch
+++ b/target/linux/generic/patches-2.6.30/971-ocf_20100325.patch
@ -1,7 +1,5 @@
-Index: linux-2.6.30.10/drivers/char/random.c
-===================================================================
--- linux-2.6.30.10.orig/drivers/char/random.c	2009-12-04 07:00:07.000000000 +0100
-+++ linux-2.6.30.10/drivers/char/random.c	2010-05-15 15:44:19.000000000 +0200
+--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -129,6 +129,9 @@
  *                                unsigned int value);
  * 	void add_interrupt_randomness(int irq);
@ -26,7 +24,7 @@ Index: linux-2.6.30.10/drivers/char/random.c
  * All of these routines try to estimate how many bits of randomness a
  * particular randomness source.  They do this by keeping track of the
  * first and second order deltas of the event timings.
-@@ -712,6 +722,61 @@
+@@ -712,6 +722,61 @@ void add_disk_randomness(struct gendisk 
 }
 #endif
 
@ -88,11 +86,9 @@ Index: linux-2.6.30.10/drivers/char/random.c
 #define EXTRACT_SIZE 10
 
 /*********************************************************************
-Index: linux-2.6.30.10/fs/fcntl.c
-===================================================================
--- linux-2.6.30.10.orig/fs/fcntl.c	2009-12-04 07:00:07.000000000 +0100
-+++ linux-2.6.30.10/fs/fcntl.c	2010-05-15 15:44:19.000000000 +0200
-@@ -142,6 +142,7 @@
+--- a/fs/fcntl.c
+++ b/fs/fcntl.c
+@@ -142,6 +142,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
 	}
 	return ret;
 }
@ -100,10 +96,8 @@ Index: linux-2.6.30.10/fs/fcntl.c
 
 #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
 
-Index: linux-2.6.30.10/include/linux/miscdevice.h
-===================================================================
--- linux-2.6.30.10.orig/include/linux/miscdevice.h	2009-12-04 07:00:07.000000000 +0100
-+++ linux-2.6.30.10/include/linux/miscdevice.h	2010-05-15 15:44:19.000000000 +0200
+--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -12,6 +12,7 @@
 #define APOLLO_MOUSE_MINOR	7
 #define PC110PAD_MINOR		9
@ -112,10 +106,8 @@ Index: linux-2.6.30.10/include/linux/miscdevice.h
 #define WATCHDOG_MINOR		130	/* Watchdog timer     */
 #define TEMP_MINOR		131	/* Temperature Sensor */
 #define RTC_MINOR		135
-Index: linux-2.6.30.10/include/linux/random.h
-===================================================================
--- linux-2.6.30.10.orig/include/linux/random.h	2009-12-04 07:00:07.000000000 +0100
-+++ linux-2.6.30.10/include/linux/random.h	2010-05-15 15:44:19.000000000 +0200
+--- a/include/linux/random.h
+++ b/include/linux/random.h
@@ -9,6 +9,7 @@
 
 #include <linux/types.h>
@ -155,7 +147,7 @@ Index: linux-2.6.30.10/include/linux/random.h
 struct rand_pool_info {
 	int	entropy_count;
 	int	buf_size;
-@@ -50,6 +75,10 @@
+@@ -50,6 +75,10 @@ extern void add_input_randomness(unsigne
 				 unsigned int value);
 extern void add_interrupt_randomness(int irq);
 
--- a/target/linux/generic/patches-2.6.31/150-netfilter_imq.patch
+++ b/target/linux/generic/patches-2.6.31/150-netfilter_imq.patch
--- a/target/linux/generic/patches-2.6.32/014-cfi_fix_amd_extended_table_check.patch
+++ b/target/linux/generic/patches-2.6.32/014-cfi_fix_amd_extended_table_check.patch
@ -1,6 +1,6 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -325,6 +325,8 @@ static struct cfi_fixup fixup_table[] =
+@@ -325,6 +325,8 @@ static struct cfi_fixup fixup_table[] = 
 static void cfi_fixup_major_minor(struct cfi_private *cfi,
 				  struct cfi_pri_amdstd *extp)
 {
@ -9,7 +9,7 @@
 	if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
 	    extp->MajorVersion == '0')
 		extp->MajorVersion = '1';
-@@ -355,6 +357,9 @@ struct mtd_info *cfi_cmdset_0002(struct
+@@ -355,6 +357,9 @@ struct mtd_info *cfi_cmdset_0002(struct 
 	mtd->name    = map->name;
 	mtd->writesize = 1;
 
@ -19,7 +19,7 @@
 	if (cfi->cfi_mode==CFI_MODE_CFI){
 		unsigned char bootloc;
 		/*
-@@ -373,16 +378,24 @@ struct mtd_info *cfi_cmdset_0002(struct
+@@ -373,16 +378,24 @@ struct mtd_info *cfi_cmdset_0002(struct 
 
 		cfi_fixup_major_minor(cfi, extp);
 
--- a/target/linux/generic/patches-2.6.32/020-mips_multi_machine_support.patch
+++ b/target/linux/generic/patches-2.6.32/020-mips_multi_machine_support.patch
@ -176,7 +176,7 @@
 
 unsigned int vced_count, vcei_count;
 
-@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file
+@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file 
 	/*
 	 * For the first processor also print the system type
 	 */
--- a/target/linux/generic/patches-2.6.32/040-arm-update-mach-types.patch
+++ b/target/linux/generic/patches-2.6.32/040-arm-update-mach-types.patch
@ -55,7 +55,7 @@
 vesper			MACH_VESPER		VESPER			2256
 str9			MACH_STR9		STR9			2257
 omap3_wl_ff		MACH_OMAP3_WL_FF	OMAP3_WL_FF		2258
-@@ -2256,7 +2257,7 @@ oratisalog		MACH_ORATISALOG		ORATISALOG
+@@ -2256,7 +2257,7 @@ oratisalog		MACH_ORATISALOG		ORATISALOG	
 oratismadi		MACH_ORATISMADI		ORATISMADI		2269
 oratisot16		MACH_ORATISOT16		ORATISOT16		2270
 oratisdesk		MACH_ORATISDESK		ORATISDESK		2271
@ -100,7 +100,7 @@
 htc_excalibur_s620	MACH_HTC_EXCALIBUR_S620	HTC_EXCALIBUR_S620	2391
 htc_opal		MACH_HTC_OPAL		HTC_OPAL		2392
 touchbook		MACH_TOUCHBOOK		TOUCHBOOK		2393
-@@ -2445,7 +2446,7 @@ siogentoo1		MACH_SIOGENTOO1		SIOGENTOO1
+@@ -2445,7 +2446,7 @@ siogentoo1		MACH_SIOGENTOO1		SIOGENTOO1	
 siogentoo2		MACH_SIOGENTOO2		SIOGENTOO2		2459
 sm3k			MACH_SM3K		SM3K			2460
 acer_tempo_f900		MACH_ACER_TEMPO_F900	ACER_TEMPO_F900		2461
--- a/target/linux/generic/patches-2.6.32/100-netfilter_layer7_2.21.patch
+++ b/target/linux/generic/patches-2.6.32/100-netfilter_layer7_2.21.patch
@ -71,7 +71,7 @@
 	depends on NETFILTER_ADVANCED
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
-@@ -89,6 +89,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)
+@@ -89,6 +89,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) 
 obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
--- a/target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch
+++ b/target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch
@ -127,11 +127,10 @@
 
 		e = (struct ipt_entry *)(loc_cpu_entry + off);
 		if (copy_to_user(userptr + off
-@@ -1001,6 +1041,14 @@ copy_entries_to_user(unsigned int total_
- 			ret = -EFAULT;
+@@ -1002,6 +1042,14 @@ copy_entries_to_user(unsigned int total_
 			goto free_counters;
 		}
-+
+ 
 +		flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
 +		if (copy_to_user(userptr + off
 +				 + offsetof(struct ipt_entry, ip.flags),
@ -139,6 +138,7 @@
 +			ret = -EFAULT;
 +			goto free_counters;
 +		}
- 
+
 		for (i = sizeof(struct ipt_entry);
 		     i < e->target_offset;
+ 		     i += m->u.match_size) {
--- a/target/linux/generic/patches-2.6.32/150-netfilter_imq.patch
+++ b/target/linux/generic/patches-2.6.32/150-netfilter_imq.patch
--- a/target/linux/generic/patches-2.6.32/180-netfilter_depends.patch
+++ b/target/linux/generic/patches-2.6.32/180-netfilter_depends.patch
@ -8,7 +8,7 @@
 	depends on NETFILTER_ADVANCED
 	help
 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -505,7 +504,6 @@ config NETFILTER_XT_TARGET_SECMARK
+@@ -493,7 +492,6 @@ config NETFILTER_XT_TARGET_SECMARK
 
 config NETFILTER_XT_TARGET_TCPMSS
 	tristate '"TCPMSS" target support'
--- a/target/linux/generic/patches-2.6.32/202-mips_mem_functions_performance.patch
+++ b/target/linux/generic/patches-2.6.32/202-mips_mem_functions_performance.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/include/asm/string.h
 +++ b/arch/mips/include/asm/string.h
-@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__
+@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__ 
 
 #define __HAVE_ARCH_MEMSET
 extern void *memset(void *__s, int __c, size_t __count);
--- a/target/linux/generic/patches-2.6.32/203-slab_maxsize.patch
+++ b/target/linux/generic/patches-2.6.32/203-slab_maxsize.patch
@ -1,6 +1,6 @@
 --- a/include/linux/slab.h
 +++ b/include/linux/slab.h
-@@ -124,8 +124,8 @@ int kmem_ptr_validate(struct kmem_cache
+@@ -124,8 +124,8 @@ int kmem_ptr_validate(struct kmem_cache 
  * to do various tricks to work around compiler limitations in order to
  * ensure proper constant folding.
  */
--- a/target/linux/generic/patches-2.6.32/205-skb_padding.patch
+++ b/target/linux/generic/patches-2.6.32/205-skb_padding.patch
@ -1,6 +1,6 @@
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -1384,11 +1384,18 @@ static inline int skb_network_offset(con
+@@ -1365,11 +1365,18 @@ static inline int skb_network_offset(con
  *
  * Various parts of the networking layer expect at least 32 bytes of
  * headroom, you should not reduce this.
@ -19,7 +19,7 @@
 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
 
 static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
-@@ -1478,9 +1485,9 @@ static inline void __skb_queue_purge(str
+@@ -1459,9 +1466,9 @@ static inline void __skb_queue_purge(str
 static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
 					      gfp_t gfp_mask)
 {
@ -31,7 +31,7 @@
 	return skb;
 }
 
-@@ -1553,7 +1560,7 @@ static inline int __skb_cow(struct sk_bu
+@@ -1534,7 +1541,7 @@ static inline int __skb_cow(struct sk_bu
 		delta = headroom - skb_headroom(skb);
 
 	if (delta || cloned)
@ -42,7 +42,7 @@
 }
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c
-@@ -339,9 +339,9 @@ struct sk_buff *__netdev_alloc_skb(struc
+@@ -259,9 +259,9 @@ struct sk_buff *__netdev_alloc_skb(struc
 	int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1;
 	struct sk_buff *skb;
 
--- a/target/linux/generic/patches-2.6.32/210-mini_fo_2.6.25_fixes.patch
+++ b/target/linux/generic/patches-2.6.32/210-mini_fo_2.6.25_fixes.patch
@ -61,7 +61,7 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
 
-@@ -501,6 +505,29 @@ static inline void double_unlock(struct
+@@ -501,6 +505,29 @@ static inline void double_unlock(struct 
 #endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
 #endif /* __KERNEL__ */
 
@ -127,7 +127,7 @@
 #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
 --- a/fs/mini_fo/aux.c
 +++ b/fs/mini_fo/aux.c
-@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb,
+@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb, 
 	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
 
 	/* validate */
--- a/target/linux/generic/patches-2.6.32/212-mini_fo_2.6.26_fixes.patch
+++ b/target/linux/generic/patches-2.6.32/212-mini_fo_2.6.26_fixes.patch
@ -1,6 +1,6 @@
 --- a/fs/mini_fo/super.c
 +++ b/fs/mini_fo/super.c
-@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int
+@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int 
 #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
 
 
--- a/target/linux/generic/patches-2.6.32/223-kobject-add-broadcast_uevent.patch
+++ b/target/linux/generic/patches-2.6.32/223-kobject-add-broadcast_uevent.patch
@ -20,7 +20,7 @@
 #else
 static inline int kobject_uevent(struct kobject *kobj,
 				 enum kobject_action action)
-@@ -224,6 +230,16 @@ static inline int add_uevent_var(struct
+@@ -224,6 +230,16 @@ static inline int add_uevent_var(struct 
 static inline int kobject_action_type(const char *buf, size_t count,
 				      enum kobject_action *type)
 { return -EINVAL; }
--- a/target/linux/generic/patches-2.6.32/400-ledtrig_morse.patch
+++ b/target/linux/generic/patches-2.6.32/400-ledtrig_morse.patch
@ -11,7 +11,7 @@
 endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -40,3 +40,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+=
+@@ -40,3 +40,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= 
 obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= ledtrig-backlight.o
 obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
 obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
--- a/target/linux/generic/patches-2.6.32/402-ledtrig_netdev.patch
+++ b/target/linux/generic/patches-2.6.32/402-ledtrig_netdev.patch
@ -14,7 +14,7 @@
 endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -41,3 +41,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+=
+@@ -41,3 +41,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= 
 obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
 obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
 obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
--- a/target/linux/generic/patches-2.6.32/511-yaffs-cvs-2009-04-24.patch
+++ b/target/linux/generic/patches-2.6.32/511-yaffs-cvs-2009-04-24.patch
@ -601,7 +601,7 @@
 			dev->checkpointBlockList[i] = -1;
 	}
 
-@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device
+@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device 
 
 static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
 {
@ -926,7 +926,7 @@
 {
 	unsigned char cDelta;	/* column parity delta */
 	unsigned lDelta;	/* line parity delta */
-@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char
+@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char 
 		return 0; /* no error */
 
 	if (lDelta == ~lDeltaPrime &&
@ -936,7 +936,7 @@
 		/* Single bit (recoverable) error in data */
 
 		bit = 0;
-@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char
+@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char 
 		if (cDelta & 0x02)
 			bit |= 0x01;
 
@ -945,7 +945,7 @@
 			return -1;
 
 		data[lDelta] ^= (1 << bit);
-@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char
+@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char 
 	}
 
 	if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
@ -954,7 +954,7 @@
 		/* Reccoverable error in ecc */
 
 		*read_ecc = *test_ecc;
-@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char
+@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char 
 	/* Unrecoverable error */
 
 	return -1;
@ -1398,7 +1398,7 @@
 {
 	unsigned char *alias;
 	int ret;
-@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry
+@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry 
 	return ret;
 }
 
@ -1560,7 +1560,7 @@
 static int yaffs_file_flush(struct file *file, fl_owner_t id)
 #else
 static int yaffs_file_flush(struct file *file)
-@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file
+@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file 
 	yaffs_Device *dev = obj->myDev;
 
 	T(YAFFS_TRACE_OS,
@ -1571,7 +1571,7 @@
 
 	yaffs_GrossLock(dev);
 
-@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct
+@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct 
 
 	yaffs_Device *dev;
 
@ -1591,7 +1591,7 @@
 	BUG_ON(!PageLocked(pg));
 #else
 	if (!PageLocked(pg))
-@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct
+@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct 
 
 	yaffs_GrossLock(dev);
 
@ -1604,7 +1604,7 @@
 
 	yaffs_GrossUnlock(dev);
 
-@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct
+@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct 
 	flush_dcache_page(pg);
 	kunmap(pg);
 
@ -3193,7 +3193,7 @@
 		if (n < step) {
 			n++;
 			continue;
-@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file
+@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file 
 	char *end;
 	char *mask_name;
 	const char *x;
@ -3202,7 +3202,7 @@
 	int i;
 	int done = 0;
 	int add, len = 0;
-@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file
+@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file 
 
 	while (!done && (pos < count)) {
 		done = 1;
@ -3213,7 +3213,7 @@
 
 		switch (buf[pos]) {
 		case '+':
-@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file
+@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file 
 		mask_name = NULL;
 
 		mask_bitfield = simple_strtoul(buf + pos, &end, 0);
@ -3240,7 +3240,7 @@
 					mask_name = mask_flags[i].mask_name;
 					mask_bitfield = mask_flags[i].mask_bitfield;
 					done = 0;
-@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file
+@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file 
 
 		if (mask_name != NULL) {
 			done = 0;
@ -3249,7 +3249,7 @@
 			case '-':
 				rg &= ~mask_bitfield;
 				break;
-@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file
+@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file 
 
 	yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS;
 
@ -5691,7 +5691,7 @@
 {
 	/* Get the real object in case we were fed a hard link as an equivalent object */
 	equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
-@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object *
+@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object * 
 
 }
 
@ -7622,7 +7622,7 @@
 	int nToCopy;
 	int n = nBytes;
 	int nDone = 0;
-@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object
+@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object 
 	dev = in->myDev;
 
 	while (n > 0) {
@ -7657,7 +7657,7 @@
 			if (dev->nShortOpCaches > 0) {
 
 				/* If we can't find the data in the cache, then load it up. */
-@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object
+@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object 
 
 				cache->locked = 1;
 
@ -7673,7 +7673,7 @@
 				cache->locked = 0;
 			} else {
 				/* Read into the local buffer then copy..*/
-@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object
+@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object 
 				    yaffs_GetTempBuffer(dev, __LINE__);
 				yaffs_ReadChunkDataFromObject(in, chunk,
 							      localBuffer);
@ -7718,7 +7718,7 @@
 		}
 
 		n -= nToCopy;
-@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object
+@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object 
 	return nDone;
 }
 
@ -7923,7 +7923,7 @@
 	int newFullChunks;
 
 	yaffs_Device *dev = in->myDev;
-@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in,
+@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in, 
 
 	yaffs_CheckGarbageCollection(dev);
 
@ -7941,7 +7941,7 @@
 
 	if (newSize < oldFileSize) {
 
-@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in,
+@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in, 
 	}
 
 
@ -7968,7 +7968,7 @@
 {
 	obj = yaffs_GetEquivalentObject(obj);
 
-@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object *
+@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object * 
 
 
 
@ -9789,7 +9789,7 @@
 {
 	int init_failed = 0;
 	unsigned x;
-@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device * 
 	dev->chunkOffset = 0;
 	dev->nFreeChunks = 0;
 
@ -9798,7 +9798,7 @@
 	if (dev->startBlock == 0) {
 		dev->internalStartBlock = dev->startBlock + 1;
 		dev->internalEndBlock = dev->endBlock + 1;
-@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device * 
 
 	/* Check geometry parameters. */
 
@ -9823,7 +9823,7 @@
 		return YAFFS_FAIL;
 	}
 
-@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device * 
 		return YAFFS_FAIL;
 	}
 
@ -9836,7 +9836,7 @@
 	/* Got the right mix of functions? */
 	if (!yaffs_CheckDevFunctions(dev)) {
 		/* Function missing */
-@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device * 
 
 	dev->isMounted = 1;
 
@ -9875,7 +9875,7 @@
 
 	/*
 	 * Calculate chunkGroupBits.
-@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device * 
 	bits = ShiftsGE(x);
 
 	/* Set up tnode width if wide tnodes are enabled. */
@ -9896,7 +9896,7 @@
 		dev->tnodeWidth = 16;
 
 	dev->tnodeMask = (1<<dev->tnodeWidth)-1;
-@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device * 
 	dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
 
 	/* Initialise temporary buffers and caches. */
@ -9905,7 +9905,7 @@
 		init_failed = 1;
 
 	dev->srCache = NULL;
-@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device * 
 	if (!init_failed &&
 	    dev->nShortOpCaches > 0) {
 		int i;
@ -9940,7 +9940,7 @@
 			init_failed = 1;
 
 		dev->srLastUse = 0;
-@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device * 
 
 	dev->cacheHits = 0;
 
@ -9979,7 +9979,7 @@
 				T(YAFFS_TRACE_ALWAYS,
 				  (TSTR("yaffs: restored from checkpoint" TENDSTR)));
 			} else {
-@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device * 
 				dev->nBackgroundDeletions = 0;
 				dev->oldestDirtySequence = 0;
 
@ -10011,7 +10011,7 @@
 		/* Clean up the mess */
 		T(YAFFS_TRACE_TRACING,
 		  (TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR)));
-@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device * 
 
 }
 
@ -10710,7 +10710,7 @@
 {
 	if (etags) {
 		memset(etags, 0, sizeof(*etags));
-@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags *
+@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags * 
  * Returns YAFFS_OK or YAFFS_FAIL.
  */
 int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
@ -11038,14 +11038,14 @@
 +			yaffs_UnpackTags2(tags, &pt);
 +		}
 +	}
-+
+ 
+-	if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
+-		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
 +	if (localData)
 +		yaffs_ReleaseTempBuffer(dev, data, __LINE__);
 
-	if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
 +	if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
- 		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
-
+		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
 	if (retval == 0)
 		return YAFFS_OK;
 	else
--- a/target/linux/generic/patches-2.6.32/903-hostap_txpower.patch
+++ b/target/linux/generic/patches-2.6.32/903-hostap_txpower.patch
@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/hostap/hostap_ap.c
 +++ b/drivers/net/wireless/hostap/hostap_ap.c
-@@ -2335,13 +2335,13 @@ int prism2_ap_get_sta_qual(local_info_t
+@@ -2335,13 +2335,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)
--- a/target/linux/generic/patches-2.6.32/930-kmsg_dump_backport.patch
+++ b/target/linux/generic/patches-2.6.32/930-kmsg_dump_backport.patch
@ -55,7 +55,7 @@
 #include <linux/kallsyms.h>
 #include <linux/notifier.h>
 #include <linux/module.h>
-@@ -74,6 +75,7 @@ NORET_TYPE void panic(const char * fmt,
+@@ -74,6 +75,7 @@ NORET_TYPE void panic(const char * fmt, 
 	dump_stack();
 #endif
 
--- a/target/linux/generic/patches-2.6.32/971-ocf_20100325.patch
+++ b/target/linux/generic/patches-2.6.32/971-ocf_20100325.patch
@ -24,7 +24,7 @@
  * All of these routines try to estimate how many bits of randomness a
  * particular randomness source.  They do this by keeping track of the
  * first and second order deltas of the event timings.
-@@ -714,6 +724,61 @@ void add_disk_randomness(struct gendisk
+@@ -714,6 +724,61 @@ void add_disk_randomness(struct gendisk 
 }
 #endif
 
--- a/target/linux/generic/patches-2.6.32/975-ssb_update.patch
+++ b/target/linux/generic/patches-2.6.32/975-ssb_update.patch
@ -343,10 +343,7 @@
 +static int ssb_pcmcia_get_mac(struct pcmcia_device *p_dev,
 +			tuple_t *tuple,
 +			void *priv)
- {
-	tuple_t tuple;
-	int res;
-	unsigned char buf[32];
+{
 +	struct ssb_sprom *sprom = priv;
 +
 +	if (tuple->TupleData[0] != CISTPL_FUNCE_LAN_NODE_ID)
@ -362,7 +359,10 @@
 +static int ssb_pcmcia_do_get_invariants(struct pcmcia_device *p_dev,
 +					tuple_t *tuple,
 +					void *priv)
-+{
+ {
+-	tuple_t tuple;
+-	int res;
+-	unsigned char buf[32];
 +	struct ssb_init_invariants *iv = priv;
 	struct ssb_sprom *sprom = &iv->sprom;
 	struct ssb_boardinfo *bi = &iv->boardinfo;
--- a/target/linux/generic/patches-2.6.32/998-openwrt_lzma_options.patch
+++ b/target/linux/generic/patches-2.6.32/998-openwrt_lzma_options.patch
@ -1,6 +1,6 @@
 --- a/scripts/Makefile.lib
 +++ b/scripts/Makefile.lib
-@@ -228,7 +228,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
+@@ -228,7 +228,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) 
 
 quiet_cmd_lzma = LZMA    $@
 cmd_lzma = (cat $(filter-out FORCE,$^) | \
--- a/target/linux/generic/patches-2.6.34/014-cfi_fix_amd_extended_table_check.patch
+++ b/target/linux/generic/patches-2.6.34/014-cfi_fix_amd_extended_table_check.patch
@ -1,6 +1,6 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -325,6 +325,8 @@ static struct cfi_fixup fixup_table[] =
+@@ -325,6 +325,8 @@ static struct cfi_fixup fixup_table[] = 
 static void cfi_fixup_major_minor(struct cfi_private *cfi,
 				  struct cfi_pri_amdstd *extp)
 {
@ -9,7 +9,7 @@
 	if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
 	    extp->MajorVersion == '0')
 		extp->MajorVersion = '1';
-@@ -355,6 +357,9 @@ struct mtd_info *cfi_cmdset_0002(struct
+@@ -355,6 +357,9 @@ struct mtd_info *cfi_cmdset_0002(struct 
 	mtd->name    = map->name;
 	mtd->writesize = 1;
 
@ -19,7 +19,7 @@
 	if (cfi->cfi_mode==CFI_MODE_CFI){
 		unsigned char bootloc;
 		/*
-@@ -373,16 +378,24 @@ struct mtd_info *cfi_cmdset_0002(struct
+@@ -373,16 +378,24 @@ struct mtd_info *cfi_cmdset_0002(struct 
 
 		cfi_fixup_major_minor(cfi, extp);
 
--- a/target/linux/generic/patches-2.6.34/020-mips_multi_machine_support.patch
+++ b/target/linux/generic/patches-2.6.34/020-mips_multi_machine_support.patch
@ -176,7 +176,7 @@
 
 unsigned int vced_count, vcei_count;
 
-@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file
+@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file 
 	/*
 	 * For the first processor also print the system type
 	 */
--- a/target/linux/generic/patches-2.6.34/100-netfilter_layer7_2.21.patch
+++ b/target/linux/generic/patches-2.6.34/100-netfilter_layer7_2.21.patch
@ -71,7 +71,7 @@
 	depends on NETFILTER_ADVANCED
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
-@@ -90,6 +90,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)
+@@ -90,6 +90,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) 
 obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
--- a/target/linux/generic/patches-2.6.34/110-netfilter_match_speedup.patch
+++ b/target/linux/generic/patches-2.6.34/110-netfilter_match_speedup.patch
@ -127,11 +127,10 @@
 
 		e = (struct ipt_entry *)(loc_cpu_entry + off);
 		if (copy_to_user(userptr + off
-@@ -1000,6 +1040,14 @@ copy_entries_to_user(unsigned int total_
- 			ret = -EFAULT;
+@@ -1001,6 +1041,14 @@ copy_entries_to_user(unsigned int total_
 			goto free_counters;
 		}
-+
+ 
 +		flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
 +		if (copy_to_user(userptr + off
 +				 + offsetof(struct ipt_entry, ip.flags),
@ -139,6 +138,7 @@
 +			ret = -EFAULT;
 +			goto free_counters;
 +		}
- 
+
 		for (i = sizeof(struct ipt_entry);
 		     i < e->target_offset;
+ 		     i += m->u.match_size) {
--- a/target/linux/generic/patches-2.6.34/150-netfilter_imq.patch
+++ b/target/linux/generic/patches-2.6.34/150-netfilter_imq.patch
--- a/target/linux/generic/patches-2.6.34/180-netfilter_depends.patch
+++ b/target/linux/generic/patches-2.6.34/180-netfilter_depends.patch
@ -8,7 +8,7 @@
 	depends on NETFILTER_ADVANCED
 	help
 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -530,7 +529,6 @@ config NETFILTER_XT_TARGET_SECMARK
+@@ -518,7 +517,6 @@ config NETFILTER_XT_TARGET_SECMARK
 
 config NETFILTER_XT_TARGET_TCPMSS
 	tristate '"TCPMSS" target support'
--- a/target/linux/generic/patches-2.6.34/202-mips_mem_functions_performance.patch
+++ b/target/linux/generic/patches-2.6.34/202-mips_mem_functions_performance.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/include/asm/string.h
 +++ b/arch/mips/include/asm/string.h
-@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__
+@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__ 
 
 #define __HAVE_ARCH_MEMSET
 extern void *memset(void *__s, int __c, size_t __count);
--- a/target/linux/generic/patches-2.6.34/203-slab_maxsize.patch
+++ b/target/linux/generic/patches-2.6.34/203-slab_maxsize.patch
@ -1,6 +1,6 @@
 --- a/include/linux/slab.h
 +++ b/include/linux/slab.h
-@@ -130,8 +130,8 @@ int kmem_ptr_validate(struct kmem_cache
+@@ -130,8 +130,8 @@ int kmem_ptr_validate(struct kmem_cache 
  * to do various tricks to work around compiler limitations in order to
  * ensure proper constant folding.
  */
--- a/target/linux/generic/patches-2.6.34/205-skb_padding.patch
+++ b/target/linux/generic/patches-2.6.34/205-skb_padding.patch
@ -1,6 +1,6 @@
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -1372,11 +1372,18 @@ static inline int skb_network_offset(con
+@@ -1353,11 +1353,18 @@ static inline int skb_network_offset(con
  *
  * Various parts of the networking layer expect at least 32 bytes of
  * headroom, you should not reduce this.
@ -19,7 +19,7 @@
 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
 
 static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
-@@ -1466,9 +1473,9 @@ static inline void __skb_queue_purge(str
+@@ -1447,9 +1454,9 @@ static inline void __skb_queue_purge(str
 static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
 					      gfp_t gfp_mask)
 {
@ -31,7 +31,7 @@
 	return skb;
 }
 
-@@ -1551,7 +1558,7 @@ static inline int __skb_cow(struct sk_bu
+@@ -1532,7 +1539,7 @@ static inline int __skb_cow(struct sk_bu
 		delta = headroom - skb_headroom(skb);
 
 	if (delta || cloned)
@ -42,7 +42,7 @@
 }
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c
-@@ -339,9 +339,9 @@ struct sk_buff *__netdev_alloc_skb(struc
+@@ -259,9 +259,9 @@ struct sk_buff *__netdev_alloc_skb(struc
 	int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1;
 	struct sk_buff *skb;
 
--- a/target/linux/generic/patches-2.6.34/210-mini_fo_2.6.25_fixes.patch
+++ b/target/linux/generic/patches-2.6.34/210-mini_fo_2.6.25_fixes.patch
@ -61,7 +61,7 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
 
-@@ -501,6 +505,29 @@ static inline void double_unlock(struct
+@@ -501,6 +505,29 @@ static inline void double_unlock(struct 
 #endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
 #endif /* __KERNEL__ */
 
@ -127,7 +127,7 @@
 #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
 --- a/fs/mini_fo/aux.c
 +++ b/fs/mini_fo/aux.c
-@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb,
+@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb, 
 	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
 
 	/* validate */
--- a/target/linux/generic/patches-2.6.34/212-mini_fo_2.6.26_fixes.patch
+++ b/target/linux/generic/patches-2.6.34/212-mini_fo_2.6.26_fixes.patch
@ -1,6 +1,6 @@
 --- a/fs/mini_fo/super.c
 +++ b/fs/mini_fo/super.c
-@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int
+@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int 
 #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
 
 
--- a/target/linux/generic/patches-2.6.34/223-kobject-add-broadcast_uevent.patch
+++ b/target/linux/generic/patches-2.6.34/223-kobject-add-broadcast_uevent.patch
@ -20,7 +20,7 @@
 #else
 static inline int kobject_uevent(struct kobject *kobj,
 				 enum kobject_action action)
-@@ -224,6 +230,16 @@ static inline int add_uevent_var(struct
+@@ -224,6 +230,16 @@ static inline int add_uevent_var(struct 
 static inline int kobject_action_type(const char *buf, size_t count,
 				      enum kobject_action *type)
 { return -EINVAL; }
--- a/target/linux/generic/patches-2.6.34/280-sched_act_connmark.patch
+++ b/target/linux/generic/patches-2.6.34/280-sched_act_connmark.patch
@ -140,7 +140,7 @@
 +module_exit(connmark_cleanup_module);
 --- a/net/sched/Kconfig
 +++ b/net/sched/Kconfig
-@@ -549,6 +549,18 @@
+@@ -549,6 +549,18 @@ config NET_ACT_SKBEDIT
 	  To compile this code as a module, choose M here: the
 	  module will be called act_skbedit.
 
@ -161,7 +161,7 @@
 	depends on NET_CLS_U32 || NET_CLS_FW
 --- a/net/sched/Makefile
 +++ b/net/sched/Makefile
-@@ -15,6 +15,7 @@
+@@ -15,6 +15,7 @@ obj-$(CONFIG_NET_ACT_NAT)	+= act_nat.o
 obj-$(CONFIG_NET_ACT_PEDIT)	+= act_pedit.o
 obj-$(CONFIG_NET_ACT_SIMP)	+= act_simple.o
 obj-$(CONFIG_NET_ACT_SKBEDIT)	+= act_skbedit.o
--- a/target/linux/generic/patches-2.6.34/400-ledtrig_morse.patch
+++ b/target/linux/generic/patches-2.6.34/400-ledtrig_morse.patch
@ -11,7 +11,7 @@
 endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -46,3 +46,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+=
+@@ -46,3 +46,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= 
 obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= ledtrig-backlight.o
 obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
 obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
--- a/target/linux/generic/patches-2.6.34/402-ledtrig_netdev.patch
+++ b/target/linux/generic/patches-2.6.34/402-ledtrig_netdev.patch
@ -14,7 +14,7 @@
 endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -47,3 +47,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+=
+@@ -47,3 +47,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= 
 obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
 obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
 obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
--- a/target/linux/generic/patches-2.6.34/511-yaffs-cvs-2009-04-24.patch
+++ b/target/linux/generic/patches-2.6.34/511-yaffs-cvs-2009-04-24.patch
@ -601,7 +601,7 @@
 			dev->checkpointBlockList[i] = -1;
 	}
 
-@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device
+@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device 
 
 static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
 {
@ -926,7 +926,7 @@
 {
 	unsigned char cDelta;	/* column parity delta */
 	unsigned lDelta;	/* line parity delta */
-@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char
+@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char 
 		return 0; /* no error */
 
 	if (lDelta == ~lDeltaPrime &&
@ -936,7 +936,7 @@
 		/* Single bit (recoverable) error in data */
 
 		bit = 0;
-@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char
+@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char 
 		if (cDelta & 0x02)
 			bit |= 0x01;
 
@ -945,7 +945,7 @@
 			return -1;
 
 		data[lDelta] ^= (1 << bit);
-@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char
+@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char 
 	}
 
 	if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
@ -954,7 +954,7 @@
 		/* Reccoverable error in ecc */
 
 		*read_ecc = *test_ecc;
-@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char
+@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char 
 	/* Unrecoverable error */
 
 	return -1;
@ -1398,7 +1398,7 @@
 {
 	unsigned char *alias;
 	int ret;
-@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry
+@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry 
 	return ret;
 }
 
@ -1560,7 +1560,7 @@
 static int yaffs_file_flush(struct file *file, fl_owner_t id)
 #else
 static int yaffs_file_flush(struct file *file)
-@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file
+@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file 
 	yaffs_Device *dev = obj->myDev;
 
 	T(YAFFS_TRACE_OS,
@ -1571,7 +1571,7 @@
 
 	yaffs_GrossLock(dev);
 
-@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct
+@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct 
 
 	yaffs_Device *dev;
 
@ -1591,7 +1591,7 @@
 	BUG_ON(!PageLocked(pg));
 #else
 	if (!PageLocked(pg))
-@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct
+@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct 
 
 	yaffs_GrossLock(dev);
 
@ -1604,7 +1604,7 @@
 
 	yaffs_GrossUnlock(dev);
 
-@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct
+@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct 
 	flush_dcache_page(pg);
 	kunmap(pg);
 
@ -3193,7 +3193,7 @@
 		if (n < step) {
 			n++;
 			continue;
-@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file
+@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file 
 	char *end;
 	char *mask_name;
 	const char *x;
@ -3202,7 +3202,7 @@
 	int i;
 	int done = 0;
 	int add, len = 0;
-@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file
+@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file 
 
 	while (!done && (pos < count)) {
 		done = 1;
@ -3213,7 +3213,7 @@
 
 		switch (buf[pos]) {
 		case '+':
-@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file
+@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file 
 		mask_name = NULL;
 
 		mask_bitfield = simple_strtoul(buf + pos, &end, 0);
@ -3240,7 +3240,7 @@
 					mask_name = mask_flags[i].mask_name;
 					mask_bitfield = mask_flags[i].mask_bitfield;
 					done = 0;
-@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file
+@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file 
 
 		if (mask_name != NULL) {
 			done = 0;
@ -3249,7 +3249,7 @@
 			case '-':
 				rg &= ~mask_bitfield;
 				break;
-@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file
+@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file 
 
 	yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS;
 
@ -5691,7 +5691,7 @@
 {
 	/* Get the real object in case we were fed a hard link as an equivalent object */
 	equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
-@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object *
+@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object * 
 
 }
 
@ -7622,7 +7622,7 @@
 	int nToCopy;
 	int n = nBytes;
 	int nDone = 0;
-@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object
+@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object 
 	dev = in->myDev;
 
 	while (n > 0) {
@ -7657,7 +7657,7 @@
 			if (dev->nShortOpCaches > 0) {
 
 				/* If we can't find the data in the cache, then load it up. */
-@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object
+@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object 
 
 				cache->locked = 1;
 
@ -7673,7 +7673,7 @@
 				cache->locked = 0;
 			} else {
 				/* Read into the local buffer then copy..*/
-@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object
+@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object 
 				    yaffs_GetTempBuffer(dev, __LINE__);
 				yaffs_ReadChunkDataFromObject(in, chunk,
 							      localBuffer);
@ -7718,7 +7718,7 @@
 		}
 
 		n -= nToCopy;
-@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object
+@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object 
 	return nDone;
 }
 
@ -7923,7 +7923,7 @@
 	int newFullChunks;
 
 	yaffs_Device *dev = in->myDev;
-@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in,
+@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in, 
 
 	yaffs_CheckGarbageCollection(dev);
 
@ -7941,7 +7941,7 @@
 
 	if (newSize < oldFileSize) {
 
-@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in,
+@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in, 
 	}
 
 
@ -7968,7 +7968,7 @@
 {
 	obj = yaffs_GetEquivalentObject(obj);
 
-@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object *
+@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object * 
 
 
 
@ -9789,7 +9789,7 @@
 {
 	int init_failed = 0;
 	unsigned x;
-@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device * 
 	dev->chunkOffset = 0;
 	dev->nFreeChunks = 0;
 
@ -9798,7 +9798,7 @@
 	if (dev->startBlock == 0) {
 		dev->internalStartBlock = dev->startBlock + 1;
 		dev->internalEndBlock = dev->endBlock + 1;
-@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device * 
 
 	/* Check geometry parameters. */
 
@ -9823,7 +9823,7 @@
 		return YAFFS_FAIL;
 	}
 
-@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device * 
 		return YAFFS_FAIL;
 	}
 
@ -9836,7 +9836,7 @@
 	/* Got the right mix of functions? */
 	if (!yaffs_CheckDevFunctions(dev)) {
 		/* Function missing */
-@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device * 
 
 	dev->isMounted = 1;
 
@ -9875,7 +9875,7 @@
 
 	/*
 	 * Calculate chunkGroupBits.
-@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device * 
 	bits = ShiftsGE(x);
 
 	/* Set up tnode width if wide tnodes are enabled. */
@ -9896,7 +9896,7 @@
 		dev->tnodeWidth = 16;
 
 	dev->tnodeMask = (1<<dev->tnodeWidth)-1;
-@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device * 
 	dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
 
 	/* Initialise temporary buffers and caches. */
@ -9905,7 +9905,7 @@
 		init_failed = 1;
 
 	dev->srCache = NULL;
-@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device * 
 	if (!init_failed &&
 	    dev->nShortOpCaches > 0) {
 		int i;
@ -9940,7 +9940,7 @@
 			init_failed = 1;
 
 		dev->srLastUse = 0;
-@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device * 
 
 	dev->cacheHits = 0;
 
@ -9979,7 +9979,7 @@
 				T(YAFFS_TRACE_ALWAYS,
 				  (TSTR("yaffs: restored from checkpoint" TENDSTR)));
 			} else {
-@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device * 
 				dev->nBackgroundDeletions = 0;
 				dev->oldestDirtySequence = 0;
 
@ -10011,7 +10011,7 @@
 		/* Clean up the mess */
 		T(YAFFS_TRACE_TRACING,
 		  (TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR)));
-@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device * 
 
 }
 
@ -10710,7 +10710,7 @@
 {
 	if (etags) {
 		memset(etags, 0, sizeof(*etags));
-@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags *
+@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags * 
  * Returns YAFFS_OK or YAFFS_FAIL.
  */
 int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
@ -11038,14 +11038,14 @@
 +			yaffs_UnpackTags2(tags, &pt);
 +		}
 +	}
-+
+ 
+-	if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
+-		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
 +	if (localData)
 +		yaffs_ReleaseTempBuffer(dev, data, __LINE__);
 
-	if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
 +	if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
- 		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
-
+		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
 	if (retval == 0)
 		return YAFFS_OK;
 	else
--- a/target/linux/generic/patches-2.6.34/903-hostap_txpower.patch
+++ b/target/linux/generic/patches-2.6.34/903-hostap_txpower.patch
@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/hostap/hostap_ap.c
 +++ b/drivers/net/wireless/hostap/hostap_ap.c
-@@ -2336,13 +2336,13 @@ int prism2_ap_get_sta_qual(local_info_t
+@@ -2336,13 +2336,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)
--- a/target/linux/generic/patches-2.6.34/971-ocf_20100325.patch
+++ b/target/linux/generic/patches-2.6.34/971-ocf_20100325.patch
@ -24,7 +24,7 @@
  * All of these routines try to estimate how many bits of randomness a
  * particular randomness source.  They do this by keeping track of the
  * first and second order deltas of the event timings.
-@@ -714,6 +724,61 @@ void add_disk_randomness(struct gendisk
+@@ -714,6 +724,61 @@ void add_disk_randomness(struct gendisk 
 }
 #endif
 
--- a/target/linux/generic/patches-2.6.34/975-ssb_update.patch
+++ b/target/linux/generic/patches-2.6.34/975-ssb_update.patch
@ -385,7 +385,7 @@
 	u32 pmucap;
 
 	if (!(cc->capabilities & SSB_CHIPCO_CAP_PMU))
-@@ -516,15 +516,12 @@ void ssb_pmu_init(struct ssb_chipcommon
+@@ -516,15 +516,12 @@ void ssb_pmu_init(struct ssb_chipcommon 
 	ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n",
 		    cc->pmu.rev, pmucap);
 
--- a/target/linux/generic/patches-2.6.34/998-openwrt_lzma_options.patch
+++ b/target/linux/generic/patches-2.6.34/998-openwrt_lzma_options.patch
@ -1,6 +1,6 @@
 --- a/scripts/Makefile.lib
 +++ b/scripts/Makefile.lib
-@@ -238,7 +238,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
+@@ -238,7 +238,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) 
 
 quiet_cmd_lzma = LZMA    $@
 cmd_lzma = (cat $(filter-out FORCE,$^) | \
--- a/target/linux/generic/patches-2.6.35/014-cfi_fix_amd_extended_table_check.patch
+++ b/target/linux/generic/patches-2.6.35/014-cfi_fix_amd_extended_table_check.patch
@ -1,6 +1,6 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -372,6 +372,8 @@ static struct cfi_fixup fixup_table[] =
+@@ -372,6 +372,8 @@ static struct cfi_fixup fixup_table[] = 
 static void cfi_fixup_major_minor(struct cfi_private *cfi,
 				  struct cfi_pri_amdstd *extp)
 {
@ -9,7 +9,7 @@
 	if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
 	    extp->MajorVersion == '0')
 		extp->MajorVersion = '1';
-@@ -404,6 +406,9 @@ struct mtd_info *cfi_cmdset_0002(struct
+@@ -404,6 +406,9 @@ struct mtd_info *cfi_cmdset_0002(struct 
 
 	mtd->reboot_notifier.notifier_call = cfi_amdstd_reboot;
 
@ -19,7 +19,7 @@
 	if (cfi->cfi_mode==CFI_MODE_CFI){
 		unsigned char bootloc;
 		__u16 adr = primary?cfi->cfiq->P_ADR:cfi->cfiq->A_ADR;
-@@ -417,16 +422,24 @@ struct mtd_info *cfi_cmdset_0002(struct
+@@ -417,16 +422,24 @@ struct mtd_info *cfi_cmdset_0002(struct 
 			 */
 			cfi_fixup_major_minor(cfi, extp);
 
--- a/target/linux/generic/patches-2.6.35/020-mips_multi_machine_support.patch
+++ b/target/linux/generic/patches-2.6.35/020-mips_multi_machine_support.patch
@ -176,7 +176,7 @@
 
 unsigned int vced_count, vcei_count;
 
-@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file
+@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file 
 	/*
 	 * For the first processor also print the system type
 	 */
--- a/target/linux/generic/patches-2.6.35/040-arm-update-mach-types.patch
+++ b/target/linux/generic/patches-2.6.35/040-arm-update-mach-types.patch
@ -81,7 +81,7 @@
 htc_excalibur_s620	MACH_HTC_EXCALIBUR_S620	HTC_EXCALIBUR_S620	2391
 htc_opal		MACH_HTC_OPAL		HTC_OPAL		2392
 touchbook		MACH_TOUCHBOOK		TOUCHBOOK		2393
-@@ -2446,7 +2446,7 @@ siogentoo1		MACH_SIOGENTOO1		SIOGENTOO1
+@@ -2446,7 +2446,7 @@ siogentoo1		MACH_SIOGENTOO1		SIOGENTOO1	
 siogentoo2		MACH_SIOGENTOO2		SIOGENTOO2		2459
 sm3k			MACH_SM3K		SM3K			2460
 acer_tempo_f900		MACH_ACER_TEMPO_F900	ACER_TEMPO_F900		2461
--- a/target/linux/generic/patches-2.6.35/065-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.35/065-rootfs_split.patch
@ -554,7 +554,7 @@
 
 #include <asm/uaccess.h>
 
-@@ -826,6 +827,13 @@ static int mtd_ioctl(struct file *file,
+@@ -826,6 +827,13 @@ static int mtd_ioctl(struct file *file, 
 		file->f_pos = 0;
 		break;
 	}
--- a/target/linux/generic/patches-2.6.35/100-netfilter_layer7_2.21.patch
+++ b/target/linux/generic/patches-2.6.35/100-netfilter_layer7_2.21.patch
@ -71,7 +71,7 @@
 	depends on NETFILTER_ADVANCED
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
-@@ -91,6 +91,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)
+@@ -91,6 +91,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) 
 obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
--- a/target/linux/generic/patches-2.6.35/110-netfilter_match_speedup.patch
+++ b/target/linux/generic/patches-2.6.35/110-netfilter_match_speedup.patch
@ -132,11 +132,10 @@
 
 		e = (struct ipt_entry *)(loc_cpu_entry + off);
 		if (copy_to_user(userptr + off
-@@ -979,6 +1020,14 @@ copy_entries_to_user(unsigned int total_
- 			ret = -EFAULT;
+@@ -980,6 +1021,14 @@ copy_entries_to_user(unsigned int total_
 			goto free_counters;
 		}
-+
+ 
 +		flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
 +		if (copy_to_user(userptr + off
 +				 + offsetof(struct ipt_entry, ip.flags),
@ -144,6 +143,7 @@
 +			ret = -EFAULT;
 +			goto free_counters;
 +		}
- 
+
 		for (i = sizeof(struct ipt_entry);
 		     i < e->target_offset;
+ 		     i += m->u.match_size) {
--- a/target/linux/generic/patches-2.6.35/150-netfilter_imq.patch
+++ b/target/linux/generic/patches-2.6.35/150-netfilter_imq.patch
--- a/target/linux/generic/patches-2.6.35/180-netfilter_depends.patch
+++ b/target/linux/generic/patches-2.6.35/180-netfilter_depends.patch
@ -8,7 +8,7 @@
 	depends on NETFILTER_ADVANCED
 	help
 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -562,7 +561,6 @@ config NETFILTER_XT_TARGET_SECMARK
+@@ -550,7 +549,6 @@ config NETFILTER_XT_TARGET_SECMARK
 
 config NETFILTER_XT_TARGET_TCPMSS
 	tristate '"TCPMSS" target support'
--- a/target/linux/generic/patches-2.6.35/202-mips_mem_functions_performance.patch
+++ b/target/linux/generic/patches-2.6.35/202-mips_mem_functions_performance.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/include/asm/string.h
 +++ b/arch/mips/include/asm/string.h
-@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__
+@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__ 
 
 #define __HAVE_ARCH_MEMSET
 extern void *memset(void *__s, int __c, size_t __count);
--- a/target/linux/generic/patches-2.6.35/203-slab_maxsize.patch
+++ b/target/linux/generic/patches-2.6.35/203-slab_maxsize.patch
@ -1,6 +1,6 @@
 --- a/include/linux/slab.h
 +++ b/include/linux/slab.h
-@@ -130,8 +130,8 @@ int kmem_ptr_validate(struct kmem_cache
+@@ -130,8 +130,8 @@ int kmem_ptr_validate(struct kmem_cache 
  * to do various tricks to work around compiler limitations in order to
  * ensure proper constant folding.
  */
--- a/target/linux/generic/patches-2.6.35/210-mini_fo_2.6.25_fixes.patch
+++ b/target/linux/generic/patches-2.6.35/210-mini_fo_2.6.25_fixes.patch
@ -61,7 +61,7 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
 
-@@ -501,6 +505,29 @@ static inline void double_unlock(struct
+@@ -501,6 +505,29 @@ static inline void double_unlock(struct 
 #endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
 #endif /* __KERNEL__ */
 
@ -127,7 +127,7 @@
 #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
 --- a/fs/mini_fo/aux.c
 +++ b/fs/mini_fo/aux.c
-@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb,
+@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb, 
 	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
 
 	/* validate */
--- a/target/linux/generic/patches-2.6.35/212-mini_fo_2.6.26_fixes.patch
+++ b/target/linux/generic/patches-2.6.35/212-mini_fo_2.6.26_fixes.patch
@ -1,6 +1,6 @@
 --- a/fs/mini_fo/super.c
 +++ b/fs/mini_fo/super.c
-@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int
+@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int 
 #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
 
 
--- a/Show More
+++ b/Show More