From 09b1073f9b401f17c05a0ab4ba0493d13f110ec9 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 16 Aug 2011 22:04:10 +0000 Subject: [PATCH] kernel: update kernel to version 2.6.39.4 SVN-Revision: 28022 --- include/kernel-version.mk | 4 ++-- target/linux/ar71xx/Makefile | 2 +- target/linux/au1000/Makefile | 2 +- target/linux/avr32/Makefile | 2 +- target/linux/brcm63xx/Makefile | 2 +- target/linux/cns3xxx/Makefile | 2 +- target/linux/cobalt/Makefile | 2 +- target/linux/ep93xx/Makefile | 2 +- .../generic/patches-2.6.39/630-packet_socket_type.patch | 6 +++--- .../generic/patches-2.6.39/642-bridge_port_isolate.patch | 2 +- target/linux/lantiq/Makefile | 2 +- target/linux/ramips/Makefile | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 6161d122fd26..530fae283b36 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -26,8 +26,8 @@ endif ifeq ($(LINUX_VERSION),2.6.38.8) LINUX_KERNEL_MD5SUM:=d27b85795c6bc56b5a38d7d31bf1d724 endif -ifeq ($(LINUX_VERSION),2.6.39.2) - LINUX_KERNEL_MD5SUM:=51be93d92028658ec93f68b79a378b17 +ifeq ($(LINUX_VERSION),2.6.39.4) + LINUX_KERNEL_MD5SUM:=a17c748c2070168f1e784e9605ca043d endif ifeq ($(LINUX_VERSION),3.0.1) LINUX_KERNEL_MD5SUM:=aed949984b878b7fb77ffe9cbee8ce0c diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index d02504b618e4..0925d9c3c2dc 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:=2.6.39.2 +LINUX_VERSION:=2.6.39.4 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile index 6e6169768cf9..92de1206d1ba 100644 --- a/target/linux/au1000/Makefile +++ b/target/linux/au1000/Makefile @@ -13,7 +13,7 @@ FEATURES:=jffs2 usb pci SUBTARGETS=au1500 au1550 MAINTAINER:=Florian Fainelli -LINUX_VERSION:=2.6.39.2 +LINUX_VERSION:=2.6.39.4 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini yamonenv diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile index 01aeea1fa92b..572957050756 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:=2.6.39.2 +LINUX_VERSION:=2.6.39.4 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile index 18a2ce80f337..33c0268787a8 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:=2.6.39.2 +LINUX_VERSION:=2.6.39.4 MAINTAINER:=Florian Fainelli include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/cns3xxx/Makefile b/target/linux/cns3xxx/Makefile index 4d02c5c22b38..e2297a64784b 100644 --- a/target/linux/cns3xxx/Makefile +++ b/target/linux/cns3xxx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs fpu gpio CFLAGS:=-Os -pipe -march=armv6k -mtune=mpcore -mfloat-abi=softfp -mfpu=vfp -fno-caller-saves MAINTAINER:=Imre Kaloz -LINUX_VERSION:=2.6.39.2 +LINUX_VERSION:=2.6.39.4 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/cobalt/Makefile b/target/linux/cobalt/Makefile index dbcf61e22447..b0de847411ac 100644 --- a/target/linux/cobalt/Makefile +++ b/target/linux/cobalt/Makefile @@ -13,7 +13,7 @@ FEATURES:=targz pci ext4 CFLAGS:=-O2 -pipe -mtune=r5000 -fno-caller-saves MAINTAINER:=Florian Fainelli -LINUX_VERSION:=2.6.39.2 +LINUX_VERSION:=2.6.39.4 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ep93xx/Makefile b/target/linux/ep93xx/Makefile index 1634c808157f..b7da8a0818e0 100644 --- a/target/linux/ep93xx/Makefile +++ b/target/linux/ep93xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs jffs2 ext4 targz usb CFLAGS:=-Os -pipe -march=armv4t -fno-caller-saves MAINTAINER:=Florian Fainelli -LINUX_VERSION:=2.6.39.2 +LINUX_VERSION:=2.6.39.4 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/generic/patches-2.6.39/630-packet_socket_type.patch b/target/linux/generic/patches-2.6.39/630-packet_socket_type.patch index 75b61290c340..122a108048a0 100644 --- a/target/linux/generic/patches-2.6.39/630-packet_socket_type.patch +++ b/target/linux/generic/patches-2.6.39/630-packet_socket_type.patch @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -1523,6 +1526,7 @@ static int packet_create(struct net *net +@@ -1524,6 +1527,7 @@ static int packet_create(struct net *net spin_lock_init(&po->bind_lock); mutex_init(&po->pg_vec_lock); po->prot_hook.func = packet_rcv; @@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -2091,6 +2095,16 @@ packet_setsockopt(struct socket *sock, i +@@ -2093,6 +2097,16 @@ packet_setsockopt(struct socket *sock, i po->tp_tstamp = val; return 0; } @@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau default: return -ENOPROTOOPT; } -@@ -2148,6 +2162,13 @@ static int packet_getsockopt(struct sock +@@ -2150,6 +2164,13 @@ static int packet_getsockopt(struct sock data = &val; break; diff --git a/target/linux/generic/patches-2.6.39/642-bridge_port_isolate.patch b/target/linux/generic/patches-2.6.39/642-bridge_port_isolate.patch index c051a29f2d21..09a3b913d040 100644 --- a/target/linux/generic/patches-2.6.39/642-bridge_port_isolate.patch +++ b/target/linux/generic/patches-2.6.39/642-bridge_port_isolate.patch @@ -1,6 +1,6 @@ --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h -@@ -132,6 +132,7 @@ struct net_bridge_port +@@ -133,6 +133,7 @@ struct net_bridge_port unsigned long flags; #define BR_HAIRPIN_MODE 0x00000001 diff --git a/target/linux/lantiq/Makefile b/target/linux/lantiq/Makefile index 82e5c3926a51..e355c15730ac 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:=2.6.39.2 +LINUX_VERSION:=2.6.39.4 CFLAGS=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index 96d19ce19840..012fc5620e7c 100644 --- a/target/linux/ramips/Makefile +++ b/target/linux/ramips/Makefile @@ -13,7 +13,7 @@ SUBTARGETS:=rt288x rt305x CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves FEATURES:=squashfs -LINUX_VERSION:=2.6.39.2 +LINUX_VERSION:=2.6.39.4 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES+=\ -- 2.30.2