update to latest linux kernels, remove old ones

85 files changed, 35 insertions, 23149 deletions

diff --git a/target/linux/config/Config.in.ipvs b/target/linux/config/Config.in.ipvs
index 1a5fbd063..b7ed817b6 100644
--- a/target/linux/config/Config.in.ipvs
+++ b/target/linux/config/Config.in.ipvs
@@ -4,6 +4,7 @@ config ADK_KPACKAGE_KMOD_IP_VS
 	prompt "kmod-ip-vs............................ IPVS support"
 	tristate
 	select ADK_KERNEL_NETFILTER
+	select ADK_KPACKAGE_KMOD_NF_CONNTRACK
 	default n
 
 config ADK_KERNEL_IP_VS_DEBUG
diff --git a/target/linux/config/Config.in.netfilter.core b/target/linux/config/Config.in.netfilter.core
index 964b71c37..21e4c0da6 100644
--- a/target/linux/config/Config.in.netfilter.core
+++ b/target/linux/config/Config.in.netfilter.core
@@ -1,3 +1,9 @@
+config ADK_KPACKAGE_KMOD_NETFILTER_NETLINK_LOG
+	tristate 'Netfilter LOG over NFNETLINK interface'
+	help
+	  If this option is enabled, the kernel will include support                                                                                        
+	  for logging packets via NFNETLINK.
+
 config ADK_KPACKAGE_KMOD_NF_CONNTRACK
 	tristate 'Netfilter connection tracking support'
 	select ADK_KERNEL_NETFILTER_XTABLES
@@ -55,6 +61,13 @@ config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_NFQUEUE
 	  As opposed to QUEUE, it supports 65535 different queues,
 	  not just one.
 
+config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_LOG
+	tristate 'LOG target support'
+	depends on ADK_KPACKAGE_KMOD_IP_NF_FILTER
+	help
+	  This option adds a `LOG' target, which allows you to create rules in
+	  any iptables table which records the packet header to the syslog.
+
 config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_TCPMSS
 	tristate 'TCPMSS target'
 	select ADK_KERNEL_NETFILTER_XTABLES
diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4
index 1a1e91daf..ff3c1515d 100644
--- a/target/linux/config/Config.in.netfilter.ip4
+++ b/target/linux/config/Config.in.netfilter.ip4
@@ -60,13 +60,6 @@ config ADK_KPACKAGE_KMOD_IP_NF_TARGET_REJECT
 	  error should be issued in response to an incoming packet, rather
 	  than silently being dropped.
 
-config ADK_KPACKAGE_KMOD_IP_NF_TARGET_LOG
-	tristate 'LOG target support'
-	depends on ADK_KPACKAGE_KMOD_IP_NF_FILTER
-	help
-	  This option adds a `LOG' target, which allows you to create rules in
-	  any iptables table which records the packet header to the syslog.
-
 config ADK_KPACKAGE_KMOD_IP_NF_TARGET_ULOG
 	tristate 'ULOG target support (ipv4 only)'
 	depends on ADK_KPACKAGE_KMOD_IP_NF_FILTER
diff --git a/target/linux/config/Config.in.netfilter.ip6 b/target/linux/config/Config.in.netfilter.ip6
index cb9700cbd..2138354eb 100644
--- a/target/linux/config/Config.in.netfilter.ip6
+++ b/target/linux/config/Config.in.netfilter.ip6
@@ -84,13 +84,6 @@ config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_RT
 	  To compile it as a module, choose M here.  If unsure, say N.
 
 # The targets
-config ADK_KPACKAGE_KMOD_IP6_NF_TARGET_LOG
-	tristate "LOG target support"
-	help
-	  This option adds a `LOG' target, which allows you to create rules in
-	  any iptables table which records the packet header to the syslog.
-
-	  To compile it as a module, choose M here.  If unsure, say N.
 
 config ADK_KPACKAGE_KMOD_IP6_NF_FILTER
 	tristate "Packet filtering"
diff --git a/target/linux/patches/3.0.34/brcm.patch b/target/linux/patches/3.0.34/brcm.patch
deleted file mode 100644
index 548d26068..000000000
--- a/target/linux/patches/3.0.34/brcm.patch
+++ /dev/null
@@ -1,465 +0,0 @@
-diff -Nur linux-2.6.39.4.orig/arch/mips/Kconfig linux-2.6.39.4/arch/mips/Kconfig
---- linux-2.6.39.4.orig/arch/mips/Kconfig	2011-08-03 21:43:28.000000000 +0200
-+++ linux-2.6.39.4/arch/mips/Kconfig	2012-06-02 20:35:49.000000000 +0200
-@@ -103,6 +103,12 @@
- 	select GENERIC_GPIO
- 	select SYS_HAS_EARLY_PRINTK
- 	select CFE
-+	select SYS_SUPPORTS_ZBOOT_UART16550
-+	select HAVE_KERNEL_GZIP
-+        select HAVE_KERNEL_BZIP2
-+        select HAVE_KERNEL_LZMA
-+        select HAVE_KERNEL_XZ
-+        select HAVE_KERNEL_LZO
- 	help
- 	 Support for BCM47XX based boards
- 
-diff -Nur linux-2.6.39.4.orig/arch/mips/Makefile linux-2.6.39.4/arch/mips/Makefile
---- linux-2.6.39.4.orig/arch/mips/Makefile	2011-08-03 21:43:28.000000000 +0200
-+++ linux-2.6.39.4/arch/mips/Makefile	2012-06-02 20:35:49.000000000 +0200
-@@ -76,6 +76,7 @@
- all-$(CONFIG_BOOT_ELF32)	:= $(vmlinux-32)
- all-$(CONFIG_BOOT_ELF64)	:= $(vmlinux-64)
- all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlinuz
-+all-$(CONFIG_BCM47XX)		+= vmlinuz.elf
- 
- #
- # GCC uses -G 0 -mabicalls -fpic as default.  We don't want PIC in the kernel
-@@ -276,7 +277,7 @@
- 	$(Q)$(MAKE) $(build)=arch/mips/boot VMLINUX=$(vmlinux-32) arch/mips/boot/$@
- 
- # boot/compressed
--vmlinuz vmlinuz.bin vmlinuz.ecoff vmlinuz.srec: $(vmlinux-32) FORCE
-+vmlinuz vmlinuz.bin vmlinuz.ecoff vmlinuz.srec vmlinuz.elf: $(vmlinux-32) FORCE
- 	$(Q)$(MAKE) $(build)=arch/mips/boot/compressed \
- 	   VMLINUX_LOAD_ADDRESS=$(load-y) 32bit-bfd=$(32bit-bfd) $@
- 
-@@ -313,6 +314,7 @@
- 	echo '  vmlinuz.ecoff        - ECOFF zboot image'
- 	echo '  vmlinuz.bin          - Raw binary zboot image'
- 	echo '  vmlinuz.srec         - SREC zboot image'
-+	echo '  vmlinuz.elf          - ELF self-relocating zboot image'
- 	echo
- 	echo '  These will be default as appropriate for a configured platform.'
- endef
-diff -Nur linux-2.6.39.4.orig/arch/mips/bcm47xx/Makefile linux-2.6.39.4/arch/mips/bcm47xx/Makefile
---- linux-2.6.39.4.orig/arch/mips/bcm47xx/Makefile	2011-08-03 21:43:28.000000000 +0200
-+++ linux-2.6.39.4/arch/mips/bcm47xx/Makefile	2012-06-02 20:35:49.000000000 +0200
-@@ -3,4 +3,4 @@
- # under Linux.
- #
- 
--obj-y := gpio.o irq.o nvram.o prom.o serial.o setup.o time.o wgt634u.o
-+obj-y := gpio.o irq.o nvram.o prom.o serial.o setup.o time.o platform.o
-diff -Nur linux-2.6.39.4.orig/arch/mips/bcm47xx/platform.c linux-2.6.39.4/arch/mips/bcm47xx/platform.c
---- linux-2.6.39.4.orig/arch/mips/bcm47xx/platform.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.39.4/arch/mips/bcm47xx/platform.c	2012-06-02 20:35:49.000000000 +0200
-@@ -0,0 +1,146 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 2010, 2011 Waldemar Brodkorb <wbx@openadk.org>
-+ * Copyright © 2007, 2011 Thorsten Glaser <tg@freewrt.org>
-+ */
-+
-+#include <linux/platform_device.h>
-+#include <linux/module.h>
-+#include <linux/mtd/physmap.h>
-+#include <linux/ssb/ssb.h>
-+
-+#include <asm/mach-bcm47xx/bcm47xx.h>
-+#include <asm/mach-bcm47xx/nvram.h>
-+
-+#define CFGFS_FLASH_SIZE (128 * 1024)
-+
-+static struct mtd_partition bcm47xx_partitions[] = {
-+#define SLOT_CFE 0
-+	{
-+		.name       = "cfe",
-+		.offset     = 0,
-+		.size       = BCM47XX_OVERRIDE_CFESIZE,
-+		.mask_flags = MTD_WRITEABLE		/* force read-only */
-+	},
-+#define SLOT_LINUX 1
-+	{
-+		.name   = "linux",
-+		.offset = 0,
-+		.size   = 0,
-+	},
-+#define SLOT_ROOTFS 2
-+	{
-+		.name   = "rootfs",
-+		.offset = 0,
-+		.size   = 0,
-+	},
-+#define SLOT_CFGFS 3
-+	{
-+		.name   = "cfgfs",
-+		.offset = 0,
-+		.size   = 0,
-+	},
-+#define SLOT_NVRAM 4
-+	{
-+		.name   = "nvram",
-+		.offset = 0,
-+		.size   = 0,
-+	},
-+};
-+
-+static struct physmap_flash_data bcm47xx_flash_data = {
-+	.parts    = bcm47xx_partitions,
-+	.nr_parts = ARRAY_SIZE(bcm47xx_partitions)
-+};
-+
-+static struct resource bcm47xx_flash_resource = {
-+	.flags = IORESOURCE_MEM,
-+};
-+
-+static struct platform_device bcm47xx_flash = {
-+	.name          = "physmap-flash",
-+	.id            = 0,
-+	.dev           = { .platform_data = &bcm47xx_flash_data, },
-+	.resource      = &bcm47xx_flash_resource,
-+	.num_resources = 1,
-+};
-+
-+static struct platform_device *bcm47xx_devices[] __initdata = {
-+	&bcm47xx_flash,
-+};
-+
-+struct bcm47xx_trx_header {
-+#define BCM47XX_TRX_MAGIC 0x30524448
-+	u32 magic;
-+	u32 len;
-+	u32 crc32;
-+	u32 flag_version;
-+	u32 offsets[3];
-+};
-+
-+#define UPTODOWN(slot, psize) do {			\
-+	posn -= psize; left -= psize;			\
-+	bcm47xx_partitions[slot].offset = posn;		\
-+	bcm47xx_partitions[slot].size = psize;		\
-+} while (/* CONSTCOND */ 0)
-+
-+static int __init bcm47xx_register_devices(void)
-+{
-+	u32 flash_size;
-+	size_t left, posn;
-+	struct ssb_mipscore *mcore = &ssb_bcm47xx.mipscore;
-+	struct bcm47xx_trx_header *trx_hdr;
-+
-+	trx_hdr = (void *)KSEG1ADDR(mcore->flash_window + BCM47XX_OVERRIDE_CFESIZE);
-+
-+	/* devices might have 2, 4 or 8 MB flash size */
-+#ifdef BCM47XX_OVERRIDE_FLASHSIZE
-+	flash_size = BCM47XX_OVERRIDE_FLASHSIZE;
-+	mcore->flash_window_size = flash_size;
-+#define BCM47XX_OVERRODE_FLASHSIZE " (overridden)"
-+#else
-+	flash_size = mcore->flash_window_size;
-+#define BCM47XX_OVERRODE_FLASHSIZE ""
-+#endif
-+	printk(KERN_INFO "FLASH SIZE%s: %x\n", BCM47XX_OVERRODE_FLASHSIZE,
-+		flash_size);
-+
-+	left = flash_size - BCM47XX_OVERRIDE_CFESIZE;
-+	posn = flash_size;
-+	UPTODOWN(SLOT_NVRAM, BCM47XX_OVERRIDE_NVRAMSIZE);
-+	UPTODOWN(SLOT_CFGFS, CFGFS_FLASH_SIZE);
-+	bcm47xx_partitions[SLOT_LINUX].offset = BCM47XX_OVERRIDE_CFESIZE;
-+	bcm47xx_partitions[SLOT_LINUX].size = left;
-+
-+	if (trx_hdr->magic == BCM47XX_TRX_MAGIC) {
-+		bcm47xx_partitions[SLOT_ROOTFS].offset =
-+		    bcm47xx_partitions[SLOT_LINUX].offset +
-+		    trx_hdr->offsets[1];
-+		bcm47xx_partitions[SLOT_ROOTFS].size =
-+		    bcm47xx_partitions[SLOT_LINUX].size -
-+		    trx_hdr->offsets[1];
-+	} else
-+		printk("bcm47xx/platform: no TRX header found\n");
-+
-+	printk(KERN_INFO "=== Flash map dump ===\n");
-+	for (posn = 0; posn < bcm47xx_flash_data.nr_parts; ++posn)
-+		printk(KERN_INFO " #%u %08X @%08X '%s'\n",
-+		    (unsigned int)posn,
-+		    (unsigned int)bcm47xx_partitions[posn].size,
-+		    (unsigned int)bcm47xx_partitions[posn].offset,
-+		    bcm47xx_partitions[posn].name);
-+	printk(KERN_INFO "=== Hope this works, have a nice day\n");
-+
-+	bcm47xx_flash_data.width = mcore->flash_buswidth;
-+	bcm47xx_flash_resource.start = mcore->flash_window;
-+	bcm47xx_flash_resource.end = mcore->flash_window
-+				   + mcore->flash_window_size
-+				   - 1;
-+	return platform_add_devices(bcm47xx_devices,
-+			    ARRAY_SIZE(bcm47xx_devices));
-+}
-+
-+device_initcall(bcm47xx_register_devices);
-diff -Nur linux-2.6.39.4.orig/arch/mips/boot/compressed/Makefile linux-2.6.39.4/arch/mips/boot/compressed/Makefile
---- linux-2.6.39.4.orig/arch/mips/boot/compressed/Makefile	2011-08-03 21:43:28.000000000 +0200
-+++ linux-2.6.39.4/arch/mips/boot/compressed/Makefile	2012-06-02 20:37:43.000000000 +0200
-@@ -44,6 +44,7 @@
- tool_$(CONFIG_KERNEL_BZIP2)   = bzip2
- tool_$(CONFIG_KERNEL_LZMA)    = lzma
- tool_$(CONFIG_KERNEL_LZO)     = lzo
-+tool_$(CONFIG_KERNEL_XZ)      = xzkern
- 
- targets += vmlinux.bin.z
- $(obj)/vmlinux.bin.z: $(obj)/vmlinux.bin FORCE
-@@ -58,8 +59,13 @@
- # Calculate the load address of the compressed kernel image
- hostprogs-y := calc_vmlinuz_load_addr
- 
-+ifdef CONFIG_BCM47XX
-+# XXX just after CFE, just pray the address is static
-+VMLINUZ_LO