kernel: update 3.10 to 3.10.34

Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 40291
2014-03-27 09:28:33 +00:00 · 2014-03-27 09:28:33 +00:00 · 627baa28d3
commit 627baa28d3
parent b68564ed3f
46 changed files with 77 additions and 298 deletions
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@ -17,8 +17,8 @@ endif
 ifeq ($(LINUX_VERSION),3.9.11)
  LINUX_KERNEL_MD5SUM:=edbf88eb7f7d34dbd5d3887726790755
 endif
-ifeq ($(LINUX_VERSION),3.10.32)
-  LINUX_KERNEL_MD5SUM:=58bfaf95f4e23be2d658dab0a7fb9615
+ifeq ($(LINUX_VERSION),3.10.34)
+  LINUX_KERNEL_MD5SUM:=30991b495a3d75196d5608072d2e62e6
 endif
 ifeq ($(LINUX_VERSION),3.12.10)
  LINUX_KERNEL_MD5SUM:=93325074b7b1d7bb76fb7d4348f0aa7a
--- a/target/linux/ar7/Makefile
+++ b/target/linux/ar7/Makefile
@ -13,7 +13,7 @@ FEATURES:=squashfs atm
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 SUBTARGETS:=generic ac49x

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/ar71xx/Makefile
+++ b/target/linux/ar71xx/Makefile
@ -13,7 +13,7 @@ FEATURES:=mips16
 CPU_TYPE=34kc
 SUBTARGETS:=generic nand mikrotik

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/ar71xx/patches-3.10/200-spi-ath79-fix-initial-GPIO-CS-line-setup.patch
+++ b/target/linux/ar71xx/patches-3.10/200-spi-ath79-fix-initial-GPIO-CS-line-setup.patch
@ -1,37 +0,0 @@
-From 3a7853f0dd24e81dc920c98a5c7e8cfdde81bb45 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Thu, 16 Jan 2014 16:58:58 +0100
-Subject: [PATCH] spi-ath79: fix initial GPIO CS line setup
-
-The 'ath79_spi_setup_cs' function initializes the chip
-select line of a given SPI device in order to make sure
-that the device is inactive.
-
-If the SPI_CS_HIGH bit is set for a given device, it
-means that the CS line of that device is active HIGH
-so it must be set to LOW initially. In case of GPIO
-CS lines, the 'ath79_spi_setup_cs' function does the
-opposite of that due to the wrong GPIO flags.
-
-Fix the code to use the correct GPIO flags.
-
-Reported-by: Ronald Wahl <ronald.wahl@raritan.com>
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
---
- drivers/spi/spi-ath79.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
--- a/drivers/spi/spi-ath79.c
-+++ b/drivers/spi/spi-ath79.c
-@@ -132,9 +132,9 @@ static int ath79_spi_setup_cs(struct spi
- 
- 		flags = GPIOF_DIR_OUT;
- 		if (spi->mode & SPI_CS_HIGH)
-			flags |= GPIOF_INIT_HIGH;
-		else
- 			flags |= GPIOF_INIT_LOW;
-+		else
-+			flags |= GPIOF_INIT_HIGH;
- 
- 		status = gpio_request_one(cdata->gpio, flags,
- 					  dev_name(&spi->dev));
--- a/target/linux/atheros/Makefile
+++ b/target/linux/atheros/Makefile
@ -11,7 +11,7 @@ BOARD:=atheros
 BOARDNAME:=Atheros AR231x/AR5312
 FEATURES:=squashfs

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/avr32/Makefile
+++ b/target/linux/avr32/Makefile
@ -12,7 +12,7 @@ BOARDNAME:=Atmel AVR32
 FEATURES:=squashfs
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/bcm53xx/Makefile
+++ b/target/linux/bcm53xx/Makefile
@ -13,7 +13,7 @@ FEATURES:=squashfs usb pci pcie gpio
 MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
 CPU_TYPE:=cortex-a9

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/brcm2708/Makefile
+++ b/target/linux/brcm2708/Makefile
@ -15,7 +15,7 @@ MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 CPU_TYPE:=arm1176jzf-s
 CPU_SUBTYPE:=vfp

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34

 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += brcm2708-gpu-fw kmod-usb-hid kmod-sound-core kmod-sound-arm-bcm2835
--- a/target/linux/brcm2708/patches-3.10/0128-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch
+++ b/target/linux/brcm2708/patches-3.10/0128-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch
@ -62,7 +62,7 @@ Subject: [PATCH 128/174] config: Enable CONFIG_MEMCG, but leave it disabled
  */
 --- a/mm/memcontrol.c
 +++ b/mm/memcontrol.c
-@@ -6956,6 +6956,7 @@ struct cgroup_subsys mem_cgroup_subsys =
+@@ -6970,6 +6970,7 @@ struct cgroup_subsys mem_cgroup_subsys =
 	.base_cftypes = mem_cgroup_files,
 	.early_init = 0,
 	.use_id = 1,
--- a/target/linux/brcm47xx/Makefile
+++ b/target/linux/brcm47xx/Makefile
@ -12,7 +12,7 @@ BOARDNAME:=Broadcom BCM47xx/53xx (MIPS)
 FEATURES:=squashfs usb pcmcia
 MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34

 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += swconfig wpad-mini nvram \
--- a/target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch
+++ b/target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch
@ -129,7 +129,7 @@
 
 			tp->phy_flags |= TG3_PHYFLG_IS_LOW_POWER;
 
-@@ -11783,7 +11790,7 @@ static int tg3_get_settings(struct net_d
+@@ -11782,7 +11789,7 @@ static int tg3_get_settings(struct net_d
 		struct phy_device *phydev;
 		if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED))
 			return -EAGAIN;
@ -138,7 +138,7 @@
 		return phy_ethtool_gset(phydev, cmd);
 	}
 
-@@ -11850,7 +11857,7 @@ static int tg3_set_settings(struct net_d
+@@ -11849,7 +11856,7 @@ static int tg3_set_settings(struct net_d
 		struct phy_device *phydev;
 		if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED))
 			return -EAGAIN;
@ -147,7 +147,7 @@
 		return phy_ethtool_sset(phydev, cmd);
 	}
 
-@@ -12007,7 +12014,7 @@ static int tg3_nway_reset(struct net_dev
+@@ -12006,7 +12013,7 @@ static int tg3_nway_reset(struct net_dev
 	if (tg3_flag(tp, USE_PHYLIB)) {
 		if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED))
 			return -EAGAIN;
@ -156,7 +156,7 @@
 	} else {
 		u32 bmcr;
 
-@@ -12123,7 +12130,7 @@ static int tg3_set_pauseparam(struct net
+@@ -12122,7 +12129,7 @@ static int tg3_set_pauseparam(struct net
 		u32 newadv;
 		struct phy_device *phydev;
 
@ -165,7 +165,7 @@
 
 		if (!(phydev->supported & SUPPORTED_Pause) ||
 		    (!(phydev->supported & SUPPORTED_Asym_Pause) &&
-@@ -13557,7 +13564,7 @@ static int tg3_ioctl(struct net_device *
+@@ -13556,7 +13563,7 @@ static int tg3_ioctl(struct net_device *
 		struct phy_device *phydev;
 		if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED))
 			return -EAGAIN;
@ -174,7 +174,7 @@
 		return phy_mii_ioctl(phydev, ifr, cmd);
 	}
 
-@@ -17193,8 +17200,10 @@ static int tg3_init_one(struct pci_dev *
+@@ -17192,8 +17199,10 @@ static int tg3_init_one(struct pci_dev *
 			tg3_flag_set(tp, FLUSH_POSTED_WRITES);
 		if (ssb_gige_one_dma_at_once(pdev))
 			tg3_flag_set(tp, ONE_DMA_AT_ONCE);
@ -186,7 +186,7 @@
 		if (ssb_gige_is_rgmii(pdev))
 			tg3_flag_set(tp, RGMII_MODE);
 	}
-@@ -17464,7 +17473,7 @@ static int tg3_init_one(struct pci_dev *
+@@ -17463,7 +17472,7 @@ static int tg3_init_one(struct pci_dev *
 
 	if (tp->phy_flags & TG3_PHYFLG_IS_CONNECTED) {
 		struct phy_device *phydev;
--- a/target/linux/brcm63xx/Makefile
+++ b/target/linux/brcm63xx/Makefile
@ -11,7 +11,7 @@ BOARD:=brcm63xx
 BOARDNAME:=Broadcom BCM63xx
 SUBTARGETS:=generic smp
 FEATURES:=squashfs usb atm pci pcmcia usbgadget
-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>

 include $(INCLUDE_DIR)/target.mk
--- a/target/linux/brcm63xx/patches-3.10/111-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch
+++ b/target/linux/brcm63xx/patches-3.10/111-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch
@ -31,7 +31,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
 static struct clk clk_usbd = {
 --- a/drivers/usb/gadget/bcm63xx_udc.c
 +++ b/drivers/usb/gadget/bcm63xx_udc.c
-@@ -386,7 +386,6 @@ static inline void set_clocks(struct bcm
+@@ -392,7 +392,6 @@ static inline void set_clocks(struct bcm
 	if (is_enabled) {
 		clk_enable(udc->usbh_clk);
 		clk_enable(udc->usbd_clk);
--- a/target/linux/brcm63xx/patches-3.10/112-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch
+++ b/target/linux/brcm63xx/patches-3.10/112-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch
@ -108,7 +108,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
 
 #define DRV_MODULE_NAME		"bcm63xx_udc"
 
-@@ -863,22 +864,7 @@ static void bcm63xx_select_phy_mode(stru
+@@ -869,22 +870,7 @@ static void bcm63xx_select_phy_mode(stru
 		bcm_gpio_writel(val, GPIO_PINMUX_OTHR_REG);
 	}
 
@ -132,7 +132,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
 }
 
 /**
-@@ -892,14 +878,9 @@ static void bcm63xx_select_phy_mode(stru
+@@ -898,14 +884,9 @@ static void bcm63xx_select_phy_mode(stru
  */
 static void bcm63xx_select_pullup(struct bcm63xx_udc *udc, bool is_on)
 {
--- a/target/linux/brcm63xx/patches-3.10/205-USB-fix-bcm63xx_udc.patch
+++ b/target/linux/brcm63xx/patches-3.10/205-USB-fix-bcm63xx_udc.patch
@ -1,168 +0,0 @@
-From a864a5b3efe9dce1647172d105559a1b850cf4c9 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Tue, 14 Jan 2014 15:29:25 -0800
-Subject: [PATCH] usb: gadget: bcm63xx_udc: fix build failure on DMA channel
- code
-
-Commit 3dc6475 ("bcm63xx_enet: add support Broadcom BCM6345 Ethernet")
-changed the ENETDMA[CS] macros such that they are no longer macros, but
-actual register offset definitions. The bcm63xx_udc driver was not
-updated, and as a result, causes the following build error to pop up:
-
- CC      drivers/usb/gadget/u_ether.o
-drivers/usb/gadget/bcm63xx_udc.c: In function 'iudma_write':
-drivers/usb/gadget/bcm63xx_udc.c:642:24: error: called object '0' is not
-a function
-drivers/usb/gadget/bcm63xx_udc.c: In function 'iudma_reset_channel':
-drivers/usb/gadget/bcm63xx_udc.c:698:46: error: called object '0' is not
-a function
-drivers/usb/gadget/bcm63xx_udc.c:700:49: error: called object '0' is not
-a function
-
-Fix this by updating usb_dmac_{read,write}l and usb_dmas_{read,write}l to
-take an extra channel argument, and use the channel width
-(ENETDMA_CHAN_WIDTH) to offset the register we want to access, hence
-doing again what the macro implicitely did for us.
-
-CC: Kevin Cernekee <cernekee@gmail.com>
-CC: Jonas Gorski <jogo@openwrt.org>
-CC: stable@vger.kernel.org
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
-Felipe,
-
-This is against your branch as balbi/usb.git, and this fix should be applied to
-stable 3.11 onwards.
-
-Thanks!
-
- drivers/usb/gadget/bcm63xx_udc.c | 58 ++++++++++++++++++++++------------------
- 1 file changed, 32 insertions(+), 26 deletions(-)
-
--- a/drivers/usb/gadget/bcm63xx_udc.c
-+++ b/drivers/usb/gadget/bcm63xx_udc.c
-@@ -362,24 +362,30 @@ static inline void usb_dma_writel(struct
- 	bcm_writel(val, udc->iudma_regs + off);
- }
- 
-static inline u32 usb_dmac_readl(struct bcm63xx_udc *udc, u32 off)
-+static inline u32 usb_dmac_readl(struct bcm63xx_udc *udc, u32 off, int chan)
- {
-	return bcm_readl(udc->iudma_regs + IUDMA_DMAC_OFFSET + off);
-+	return bcm_readl(udc->iudma_regs + IUDMA_DMAC_OFFSET + off +
-+			(ENETDMA_CHAN_WIDTH * chan));
- }
- 
-static inline void usb_dmac_writel(struct bcm63xx_udc *udc, u32 val, u32 off)
-+static inline void usb_dmac_writel(struct bcm63xx_udc *udc, u32 val, u32 off,
-+					int chan)
- {
-	bcm_writel(val, udc->iudma_regs + IUDMA_DMAC_OFFSET + off);
-+	bcm_writel(val, udc->iudma_regs + IUDMA_DMAC_OFFSET + off +
-+			(ENETDMA_CHAN_WIDTH * chan));
- }
- 
-static inline u32 usb_dmas_readl(struct bcm63xx_udc *udc, u32 off)
-+static inline u32 usb_dmas_readl(struct bcm63xx_udc *udc, u32 off, int chan)
- {
-	return bcm_readl(udc->iudma_regs + IUDMA_DMAS_OFFSET + off);
-+	return bcm_readl(udc->iudma_regs + IUDMA_DMAS_OFFSET + off +
-+			(ENETDMA_CHAN_WIDTH * chan));
- }
- 
-static inline void usb_dmas_writel(struct bcm63xx_udc *udc, u32 val, u32 off)
-+static inline void usb_dmas_writel(struct bcm63xx_udc *udc, u32 val, u32 off,
-+					int chan)
- {
-	bcm_writel(val, udc->iudma_regs + IUDMA_DMAS_OFFSET + off);
-+	bcm_writel(val, udc->iudma_regs + IUDMA_DMAS_OFFSET + off +
-+			(ENETDMA_CHAN_WIDTH * chan));
- }
- 
- static inline void set_clocks(struct bcm63xx_udc *udc, bool is_enabled)
-@@ -639,7 +645,7 @@ static void iudma_write(struct bcm63xx_u
- 	} while (!last_bd);
- 
- 	usb_dmac_writel(udc, ENETDMAC_CHANCFG_EN_MASK,
-			ENETDMAC_CHANCFG_REG(iudma->ch_idx));
-+			ENETDMAC_CHANCFG_REG, iudma->ch_idx);
- }
- 
- /**
-@@ -695,9 +701,9 @@ static void iudma_reset_channel(struct b
- 		bcm63xx_fifo_reset_ep(udc, max(0, iudma->ep_num));
- 
- 	/* stop DMA, then wait for the hardware to wrap up */
-	usb_dmac_writel(udc, 0, ENETDMAC_CHANCFG_REG(ch_idx));
-+	usb_dmac_writel(udc, 0, ENETDMAC_CHANCFG_REG, ch_idx);
- 
-	while (usb_dmac_readl(udc, ENETDMAC_CHANCFG_REG(ch_idx)) &
-+	while (usb_dmac_readl(udc, ENETDMAC_CHANCFG_REG, ch_idx) &
- 				   ENETDMAC_CHANCFG_EN_MASK) {
- 		udelay(1);
- 
-@@ -714,10 +720,10 @@ static void iudma_reset_channel(struct b
- 			dev_warn(udc->dev, "forcibly halting IUDMA channel %d\n",
- 				 ch_idx);
- 			usb_dmac_writel(udc, ENETDMAC_CHANCFG_BUFHALT_MASK,
-					ENETDMAC_CHANCFG_REG(ch_idx));
-+					ENETDMAC_CHANCFG_REG, ch_idx);
- 		}
- 	}
-	usb_dmac_writel(udc, ~0, ENETDMAC_IR_REG(ch_idx));
-+	usb_dmac_writel(udc, ~0, ENETDMAC_IR_REG, ch_idx);
- 
- 	/* don't leave "live" HW-owned entries for the next guy to step on */
- 	for (d = iudma->bd_ring; d <= iudma->end_bd; d++)
-@@ -729,11 +735,11 @@ static void iudma_reset_channel(struct b
- 
- 	/* set up IRQs, UBUS burst size, and BD base for this channel */
- 	usb_dmac_writel(udc, ENETDMAC_IR_BUFDONE_MASK,
-			ENETDMAC_IRMASK_REG(ch_idx));
-	usb_dmac_writel(udc, 8, ENETDMAC_MAXBURST_REG(ch_idx));
-+			ENETDMAC_IRMASK_REG, ch_idx);
-+	usb_dmac_writel(udc, 8, ENETDMAC_MAXBURST_REG, ch_idx);
- 
-	usb_dmas_writel(udc, iudma->bd_ring_dma, ENETDMAS_RSTART_REG(ch_idx));
-	usb_dmas_writel(udc, 0, ENETDMAS_SRAM2_REG(ch_idx));
-+	usb_dmas_writel(udc, iudma->bd_ring_dma, ENETDMAS_RSTART_REG, ch_idx);
-+	usb_dmas_writel(udc, 0, ENETDMAS_SRAM2_REG, ch_idx);
- }
- 
- /**
-@@ -2016,7 +2022,7 @@ static irqreturn_t bcm63xx_udc_data_isr(
- 	spin_lock(&udc->lock);
- 
- 	usb_dmac_writel(udc, ENETDMAC_IR_BUFDONE_MASK,
-			ENETDMAC_IR_REG(iudma->ch_idx));
-+			ENETDMAC_IR_REG, iudma->ch_idx);
- 	bep = iudma->bep;
- 	rc = iudma_read(udc, iudma);
- 
-@@ -2156,18 +2162,18 @@ static int bcm63xx_iudma_dbg_show(struct
- 		seq_printf(s, " [ep%d]:\n",
- 			   max_t(int, iudma_defaults[ch_idx].ep_num, 0));
- 		seq_printf(s, "  cfg: %08x; irqstat: %08x; irqmask: %08x; maxburst: %08x\n",
-			   usb_dmac_readl(udc, ENETDMAC_CHANCFG_REG(ch_idx)),
-			   usb_dmac_readl(udc, ENETDMAC_IR_REG(ch_idx)),
-			   usb_dmac_readl(udc, ENETDMAC_IRMASK_REG(ch_idx)),
-			   usb_dmac_readl(udc, ENETDMAC_MAXBURST_REG(ch_idx)));
-+			   usb_dmac_readl(udc, ENETDMAC_CHANCFG_REG, ch_idx),
-+			   usb_dmac_readl(udc, ENETDMAC_IR_REG, ch_idx),
-+			   usb_dmac_readl(udc, ENETDMAC_IRMASK_REG, ch_idx),
-+			   usb_dmac_readl(udc, ENETDMAC_MAXBURST_REG, ch_idx));
- 
-		sram2 = usb_dmas_readl(udc, ENETDMAS_SRAM2_REG(ch_idx));
-		sram3 = usb_dmas_readl(udc, ENETDMAS_SRAM3_REG(ch_idx));
-+		sram2 = usb_dmas_readl(udc, ENETDMAS_SRAM2_REG, ch_idx);
-+		sram3 = usb_dmas_readl(udc, ENETDMAS_SRAM3_REG, ch_idx);
- 		seq_printf(s, "  base: %08x; index: %04x_%04x; desc: %04x_%04x %08x\n",
-			   usb_dmas_readl(udc, ENETDMAS_RSTART_REG(ch_idx)),
-+			   usb_dmas_readl(udc, ENETDMAS_RSTART_REG, ch_idx),
- 			   sram2 >> 16, sram2 & 0xffff,
- 			   sram3 >> 16, sram3 & 0xffff,
-			   usb_dmas_readl(udc, ENETDMAS_SRAM4_REG(ch_idx)));
-+			   usb_dmas_readl(udc, ENETDMAS_SRAM4_REG, ch_idx));
- 		seq_printf(s, "  desc: %d/%d used", iudma->n_bds_used,
- 			   iudma->n_bds);
- 
--- a/target/linux/cns21xx/Makefile
+++ b/target/linux/cns21xx/Makefile
@ -12,7 +12,7 @@ BOARDNAME:=Cavium Networks Econa CNS21xx
 FEATURES:=squashfs
 CPU_TYPE:=fa526

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/generic/patches-3.10/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.10/721-phy_packets.patch
@ -79,7 +79,7 @@
 	help
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -2576,9 +2576,19 @@ int dev_hard_start_xmit(struct sk_buff *
+@@ -2581,9 +2581,19 @@ int dev_hard_start_xmit(struct sk_buff *
 		if (!list_empty(&ptype_all))
 			dev_queue_xmit_nit(skb, dev);
 
@ -102,7 +102,7 @@
 		if (rc == NETDEV_TX_OK)
 			txq_trans_update(txq);
 		return rc;
-@@ -2594,9 +2604,19 @@ gso:
+@@ -2599,9 +2609,19 @@ gso:
 		if (!list_empty(&ptype_all))
 			dev_queue_xmit_nit(nskb, dev);
 
@ -127,7 +127,7 @@
 				goto out_kfree_gso_skb;
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c
-@@ -60,6 +60,7 @@
+@@ -62,6 +62,7 @@
 #include <linux/scatterlist.h>
 #include <linux/errqueue.h>
 #include <linux/prefetch.h>
@ -135,7 +135,7 @@
 
 #include <net/protocol.h>
 #include <net/dst.h>
-@@ -441,6 +442,22 @@ struct sk_buff *__netdev_alloc_skb(struc
+@@ -443,6 +444,22 @@ struct sk_buff *__netdev_alloc_skb(struc
 }
 EXPORT_SYMBOL(__netdev_alloc_skb);
 
--- a/target/linux/imx6/Makefile
+++ b/target/linux/imx6/Makefile
@ -14,7 +14,7 @@ CPU_TYPE:=cortex-a9
 CPU_SUBTYPE:=neon
 MAINTAINER:=Luka Perkov <luka@openwrt.org>

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/imx6/patches-3.10/0061-can-flexcan-use-correct-clock-as-base-for-bit-rate-c.patch
+++ b/target/linux/imx6/patches-3.10/0061-can-flexcan-use-correct-clock-as-base-for-bit-rate-c.patch
@ -19,7 +19,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -1019,7 +1019,6 @@ static int flexcan_probe(struct platform
+@@ -1021,7 +1021,6 @@ static int flexcan_probe(struct platform
 			err = PTR_ERR(clk_ipg);
 			goto failed_clock;
 		}
@ -27,7 +27,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 		clk_per = devm_clk_get(&pdev->dev, "per");
 		if (IS_ERR(clk_per)) {
-@@ -1027,6 +1026,7 @@ static int flexcan_probe(struct platform
+@@ -1029,6 +1028,7 @@ static int flexcan_probe(struct platform
 			err = PTR_ERR(clk_per);
 			goto failed_clock;
 		}
--- a/target/linux/ixp4xx/Makefile
+++ b/target/linux/ixp4xx/Makefile
@ -13,7 +13,7 @@ FEATURES:=squashfs
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 SUBTARGETS=generic harddisk

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/ixp4xx/patches-3.10/600-skb_avoid_dmabounce.patch
+++ b/target/linux/ixp4xx/patches-3.10/600-skb_avoid_dmabounce.patch
@ -1,6 +1,6 @@
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c
-@@ -208,6 +208,9 @@ struct sk_buff *__alloc_skb(unsigned int
+@@ -210,6 +210,9 @@ struct sk_buff *__alloc_skb(unsigned int
 
 	if (sk_memalloc_socks() && (flags & SKB_ALLOC_RX))
 		gfp_mask |= __GFP_MEMALLOC;
@ -10,7 +10,7 @@
 
 	/* Get the HEAD */
 	skb = kmem_cache_alloc_node(cache, gfp_mask & ~__GFP_DMA, node);
-@@ -1052,6 +1055,10 @@ int pskb_expand_head(struct sk_buff *skb
+@@ -1054,6 +1057,10 @@ int pskb_expand_head(struct sk_buff *skb
 	if (skb_shared(skb))
 		BUG();
 
--- a/target/linux/kirkwood/Makefile
+++ b/target/linux/kirkwood/Makefile
@ -13,7 +13,7 @@ FEATURES:=targz usb jffs2_nand ubifs
 CPU_TYPE:=xscale
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/lantiq/Makefile
+++ b/target/linux/lantiq/Makefile
@ -11,7 +11,7 @@ BOARDNAME:=Lantiq GPON/XWAY/SVIP
 FEATURES:=squashfs
 SUBTARGETS=xway xrx200 ase falcon

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34

 CPU_TYPE:=mips32r2

--- a/target/linux/malta/Makefile
+++ b/target/linux/malta/Makefile
@ -12,7 +12,7 @@ SUBTARGETS:=le be le64 be64
 INITRAMFS_EXTRA_FILES:=
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34

 DEVICE_TYPE:=developerboard

--- a/target/linux/mpc85xx/Makefile
+++ b/target/linux/mpc85xx/Makefile
@ -14,7 +14,7 @@ FEATURES:=spe_fpu squashfs
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 SUBTARGETS=generic p1020

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/mvebu/Makefile
+++ b/target/linux/mvebu/Makefile
@ -14,7 +14,7 @@ CPU_TYPE:=cortex-a9
 CPU_SUBTYPE:=vfpv3
 MAINTAINER:=Luka Perkov <luka@openwrt.org>

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/octeon/Makefile
+++ b/target/linux/octeon/Makefile
@ -14,7 +14,7 @@ CPU_TYPE:=octeon
 CPU_CFLAGS_octeon:=-march=octeon
 MAINTAINER:=John Crispin <blogic@openwrt.org>

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/ppc40x/Makefile
+++ b/target/linux/ppc40x/Makefile
@ -13,7 +13,7 @@ FEATURES:=squashfs
 CPU_TYPE:=405
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/ppc44x/Makefile
+++ b/target/linux/ppc44x/Makefile
@ -13,7 +13,7 @@ FEATURES:=squashfs broken
 CPU_TYPE:=440
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/ramips/Makefile
+++ b/target/linux/ramips/Makefile
@ -12,7 +12,7 @@ BOARDNAME:=Ralink RT288x/RT3xxx
 SUBTARGETS:=rt305x mt7620a mt7620n mt7621 rt3883 rt288x
 FEATURES:=squashfs gpio

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34

 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES+=\
--- a/target/linux/ramips/patches-3.10/0211-watchdog-add-MT7621-support.patch
+++ b/target/linux/ramips/patches-3.10/0211-watchdog-add-MT7621-support.patch
@ -11,11 +11,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 3 files changed, 193 insertions(+)
 create mode 100644 drivers/watchdog/mt7621_wdt.c

-Index: linux-3.10.32/drivers/watchdog/Kconfig
-===================================================================
--- linux-3.10.32.orig/drivers/watchdog/Kconfig	2014-03-18 11:00:30.629639835 +0000
-+++ linux-3.10.32/drivers/watchdog/Kconfig	2014-03-18 11:02:35.141634769 +0000
-@@ -1120,6 +1120,13 @@
+--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
+@@ -1120,6 +1120,13 @@ config RALINK_WDT
 	help
 	  Hardware driver for the Ralink SoC Watchdog Timer.
 
@ -29,11 +27,9 @@ Index: linux-3.10.32/drivers/watchdog/Kconfig
 # PARISC Architecture
 
 # POWERPC Architecture
-Index: linux-3.10.32/drivers/watchdog/Makefile
-===================================================================
--- linux-3.10.32.orig/drivers/watchdog/Makefile	2014-03-18 11:00:30.629639835 +0000
-+++ linux-3.10.32/drivers/watchdog/Makefile	2014-03-18 11:00:31.317639807 +0000
-@@ -136,6 +136,7 @@
+--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
+@@ -136,6 +136,7 @@ obj-$(CONFIG_OCTEON_WDT) += octeon-wdt.o
 octeon-wdt-y := octeon-wdt-main.o octeon-wdt-nmi.o
 obj-$(CONFIG_LANTIQ_WDT) += lantiq_wdt.o
 obj-$(CONFIG_RALINK_WDT) += rt2880_wdt.o
@ -41,10 +37,8 @@ Index: linux-3.10.32/drivers/watchdog/Makefile
 
 # PARISC Architecture
 
-Index: linux-3.10.32/drivers/watchdog/mt7621_wdt.c
-===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.32/drivers/watchdog/mt7621_wdt.c	2014-03-18 11:00:31.317639807 +0000
+--- /dev/null
+++ b/drivers/watchdog/mt7621_wdt.c
@@ -0,0 +1,185 @@
 +/*
 + * Ralink RT288x/RT3xxx/MT76xx built-in hardware watchdog timer
--- a/target/linux/ramips/patches-3.10/0212-GPIO-ralink-add-mt7621-gpio-controller.patch
+++ b/target/linux/ramips/patches-3.10/0212-GPIO-ralink-add-mt7621-gpio-controller.patch
@ -12,11 +12,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 4 files changed, 194 insertions(+), 1 deletion(-)
 create mode 100644 drivers/gpio/gpio-mt7621.c

-Index: linux-3.10.32/arch/mips/Kconfig
-===================================================================
--- linux-3.10.32.orig/arch/mips/Kconfig	2014-03-18 11:00:30.945639822 +0000
-+++ linux-3.10.32/arch/mips/Kconfig	2014-03-18 11:00:31.325639806 +0000
-@@ -448,7 +448,10 @@
+--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
+@@ -448,7 +448,10 @@ config RALINK
 	select ARCH_REQUIRE_GPIOLIB
 	select PINCTRL
 	select PINCTRL_RT2880
@ -28,11 +26,9 @@ Index: linux-3.10.32/arch/mips/Kconfig
 config SGI_IP22
 	bool "SGI IP22 (Indy/Indigo2)"
 	select FW_ARC
-Index: linux-3.10.32/drivers/gpio/Kconfig
-===================================================================
--- linux-3.10.32.orig/drivers/gpio/Kconfig	2014-03-18 11:00:30.653639834 +0000
-+++ linux-3.10.32/drivers/gpio/Kconfig	2014-03-18 11:02:01.901636126 +0000
-@@ -710,6 +710,12 @@
+--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
+@@ -710,6 +710,12 @@ config GPIO_MSIC
 	  Enable support for GPIO on intel MSIC controllers found in
 	  intel MID devices
 
@ -45,19 +41,15 @@ Index: linux-3.10.32/drivers/gpio/Kconfig
 comment "USB GPIO expanders:"
 
 config GPIO_VIPERBOARD
-Index: linux-3.10.32/drivers/gpio/Makefile
-===================================================================
--- linux-3.10.32.orig/drivers/gpio/Makefile	2014-03-18 11:00:30.653639834 +0000
-+++ linux-3.10.32/drivers/gpio/Makefile	2014-03-18 11:00:31.325639806 +0000
-@@ -88,3 +88,4 @@
+--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
+@@ -88,3 +88,4 @@ obj-$(CONFIG_GPIO_WM831X)	+= gpio-wm831x
 obj-$(CONFIG_GPIO_WM8350)	+= gpio-wm8350.o
 obj-$(CONFIG_GPIO_WM8994)	+= gpio-wm8994.o
 obj-$(CONFIG_GPIO_XILINX)	+= gpio-xilinx.o
 +obj-$(CONFIG_GPIO_MT7621)	+= gpio-mt7621.o
-Index: linux-3.10.32/drivers/gpio/gpio-mt7621.c
-===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.32/drivers/gpio/gpio-mt7621.c	2014-03-18 11:00:31.325639806 +0000
+--- /dev/null
+++ b/drivers/gpio/gpio-mt7621.c
@@ -0,0 +1,183 @@
 +/*
 + * This program is free software; you can redistribute it and/or modify it
--- a/target/linux/ramips/patches-3.10/0217-pinmux-rt2880.patch
+++ b/target/linux/ramips/patches-3.10/0217-pinmux-rt2880.patch
@ -1,7 +1,5 @@
-Index: linux-3.10.32/arch/mips/ralink/rt288x.c
-===================================================================
--- linux-3.10.32.orig/arch/mips/ralink/rt288x.c	2014-02-22 20:41:54.000000000 +0000
-+++ linux-3.10.32/arch/mips/ralink/rt288x.c	2014-03-18 11:18:06.689596876 +0000
+--- a/arch/mips/ralink/rt288x.c
+++ b/arch/mips/ralink/rt288x.c
@@ -17,46 +17,27 @@
 #include <asm/mipsregs.h>
 #include <asm/mach-ralink/ralink_regs.h>
@ -67,7 +65,7 @@ Index: linux-3.10.32/arch/mips/ralink/rt288x.c
 };
 
 static void rt288x_wdt_reset(void)
-@@ -69,11 +50,6 @@
+@@ -69,11 +50,6 @@ static void rt288x_wdt_reset(void)
 	rt_sysc_w32(t, SYSC_REG_CLKCFG);
 }
 
@ -79,7 +77,7 @@ Index: linux-3.10.32/arch/mips/ralink/rt288x.c
 void __init ralink_clk_init(void)
 {
 	unsigned long cpu_rate;
-@@ -140,4 +116,6 @@
+@@ -140,4 +116,6 @@ void prom_soc_init(struct ralink_soc_inf
 	soc_info->mem_base = RT2880_SDRAM_BASE;
 	soc_info->mem_size_min = RT2880_MEM_SIZE_MIN;
 	soc_info->mem_size_max = RT2880_MEM_SIZE_MAX;
--- a/target/linux/rb532/Makefile
+++ b/target/linux/rb532/Makefile
@ -11,7 +11,7 @@ BOARD:=rb532
 BOARDNAME:=Mikrotik RouterBoard 532
 FEATURES:=pci targz broken

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34

 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += wpad-mini kmod-madwifi kmod-input-rb532
--- a/target/linux/realview/Makefile
+++ b/target/linux/realview/Makefile
@ -14,7 +14,7 @@ CPU_TYPE:=mpcore
 CPU_SUBTYPE:=vfp
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34

 DEVICE_TYPE:=developerboard

--- a/target/linux/sparc/Makefile
+++ b/target/linux/sparc/Makefile
@ -11,7 +11,7 @@ BOARD:=sparc
 BOARDNAME:=Sun UltraSPARC
 FEATURES+=fpu tgz ext4 squashfs broken

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>

 include $(INCLUDE_DIR)/target.mk
--- a/target/linux/x86/alix2/target.mk
+++ b/target/linux/x86/alix2/target.mk
@ -19,7 +19,7 @@ DEFAULT_PACKAGES += \
 			kmod-ledtrig-heartbeat kmod-ledtrig-gpio \
 			kmod-ledtrig-netdev \
 			kmod-cpu-msr hwclock wpad
-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34
 CS5535_MASK:=0x0b000042

 CPU_TYPE := geode
--- a/target/linux/x86/generic/target.mk
+++ b/target/linux/x86/generic/target.mk
@ -1,6 +1,6 @@
 BOARDNAME:=Generic

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34

 define Target/Description
 	Build firmware images for x86 based boards
--- a/target/linux/x86/geos/target.mk
+++ b/target/linux/x86/geos/target.mk
@ -21,7 +21,7 @@ DEFAULT_PACKAGES += \
            kmod-cpu-msr \
            soloscli linux-atm br2684ctl ppp-mod-pppoa pppdump pppstats \
            hwclock wpad flashrom tc
-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34
 CS5535_MASK:=0x0E000048

 CPU_TYPE := geode
--- a/target/linux/x86/kvm_guest/target.mk
+++ b/target/linux/x86/kvm_guest/target.mk
@ -2,4 +2,4 @@ BOARDNAME:=KVM Guest
 FEATURES:=ext4 pci usb
 DEFAULT_PACKAGES += kmod-virtio-balloon kmod-virtio-net kmod-virtio-random

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34
--- a/target/linux/x86/net5501/target.mk
+++ b/target/linux/x86/net5501/target.mk
@ -23,7 +23,7 @@ DEFAULT_PACKAGES += kmod-crypto-hw-geode kmod-crypto-ocf \
 CS5535_MASK:=0x01000040

 CPU_TYPE := geode
-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34
 FEATURES += broken

 define Target/Description
--- a/target/linux/x86/olpc/target.mk
+++ b/target/linux/x86/olpc/target.mk
@ -1,4 +1,4 @@
 BOARDNAME:=OLPC XO-1
 DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci kmod-libertas
-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34
 FEATURES += broken
--- a/target/linux/x86/rdc/target.mk
+++ b/target/linux/x86/rdc/target.mk
@ -1,7 +1,7 @@
 BOARDNAME:=RDC R-321x
 FEATURES:=squashfs pci usb gpio pcmcia
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34
 FEATURES += broken

 DEFAULT_PACKAGES += kmod-llc kmod-stp kmod-bridge kmod-8021q \
--- a/target/linux/x86/thincan/target.mk
+++ b/target/linux/x86/thincan/target.mk
@ -1,6 +1,6 @@
 DEVICE_TYPE:=terminal
 BOARDNAME:=Artec ThinCan
-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34
 CPU_TYPE := geode
 FEATURES += broken

--- a/target/linux/x86/xen_domu/target.mk
+++ b/target/linux/x86/xen_domu/target.mk
@ -1,4 +1,4 @@
 BOARDNAME:=Xen Paravirt Guest
 DEFAULT_PACKAGES += kmod-xen-fs kmod-xen-evtchn kmod-xen-netdev kmod-xen-kbddev
 FEATURES:=display broken
-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34
--- a/target/linux/xburst/Makefile
+++ b/target/linux/xburst/Makefile
@ -12,7 +12,7 @@ BOARDNAME:=Ingenic XBurst
 FEATURES:=targz ubifs audio
 SUBTARGETS:=qi_lb60 n516 n526 id800wt

-LINUX_VERSION:=3.10.32
+LINUX_VERSION:=3.10.34

 DEVICE_TYPE=other