From 34018a630fec422d7e59afa1b3ee9ef92ceb9230 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Mon, 7 May 2012 20:11:43 +0000 Subject: [PATCH] kernel: update linux 3.3 to 3.3.5 SVN-Revision: 31645 --- include/kernel-version.mk | 4 +-- target/linux/adm5120/Makefile | 2 +- target/linux/adm8668/Makefile | 2 +- target/linux/ar7/Makefile | 2 +- target/linux/ar71xx/Makefile | 2 +- ...IPS-ath79-fix-AR933X-WMAC-reset-code.patch | 31 ------------------- target/linux/at91/Makefile | 2 +- target/linux/atheros/Makefile | 2 +- target/linux/avr32/Makefile | 2 +- target/linux/brcm47xx/Makefile | 2 +- target/linux/brcm63xx/Makefile | 2 +- ...01-MIPS-BCM63XX-register-ohci-device.patch | 2 +- ...03-MIPS-BCM63XX-register-ehci-device.patch | 2 +- .../patches-3.3/404-bcm963xx_flashmap.patch | 2 +- .../408-6358-enet1-external-mii-clk.patch | 2 +- ...-support-for-bcm6368-internal-ethern.patch | 2 +- .../patches-3.3/511-board_V2500V.patch | 2 +- ...63xx-add-support-for-96368MVWG-board.patch | 4 +-- target/linux/cns21xx/Makefile | 2 +- .../patches-3.3/750-hostap_txpower.patch | 2 +- .../patches-3.3/830-ledtrig_morse.patch | 2 +- .../patches-3.3/831-ledtrig_netdev.patch | 2 +- .../patches-3.3/941-ocf_20110720.patch | 2 +- .../generic/patches-3.3/950-vm_exports.patch | 2 +- .../980-update_arm_machtypes.patch | 2 +- ...ore_wdt_fix_watchdog_counter_loading.patch | 2 +- .../patches-3.3/600-skb_avoid_dmabounce.patch | 4 +-- ...5-MIPS-lantiq-udp-in-kernel-redirect.patch | 2 +- target/linux/malta/Makefile | 2 +- target/linux/mpc52xx/Makefile | 2 +- target/linux/mpc83xx/Makefile | 2 +- target/linux/omap4/Makefile | 2 +- target/linux/ppc40x/Makefile | 2 +- target/linux/pxa/Makefile | 2 +- target/linux/ramips/Makefile | 2 +- target/linux/rb532/Makefile | 2 +- target/linux/rdc/Makefile | 2 +- target/linux/uml/Makefile | 2 +- target/linux/x86/geos/target.mk | 2 +- 39 files changed, 41 insertions(+), 72 deletions(-) delete mode 100644 target/linux/ar71xx/patches-3.3/003-MIPS-ath79-fix-AR933X-WMAC-reset-code.patch diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 820b784a92..7a97f8974c 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.4) - LINUX_KERNEL_MD5SUM:=113baeccd2a3341ecc62ae5e73c2ed1d +ifeq ($(LINUX_VERSION),3.3.5) + LINUX_KERNEL_MD5SUM:=2f6b7da0418e26312bcabd08ab448569 endif # disable the md5sum check for unknown kernel versions diff --git a/target/linux/adm5120/Makefile b/target/linux/adm5120/Makefile index 8c2d6f464d..ea7f33abf8 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.4 +LINUX_VERSION:=3.3.5 SUBTARGETS:=router_le router_be rb1xx INITRAMFS_EXTRA_FILES:= diff --git a/target/linux/adm8668/Makefile b/target/linux/adm8668/Makefile index d0edaa38d8..39d6c7f250 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.4 +LINUX_VERSION:=3.3.5 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini kmod-rt61-pci diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile index 1e7d1a322a..74fe9d1935 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.4 +LINUX_VERSION:=3.3.5 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index fa18d21a5b..c479a443e2 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.4 +LINUX_VERSION:=3.3.5 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar71xx/patches-3.3/003-MIPS-ath79-fix-AR933X-WMAC-reset-code.patch b/target/linux/ar71xx/patches-3.3/003-MIPS-ath79-fix-AR933X-WMAC-reset-code.patch deleted file mode 100644 index e5807c71f4..0000000000 --- a/target/linux/ar71xx/patches-3.3/003-MIPS-ath79-fix-AR933X-WMAC-reset-code.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 51233d66e030239f99755b2983753eff9b748365 Mon Sep 17 00:00:00 2001 -From: Gabor Juhos -Date: Wed, 14 Mar 2012 10:28:35 +0100 -Subject: [PATCH 04/47] MIPS: ath79: fix AR933X WMAC reset code - -The current code puts the built-in WMAC device of the -AR933X SoCs into reset instead of starting it. This -causes a hard lock on AR933X based boards when the -wireless driver tries to access the device. - -Signed-off-by: Gabor Juhos -Cc: stable@vger.kernel.org -Cc: linux-mips@linux-mips.org -Patchwork: https://patchwork.linux-mips.org/patch/3484/ -Signed-off-by: Ralf Baechle ---- - arch/mips/ath79/dev-wmac.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - ---- a/arch/mips/ath79/dev-wmac.c -+++ b/arch/mips/ath79/dev-wmac.c -@@ -58,8 +58,8 @@ static void __init ar913x_wmac_setup(voi - - static int ar933x_wmac_reset(void) - { -- ath79_device_reset_clear(AR933X_RESET_WMAC); - ath79_device_reset_set(AR933X_RESET_WMAC); -+ ath79_device_reset_clear(AR933X_RESET_WMAC); - - return 0; - } diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile index 01d942a8ed..c9e04c534e 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.4 +LINUX_VERSION:=3.3.5 DEVICE_TYPE= include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/atheros/Makefile b/target/linux/atheros/Makefile index e251f21ee3..77d7fad419 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.4 +LINUX_VERSION:=3.3.5 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile index 8ff370e3ca..89e929e49d 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.4 +LINUX_VERSION:=3.3.5 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile index 70b7dab245..bc2b6a3dd7 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.4 +LINUX_VERSION:=3.3.5 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 f00704bd3c..41c98c15e5 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.4 +LINUX_VERSION:=3.3.5 MAINTAINER:=Florian Fainelli include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm63xx/patches-3.3/401-MIPS-BCM63XX-register-ohci-device.patch b/target/linux/brcm63xx/patches-3.3/401-MIPS-BCM63XX-register-ohci-device.patch index aad6c5c942..7b213c3466 100644 --- a/target/linux/brcm63xx/patches-3.3/401-MIPS-BCM63XX-register-ohci-device.patch +++ b/target/linux/brcm63xx/patches-3.3/401-MIPS-BCM63XX-register-ohci-device.patch @@ -66,7 +66,7 @@ Subject: [PATCH 24/63] MIPS: BCM63XX: register ohci device. #include #include -@@ -944,6 +945,9 @@ int __init board_register_devices(void) +@@ -943,6 +944,9 @@ int __init board_register_devices(void) !board_get_mac_address(board.enet1.mac_addr)) bcm63xx_enet_register(1, &board.enet1); diff --git a/target/linux/brcm63xx/patches-3.3/403-MIPS-BCM63XX-register-ehci-device.patch b/target/linux/brcm63xx/patches-3.3/403-MIPS-BCM63XX-register-ehci-device.patch index fec36ea587..5021ab4aa4 100644 --- a/target/linux/brcm63xx/patches-3.3/403-MIPS-BCM63XX-register-ehci-device.patch +++ b/target/linux/brcm63xx/patches-3.3/403-MIPS-BCM63XX-register-ehci-device.patch @@ -49,7 +49,7 @@ Subject: [PATCH 26/63] MIPS: BCM63XX: register ehci device. #include #include -@@ -945,6 +946,9 @@ int __init board_register_devices(void) +@@ -944,6 +945,9 @@ int __init board_register_devices(void) !board_get_mac_address(board.enet1.mac_addr)) bcm63xx_enet_register(1, &board.enet1); diff --git a/target/linux/brcm63xx/patches-3.3/404-bcm963xx_flashmap.patch b/target/linux/brcm63xx/patches-3.3/404-bcm963xx_flashmap.patch index a2d38d45d1..002f5a1aee 100644 --- a/target/linux/brcm63xx/patches-3.3/404-bcm963xx_flashmap.patch +++ b/target/linux/brcm63xx/patches-3.3/404-bcm963xx_flashmap.patch @@ -12,7 +12,7 @@ Signed-off-by: Axel Gembe --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -876,7 +876,7 @@ static struct mtd_partition mtd_partitio +@@ -875,7 +875,7 @@ static struct mtd_partition mtd_partitio } }; diff --git a/target/linux/brcm63xx/patches-3.3/408-6358-enet1-external-mii-clk.patch b/target/linux/brcm63xx/patches-3.3/408-6358-enet1-external-mii-clk.patch index f4cfe0b389..ac7dd6ec7a 100644 --- a/target/linux/brcm63xx/patches-3.3/408-6358-enet1-external-mii-clk.patch +++ b/target/linux/brcm63xx/patches-3.3/408-6358-enet1-external-mii-clk.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -848,6 +848,8 @@ void __init board_prom_init(void) +@@ -847,6 +847,8 @@ void __init board_prom_init(void) if (BCMCPU_IS_6348()) val |= GPIO_MODE_6348_G3_EXT_MII | GPIO_MODE_6348_G0_EXT_MII; diff --git a/target/linux/brcm63xx/patches-3.3/415-bcm63xx_enet-add-support-for-bcm6368-internal-ethern.patch b/target/linux/brcm63xx/patches-3.3/415-bcm63xx_enet-add-support-for-bcm6368-internal-ethern.patch index dcbbd29534..e4da9fa337 100644 --- a/target/linux/brcm63xx/patches-3.3/415-bcm63xx_enet-add-support-for-bcm6368-internal-ethern.patch +++ b/target/linux/brcm63xx/patches-3.3/415-bcm63xx_enet-add-support-for-bcm6368-internal-ethern.patch @@ -13,7 +13,7 @@ Subject: [PATCH 31/63] bcm63xx_enet: add support for bcm6368 internal ethernet s --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -948,6 +948,10 @@ int __init board_register_devices(void) +@@ -947,6 +947,10 @@ int __init board_register_devices(void) !board_get_mac_address(board.enet1.mac_addr)) bcm63xx_enet_register(1, &board.enet1); diff --git a/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch b/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch index 2a86d35a0d..da8b0038b7 100644 --- a/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch +++ b/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch @@ -95,7 +95,7 @@ /* dump cfe version */ cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET; -@@ -2161,6 +2235,13 @@ int __init board_register_devices(void) +@@ -2160,6 +2234,13 @@ int __init board_register_devices(void) val = bcm_mpi_readl(MPI_CSBASE_REG(0)); val &= MPI_CSBASE_BASE_MASK; diff --git a/target/linux/brcm63xx/patches-3.3/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-3.3/520-bcm63xx-add-support-for-96368MVWG-board.patch index e5fdeea608..3efa29e992 100644 --- a/target/linux/brcm63xx/patches-3.3/520-bcm63xx-add-support-for-96368MVWG-board.patch +++ b/target/linux/brcm63xx/patches-3.3/520-bcm63xx-add-support-for-96368MVWG-board.patch @@ -102,8 +102,8 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. }; static void __init nb4_nvram_fixup(void) -@@ -2283,12 +2361,25 @@ void __init board_prom_init(void) - bcm63xx_pci_enabled = 1; +@@ -2282,12 +2360,25 @@ void __init board_prom_init(void) + if (board.has_pci) { if (BCMCPU_IS_6348()) val |= GPIO_MODE_6348_G2_PCI; + diff --git a/target/linux/cns21xx/Makefile b/target/linux/cns21xx/Makefile index 600ff852ef..ec0685ab15 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.4 +LINUX_VERSION:=3.3.5 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/generic/patches-3.3/750-hostap_txpower.patch b/target/linux/generic/patches-3.3/750-hostap_txpower.patch index a928bcd62b..8e2ec9afce 100644 --- a/target/linux/generic/patches-3.3/750-hostap_txpower.patch +++ b/target/linux/generic/patches-3.3/750-hostap_txpower.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/hostap/hostap_ap.c +++ b/drivers/net/wireless/hostap/hostap_ap.c -@@ -2340,13 +2340,13 @@ int prism2_ap_get_sta_qual(local_info_t +@@ -2340,13 +2340,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) diff --git a/target/linux/generic/patches-3.3/830-ledtrig_morse.patch b/target/linux/generic/patches-3.3/830-ledtrig_morse.patch index 47db802b6f..3283807f2b 100644 --- a/target/linux/generic/patches-3.3/830-ledtrig_morse.patch +++ b/target/linux/generic/patches-3.3/830-ledtrig_morse.patch @@ -11,7 +11,7 @@ endif # NEW_LEDS --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile -@@ -57,3 +57,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += +@@ -57,3 +57,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 diff --git a/target/linux/generic/patches-3.3/831-ledtrig_netdev.patch b/target/linux/generic/patches-3.3/831-ledtrig_netdev.patch index 161db1acae..7f94b1cd39 100644 --- a/target/linux/generic/patches-3.3/831-ledtrig_netdev.patch +++ b/target/linux/generic/patches-3.3/831-ledtrig_netdev.patch @@ -14,7 +14,7 @@ endif # NEW_LEDS --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile -@@ -58,3 +58,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += +@@ -58,3 +58,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 diff --git a/target/linux/generic/patches-3.3/941-ocf_20110720.patch b/target/linux/generic/patches-3.3/941-ocf_20110720.patch index 715d4faaea..5ff399ef62 100644 --- a/target/linux/generic/patches-3.3/941-ocf_20110720.patch +++ b/target/linux/generic/patches-3.3/941-ocf_20110720.patch @@ -34,7 +34,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. -@@ -726,6 +736,63 @@ void add_disk_randomness(struct gendisk +@@ -726,6 +736,63 @@ void add_disk_randomness(struct gendisk } #endif diff --git a/target/linux/generic/patches-3.3/950-vm_exports.patch b/target/linux/generic/patches-3.3/950-vm_exports.patch index b9abd0c1ca..1cd970c805 100644 --- a/target/linux/generic/patches-3.3/950-vm_exports.patch +++ b/target/linux/generic/patches-3.3/950-vm_exports.patch @@ -61,7 +61,7 @@ { --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -3855,6 +3855,7 @@ int can_nice(const struct task_struct *p +@@ -3854,6 +3854,7 @@ int can_nice(const struct task_struct *p return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || capable(CAP_SYS_NICE)); } diff --git a/target/linux/generic/patches-3.3/980-update_arm_machtypes.patch b/target/linux/generic/patches-3.3/980-update_arm_machtypes.patch index 7d49ce91aa..391511c8fd 100644 --- a/target/linux/generic/patches-3.3/980-update_arm_machtypes.patch +++ b/target/linux/generic/patches-3.3/980-update_arm_machtypes.patch @@ -3335,7 +3335,7 @@ pluto MACH_PLUTO PLUTO 3869 acfx100 MACH_ACFX100 ACFX100 3870 msm8625_rumi3 MACH_MSM8625_RUMI3 MSM8625_RUMI3 3871 -@@ -1161,6 +3833,8 @@ valente_wx MACH_VALENTE_WX VALENTE_WX +@@ -1161,6 +3833,8 @@ valente_wx MACH_VALENTE_WX VALENTE_WX huangshans MACH_HUANGSHANS HUANGSHANS 3879 bosphorus1 MACH_BOSPHORUS1 BOSPHORUS1 3880 prima MACH_PRIMA PRIMA 3881 diff --git a/target/linux/generic/patches-3.3/992-mpcore_wdt_fix_watchdog_counter_loading.patch b/target/linux/generic/patches-3.3/992-mpcore_wdt_fix_watchdog_counter_loading.patch index a476952783..fb16e2aa62 100644 --- a/target/linux/generic/patches-3.3/992-mpcore_wdt_fix_watchdog_counter_loading.patch +++ b/target/linux/generic/patches-3.3/992-mpcore_wdt_fix_watchdog_counter_loading.patch @@ -51,7 +51,7 @@ Signed-off-by: Vitaly Kuzmichev +EXPORT_SYMBOL_GPL(twd_timer_get_rate); --- a/drivers/watchdog/mpcore_wdt.c +++ b/drivers/watchdog/mpcore_wdt.c -@@ -99,9 +99,7 @@ static void mpcore_wdt_keepalive(struct +@@ -99,9 +99,7 @@ static void mpcore_wdt_keepalive(struct spin_lock(&wdt_lock); /* Assume prescale is set to 256 */ diff --git a/target/linux/ixp4xx/patches-3.3/600-skb_avoid_dmabounce.patch b/target/linux/ixp4xx/patches-3.3/600-skb_avoid_dmabounce.patch index f48c273b4a..625b76897a 100644 --- a/target/linux/ixp4xx/patches-3.3/600-skb_avoid_dmabounce.patch +++ b/target/linux/ixp4xx/patches-3.3/600-skb_avoid_dmabounce.patch @@ -1,6 +1,6 @@ --- a/net/core/skbuff.c +++ b/net/core/skbuff.c -@@ -176,6 +176,10 @@ struct sk_buff *__alloc_skb(unsigned int +@@ -177,6 +177,10 @@ struct sk_buff *__alloc_skb(unsigned int struct sk_buff *skb; u8 *data; @@ -11,7 +11,7 @@ cache = fclone ? skbuff_fclone_cache : skbuff_head_cache; /* Get the HEAD */ -@@ -929,6 +933,10 @@ int pskb_expand_head(struct sk_buff *skb +@@ -946,6 +950,10 @@ int pskb_expand_head(struct sk_buff *skb if (skb_shared(skb)) BUG(); diff --git a/target/linux/lantiq/patches-3.3/0055-MIPS-lantiq-udp-in-kernel-redirect.patch b/target/linux/lantiq/patches-3.3/0055-MIPS-lantiq-udp-in-kernel-redirect.patch index 15e704d5fb..98b43ab8ad 100644 --- a/target/linux/lantiq/patches-3.3/0055-MIPS-lantiq-udp-in-kernel-redirect.patch +++ b/target/linux/lantiq/patches-3.3/0055-MIPS-lantiq-udp-in-kernel-redirect.patch @@ -75,7 +75,7 @@ Subject: [PATCH 55/70] MIPS: lantiq: udp in-kernel redirect +#endif --- a/net/Kconfig +++ b/net/Kconfig -@@ -72,6 +72,12 @@ config INET +@@ -78,6 +78,12 @@ config INET Short answer: say Y. diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile index fbe5974ad5..fc68528a50 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.4 +LINUX_VERSION:=3.3.5 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/mpc52xx/Makefile b/target/linux/mpc52xx/Makefile index 602e4704cd..e027ed5acc 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.4 +LINUX_VERSION:=3.3.5 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/mpc83xx/Makefile b/target/linux/mpc83xx/Makefile index e8f9470e6c..7914c22f4c 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.4 +LINUX_VERSION:=3.3.5 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/omap4/Makefile b/target/linux/omap4/Makefile index be6bac2b71..92680e58b5 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.4 +LINUX_VERSION:=3.3.5 CFLAGS:=-Os -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp MAINTAINER:=Imre Kaloz diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile index 164a039e4c..3fe2692fed 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.4 +LINUX_VERSION:=3.3.5 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/pxa/Makefile b/target/linux/pxa/Makefile index 23cba7b4a7..472b7bff6e 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.4 +LINUX_VERSION:=3.3.5 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index 7241be7485..6ac3901725 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.4 +LINUX_VERSION:=3.3.5 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES+=\ diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile index 2d65c9338a..33b9219e43 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.4 +LINUX_VERSION:=3.3.5 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 9bf8487f30..5451971134 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.4 +LINUX_VERSION:=3.3.5 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile index 66171fefbe..9c94c43348 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.4 +LINUX_VERSION:=3.3.5 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/x86/geos/target.mk b/target/linux/x86/geos/target.mk index cd4c7cf7df..bf9fc9c8a3 100644 --- a/target/linux/x86/geos/target.mk +++ b/target/linux/x86/geos/target.mk @@ -1,4 +1,4 @@ -LINUX_VERSION:=3.3.4 +LINUX_VERSION:=3.3.5 BOARDNAME:=Traverse Geos FEATURES:=squashfs jffs2 ext4 pci usb gpio DEFAULT_PACKAGES += \