From: Gabor Juhos Date: Wed, 23 May 2012 21:05:32 +0000 (+0000) Subject: kernel: update linux 3.3 to 3.3.7 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2ae5581447f1b9b9f324697384bed5d342fce063;p=openwrt%2Fstaging%2Fjow.git kernel: update linux 3.3 to 3.3.7 SVN-Revision: 31848 --- diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 145ee2b012..9ced644782 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -38,8 +38,8 @@ endif ifeq ($(LINUX_VERSION),3.2.16) LINUX_KERNEL_MD5SUM:=246e6bd28ea44c90ec66c7f8b56e4803 endif -ifeq ($(LINUX_VERSION),3.3.6) - LINUX_KERNEL_MD5SUM:=35f7f41aed080ca03995e06112182677 +ifeq ($(LINUX_VERSION),3.3.7) + LINUX_KERNEL_MD5SUM:=6709647a7576c9e21b082f4d3d7a94cf endif # disable the md5sum check for unknown kernel versions diff --git a/target/linux/adm5120/Makefile b/target/linux/adm5120/Makefile index e534dcf416..e4bd0dd249 100644 --- a/target/linux/adm5120/Makefile +++ b/target/linux/adm5120/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk BOARD:=adm5120 BOARDNAME:=Infineon/ADMtek ADM5120 -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 SUBTARGETS:=router_le router_be rb1xx INITRAMFS_EXTRA_FILES:= diff --git a/target/linux/adm8668/Makefile b/target/linux/adm8668/Makefile index b7d1d5fb04..6761544924 100644 --- a/target/linux/adm8668/Makefile +++ b/target/linux/adm8668/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Infineon WildPass ADM8668 FEATURES:=squashfs MAINTAINER:=Florian Fainelli -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini kmod-rt61-pci diff --git a/target/linux/amazon/Makefile b/target/linux/amazon/Makefile index dc0796b1b3..f503629055 100644 --- a/target/linux/amazon/Makefile +++ b/target/linux/amazon/Makefile @@ -10,7 +10,7 @@ ARCH:=mips BOARD:=amazon BOARDNAME:=Infineon Amazon FEATURES:=squashfs jffs2 broken -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile index 33ffef0803..eb2024df83 100644 --- a/target/linux/ar7/Makefile +++ b/target/linux/ar7/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=TI AR7 FEATURES:=squashfs jffs2 atm MAINTAINER:=Florian Fainelli -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index 49da9a39e5..227ae6168c 100644 --- a/target/linux/ar71xx/Makefile +++ b/target/linux/ar71xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs jffs2 targz CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves SUBTARGETS:=generic nand -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile index 05bafcd4e9..c18db95336 100644 --- a/target/linux/at91/Makefile +++ b/target/linux/at91/Makefile @@ -14,7 +14,7 @@ FEATURES:=squashfs jffs2 targz ext2 usb CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -fno-caller-saves SUBTARGETS:=9g20 9260 9263 -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 DEVICE_TYPE= include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/atheros/Makefile b/target/linux/atheros/Makefile index 60809360f3..12fe791ff9 100644 --- a/target/linux/atheros/Makefile +++ b/target/linux/atheros/Makefile @@ -11,7 +11,7 @@ BOARD:=atheros BOARDNAME:=Atheros AR231x/AR5312 FEATURES:=squashfs jffs2 -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile index 26ee6e4f38..4fc7708e0a 100644 --- a/target/linux/avr32/Makefile +++ b/target/linux/avr32/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Atmel AVR32 FEATURES:=squashfs MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile index 3cd5d1db50..076d57255f 100644 --- a/target/linux/brcm47xx/Makefile +++ b/target/linux/brcm47xx/Makefile @@ -11,7 +11,7 @@ BOARD:=brcm47xx BOARDNAME:=Broadcom BCM947xx/953xx FEATURES:=squashfs usb pcmcia -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini kmod-switch kmod-diag nvram diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile index 9072e9ba81..2fdd569571 100644 --- a/target/linux/brcm63xx/Makefile +++ b/target/linux/brcm63xx/Makefile @@ -10,7 +10,7 @@ ARCH:=mips BOARD:=brcm63xx BOARDNAME:=Broadcom BCM63xx FEATURES:=squashfs jffs2 usb atm pci pcmcia -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 MAINTAINER:=Florian Fainelli include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/cns21xx/Makefile b/target/linux/cns21xx/Makefile index a3c2d932c0..53dd8dcf3f 100644 --- a/target/linux/cns21xx/Makefile +++ b/target/linux/cns21xx/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Cavium Networks Econa CNS21xx FEATURES:=squashfs broken CFLAGS:=-Os -pipe -march=armv4 -mtune=fa526 -fno-caller-saves -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/gemini/Makefile b/target/linux/gemini/Makefile index 0a208839a1..8b84d8da4b 100644 --- a/target/linux/gemini/Makefile +++ b/target/linux/gemini/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs broken CFLAGS:=-Os -pipe -march=armv4 -mtune=fa526 -fno-caller-saves MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/generic/patches-3.3/046-fq_codel-qdisc-backlog.patch b/target/linux/generic/patches-3.3/046-fq_codel-qdisc-backlog.patch index 5fc75a0742..e8154b584a 100644 --- a/target/linux/generic/patches-3.3/046-fq_codel-qdisc-backlog.patch +++ b/target/linux/generic/patches-3.3/046-fq_codel-qdisc-backlog.patch @@ -20,11 +20,9 @@ Cc: Van Jacobson net/sched/sch_fq_codel.c | 5 +++-- 3 files changed, 12 insertions(+), 12 deletions(-) -diff --git a/include/net/codel.h b/include/net/codel.h -index 7546517..550debf 100644 --- a/include/net/codel.h +++ b/include/net/codel.h -@@ -205,7 +205,7 @@ static codel_time_t codel_control_law(codel_time_t t, +@@ -205,7 +205,7 @@ static codel_time_t codel_control_law(co static bool codel_should_drop(const struct sk_buff *skb, @@ -33,7 +31,7 @@ index 7546517..550debf 100644 struct codel_vars *vars, struct codel_params *params, struct codel_stats *stats, -@@ -219,13 +219,13 @@ static bool codel_should_drop(const struct sk_buff *skb, +@@ -219,13 +219,13 @@ static bool codel_should_drop(const stru } vars->ldelay = now - codel_get_enqueue_time(skb); @@ -49,7 +47,7 @@ index 7546517..550debf 100644 /* went below - stay below for at least interval */ vars->first_above_time = 0; return false; -@@ -249,8 +249,7 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch, +@@ -249,8 +249,7 @@ static struct sk_buff *codel_dequeue(str struct codel_params *params, struct codel_vars *vars, struct codel_stats *stats, @@ -59,7 +57,7 @@ index 7546517..550debf 100644 { struct sk_buff *skb = dequeue_func(vars, sch); codel_time_t now; -@@ -261,7 +260,7 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch, +@@ -261,7 +260,7 @@ static struct sk_buff *codel_dequeue(str return skb; } now = codel_get_time(); @@ -68,7 +66,7 @@ index 7546517..550debf 100644 if (vars->dropping) { if (!drop) { /* sojourn time below target - leave dropping state */ -@@ -292,7 +291,7 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch, +@@ -292,7 +291,7 @@ static struct sk_buff *codel_dequeue(str qdisc_drop(skb, sch); stats->drop_count++; skb = dequeue_func(vars, sch); @@ -77,7 +75,7 @@ index 7546517..550debf 100644 vars, params, stats, now)) { /* leave dropping state */ vars->dropping = false; -@@ -313,7 +312,7 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch, +@@ -313,7 +312,7 @@ static struct sk_buff *codel_dequeue(str stats->drop_count++; skb = dequeue_func(vars, sch); @@ -86,11 +84,9 @@ index 7546517..550debf 100644 stats, now); } vars->dropping = true; -diff --git a/net/sched/sch_codel.c b/net/sched/sch_codel.c -index 213ef60..2f9ab17 100644 --- a/net/sched/sch_codel.c +++ b/net/sched/sch_codel.c -@@ -77,8 +77,8 @@ static struct sk_buff *codel_qdisc_dequeue(struct Qdisc *sch) +@@ -77,8 +77,8 @@ static struct sk_buff *codel_qdisc_deque struct codel_sched_data *q = qdisc_priv(sch); struct sk_buff *skb; @@ -101,11 +97,9 @@ index 213ef60..2f9ab17 100644 /* We cant call qdisc_tree_decrease_qlen() if our qlen is 0, * or HTB crashes. Defer it for next round. */ -diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c -index 337ff20..9fc1c62 100644 --- a/net/sched/sch_fq_codel.c +++ b/net/sched/sch_fq_codel.c -@@ -217,13 +217,14 @@ static int fq_codel_enqueue(struct sk_buff *skb, struct Qdisc *sch) +@@ -217,13 +217,14 @@ static int fq_codel_enqueue(struct sk_bu */ static struct sk_buff *dequeue(struct codel_vars *vars, struct Qdisc *sch) { @@ -130,4 +124,3 @@ index 337ff20..9fc1c62 100644 flow->dropped += q->cstats.drop_count - prev_drop_count; flow->dropped += q->cstats.ecn_mark - prev_ecn_mark; - diff --git a/target/linux/generic/patches-3.3/252-mv_cesa_depends.patch b/target/linux/generic/patches-3.3/252-mv_cesa_depends.patch index b43d29c75a..53701458aa 100644 --- a/target/linux/generic/patches-3.3/252-mv_cesa_depends.patch +++ b/target/linux/generic/patches-3.3/252-mv_cesa_depends.patch @@ -6,5 +6,5 @@ select CRYPTO_AES + select CRYPTO_HASH2 select CRYPTO_BLKCIPHER2 + select CRYPTO_HASH help - This driver allows you to utilize the Cryptographic Engines and diff --git a/target/linux/iop32x/Makefile b/target/linux/iop32x/Makefile index 6c2da5d3ae..e52720a474 100644 --- a/target/linux/iop32x/Makefile +++ b/target/linux/iop32x/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Intel IOP32x FEATURES:=squashfs broken MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile index c3be9cb1a7..8a2dc4897b 100644 --- a/target/linux/ixp4xx/Makefile +++ b/target/linux/ixp4xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs MAINTAINER:=Imre Kaloz SUBTARGETS=generic harddisk -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile index 1057100ca0..da44defea7 100644 --- a/target/linux/kirkwood/Makefile +++ b/target/linux/kirkwood/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Marvell Kirkwood FEATURES:=targz usb jffs2 MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/lantiq/Makefile b/target/linux/lantiq/Makefile index c4a84b32e5..4c0ada34b4 100644 --- a/target/linux/lantiq/Makefile +++ b/target/linux/lantiq/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Lantiq GPON/XWAY FEATURES:=squashfs jffs2 DEFAULT_SUBTARGET:=danube -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 CFLAGS=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile index 7cfacb97b4..f30286c8bf 100644 --- a/target/linux/malta/Makefile +++ b/target/linux/malta/Makefile @@ -13,7 +13,7 @@ SUBTARGETS:=le be INITRAMFS_EXTRA_FILES:= MAINTAINER:=Florian Fainelli -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/mpc52xx/Makefile b/target/linux/mpc52xx/Makefile index ba9074537b..ce49cb7344 100644 --- a/target/linux/mpc52xx/Makefile +++ b/target/linux/mpc52xx/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Freescale MPC52xx CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=603e FEATURES:=targz ext4 -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/mpc83xx/Makefile b/target/linux/mpc83xx/Makefile index 711bd98533..3542bf8ae0 100644 --- a/target/linux/mpc83xx/Makefile +++ b/target/linux/mpc83xx/Makefile @@ -13,7 +13,7 @@ CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=603e FEATURES:=squashfs targz MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile index 270ac229f5..3bfbf6cf22 100644 --- a/target/linux/mpc85xx/Makefile +++ b/target/linux/mpc85xx/Makefile @@ -13,7 +13,7 @@ CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=8540 FEATURES:=spe_fpu ramdisk broken MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/omap4/Makefile b/target/linux/omap4/Makefile index bc89c0808a..d434736c99 100644 --- a/target/linux/omap4/Makefile +++ b/target/linux/omap4/Makefile @@ -11,7 +11,7 @@ BOARD:=omap4 BOARDNAME:=TI OMAP4 FEATURES:=usb targz audio display -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 CFLAGS:=-Os -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp MAINTAINER:=Imre Kaloz diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile index 8008c092cd..995fcf4158 100644 --- a/target/linux/orion/Makefile +++ b/target/linux/orion/Makefile @@ -13,7 +13,7 @@ SUBTARGETS:=generic harddisk dns323 CFLAGS=-Os -pipe -march=armv5te -mtune=xscale -fno-caller-saves MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile index ac02493bfe..3b6c7b7a8d 100644 --- a/target/linux/ppc40x/Makefile +++ b/target/linux/ppc40x/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=405 MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/pxa/Makefile b/target/linux/pxa/Makefile index cf6cf59ac4..4c16b61e1d 100644 --- a/target/linux/pxa/Makefile +++ b/target/linux/pxa/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Marvell/Intel PXA2xx FEATURES:=squashfs broken MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index 5616168c81..be42e5128c 100644 --- a/target/linux/ramips/Makefile +++ b/target/linux/ramips/Makefile @@ -13,7 +13,7 @@ SUBTARGETS:=rt288x rt305x rt3883 CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves FEATURES:=squashfs -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES+=\ diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile index fd0716181d..02a819fff9 100644 --- a/target/linux/rb532/Makefile +++ b/target/linux/rb532/Makefile @@ -11,7 +11,7 @@ BOARD:=rb532 BOARDNAME:=Mikrotik RouterBoard 532 FEATURES:=jffs2 pci targz broken -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini kmod-madwifi kmod-input-rb532 diff --git a/target/linux/rdc/Makefile b/target/linux/rdc/Makefile index 8484759654..4a7653e332 100644 --- a/target/linux/rdc/Makefile +++ b/target/linux/rdc/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs jffs2 pci usb pcmcia broken CFLAGS:=-Os -pipe -march=i486 -mtune=i486 -fno-caller-saves MAINTAINER:=Florian Fainelli -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/realview/Makefile b/target/linux/realview/Makefile index ab7d8d09c7..e565593571 100644 --- a/target/linux/realview/Makefile +++ b/target/linux/realview/Makefile @@ -13,7 +13,7 @@ FEATURES:=fpu ramdisk CFLAGS:=-Os -pipe -march=armv6k -mtune=mpcore -mfloat-abi=softfp -mfpu=vfp -fno-caller-saves MAINTAINER:=Florian Fainelli -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/sibyte/Makefile b/target/linux/sibyte/Makefile index 7ebf2576f1..2c30106ff7 100644 --- a/target/linux/sibyte/Makefile +++ b/target/linux/sibyte/Makefile @@ -13,7 +13,7 @@ FEATURES:=fpu ramdisk broken CFLAGS:=-Os -pipe -march=sb1 -fno-caller-saves MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile index ef8af39080..d4d777b16d 100644 --- a/target/linux/uml/Makefile +++ b/target/linux/uml/Makefile @@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux FEATURES:=ext4 audio MAINTAINER:=Florian Fainelli -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index aaa9e02a2b..0e56fbbf21 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=x86 FEATURES:=squashfs jffs2 ext4 vdi vmdk pcmcia targz SUBTARGETS=generic olpc xen_domu ep80579 net5501 kvm_guest geos alix2 thincan -LINUX_VERSION:=3.3.6 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk