From b472e5d12e5f607d1c9e93d53e35162c476e54dc Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Mon, 14 May 2012 09:18:32 +0000 Subject: [PATCH] kernel: update linux 3.3 to 3.3.6 SVN-Revision: 31709 --- include/kernel-version.mk | 4 +- target/linux/adm5120/Makefile | 2 +- target/linux/adm8668/Makefile | 2 +- target/linux/amazon/Makefile | 2 +- target/linux/ar7/Makefile | 2 +- target/linux/ar71xx/Makefile | 2 +- target/linux/at91/Makefile | 2 +- target/linux/atheros/Makefile | 2 +- target/linux/avr32/Makefile | 2 +- target/linux/brcm47xx/Makefile | 2 +- .../700-ssb-gigabit-ethernet-driver.patch | 44 +++++++++---------- target/linux/brcm63xx/Makefile | 2 +- target/linux/cns21xx/Makefile | 2 +- target/linux/gemini/Makefile | 2 +- .../generic/patches-3.3/721-phy_packets.patch | 4 +- target/linux/iop32x/Makefile | 2 +- target/linux/ixp4xx/Makefile | 2 +- target/linux/kirkwood/Makefile | 2 +- .../patches-3.3/201-owrt-mtd_split.patch | 6 +-- .../patches-3.3/204-owrt-dm9000-polling.patch | 14 +++--- .../patches-3.3/205-owrt-gpio-export.patch | 2 +- target/linux/malta/Makefile | 2 +- target/linux/mpc52xx/Makefile | 2 +- target/linux/mpc83xx/Makefile | 2 +- target/linux/mpc85xx/Makefile | 2 +- target/linux/omap4/Makefile | 2 +- target/linux/orion/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/sibyte/Makefile | 2 +- target/linux/uml/Makefile | 2 +- target/linux/x86/geos/target.mk | 2 +- 35 files changed, 66 insertions(+), 66 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 7a97f8974c..145ee2b012 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.5) - LINUX_KERNEL_MD5SUM:=2f6b7da0418e26312bcabd08ab448569 +ifeq ($(LINUX_VERSION),3.3.6) + LINUX_KERNEL_MD5SUM:=35f7f41aed080ca03995e06112182677 endif # disable the md5sum check for unknown kernel versions diff --git a/target/linux/adm5120/Makefile b/target/linux/adm5120/Makefile index ea7f33abf8..e534dcf416 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.5 +LINUX_VERSION:=3.3.6 SUBTARGETS:=router_le router_be rb1xx INITRAMFS_EXTRA_FILES:= diff --git a/target/linux/adm8668/Makefile b/target/linux/adm8668/Makefile index 39d6c7f250..b7d1d5fb04 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.5 +LINUX_VERSION:=3.3.6 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 bfab52e506..dc0796b1b3 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.5 +LINUX_VERSION:=3.3.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile index 74fe9d1935..33ffef0803 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.5 +LINUX_VERSION:=3.3.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index c479a443e2..49da9a39e5 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.5 +LINUX_VERSION:=3.3.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile index c9e04c534e..05bafcd4e9 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.5 +LINUX_VERSION:=3.3.6 DEVICE_TYPE= include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/atheros/Makefile b/target/linux/atheros/Makefile index 77d7fad419..60809360f3 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.5 +LINUX_VERSION:=3.3.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile index 89e929e49d..26ee6e4f38 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.5 +LINUX_VERSION:=3.3.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile index bc2b6a3dd7..3cd5d1db50 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.5 +LINUX_VERSION:=3.3.6 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini kmod-switch kmod-diag nvram diff --git a/target/linux/brcm47xx/patches-3.3/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-3.3/700-ssb-gigabit-ethernet-driver.patch index 8237b70947..71be316856 100644 --- a/target/linux/brcm47xx/patches-3.3/700-ssb-gigabit-ethernet-driver.patch +++ b/target/linux/brcm47xx/patches-3.3/700-ssb-gigabit-ethernet-driver.patch @@ -35,7 +35,7 @@ readl(mbox); } -@@ -943,7 +946,7 @@ static void tg3_switch_clocks(struct tg3 +@@ -948,7 +951,7 @@ static void tg3_switch_clocks(struct tg3 #define PHY_BUSY_LOOPS 5000 @@ -44,7 +44,7 @@ { u32 frame_val; unsigned int loops; -@@ -957,7 +960,7 @@ static int tg3_readphy(struct tg3 *tp, i +@@ -962,7 +965,7 @@ static int tg3_readphy(struct tg3 *tp, i *val = 0x0; @@ -53,7 +53,7 @@ MI_COM_PHY_ADDR_MASK); frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) & MI_COM_REG_ADDR_MASK); -@@ -992,7 +995,12 @@ static int tg3_readphy(struct tg3 *tp, i +@@ -997,7 +1000,12 @@ static int tg3_readphy(struct tg3 *tp, i return ret; } @@ -67,7 +67,7 @@ { u32 frame_val; unsigned int loops; -@@ -1008,7 +1016,7 @@ static int tg3_writephy(struct tg3 *tp, +@@ -1013,7 +1021,7 @@ static int tg3_writephy(struct tg3 *tp, udelay(80); } @@ -76,7 +76,7 @@ MI_COM_PHY_ADDR_MASK); frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) & MI_COM_REG_ADDR_MASK); -@@ -1041,6 +1049,11 @@ static int tg3_writephy(struct tg3 *tp, +@@ -1046,6 +1054,11 @@ static int tg3_writephy(struct tg3 *tp, return ret; } @@ -88,7 +88,7 @@ static int tg3_phy_cl45_write(struct tg3 *tp, u32 devad, u32 addr, u32 val) { int err; -@@ -1603,6 +1616,11 @@ static int tg3_poll_fw(struct tg3 *tp) +@@ -1608,6 +1621,11 @@ static int tg3_poll_fw(struct tg3 *tp) int i; u32 val; @@ -100,7 +100,7 @@ if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) { /* Wait up to 20ms for init done. */ for (i = 0; i < 200; i++) { -@@ -3024,9 +3042,12 @@ static int tg3_halt_cpu(struct tg3 *tp, +@@ -3029,9 +3047,12 @@ static int tg3_halt_cpu(struct tg3 *tp, return -ENODEV; } @@ -116,7 +116,7 @@ return 0; } -@@ -3089,6 +3110,11 @@ static int tg3_load_5701_a0_firmware_fix +@@ -3094,6 +3115,11 @@ static int tg3_load_5701_a0_firmware_fix const __be32 *fw_data; int err, i; @@ -128,7 +128,7 @@ fw_data = (void *)tp->fw->data; /* Firmware blob starts with version numbers, followed by -@@ -3145,6 +3171,11 @@ static int tg3_load_tso_firmware(struct +@@ -3150,6 +3176,11 @@ static int tg3_load_tso_firmware(struct unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size; int err, i; @@ -140,7 +140,7 @@ if (tg3_flag(tp, HW_TSO_1) || tg3_flag(tp, HW_TSO_2) || tg3_flag(tp, HW_TSO_3)) -@@ -3491,8 +3522,11 @@ static int tg3_power_down_prepare(struct +@@ -3496,8 +3527,11 @@ static int tg3_power_down_prepare(struct tg3_frob_aux_power(tp, true); /* Workaround for unstable PLL clock */ @@ -154,7 +154,7 @@ u32 val = tr32(0x7d00); val &= ~((1 << 16) | (1 << 4) | (1 << 2) | (1 << 1) | 1); -@@ -4006,6 +4040,14 @@ relink: +@@ -4011,6 +4045,14 @@ relink: if (current_link_up == 0 || (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)) { tg3_phy_copper_begin(tp); @@ -169,7 +169,7 @@ tg3_readphy(tp, MII_BMSR, &bmsr); if ((!tg3_readphy(tp, MII_BMSR, &bmsr) && (bmsr & BMSR_LSTATUS)) || (tp->mac_mode & MAC_MODE_PORT_INT_LPBACK)) -@@ -7819,6 +7861,14 @@ static int tg3_chip_reset(struct tg3 *tp +@@ -7833,6 +7875,14 @@ static int tg3_chip_reset(struct tg3 *tp tw32(0x5000, 0x400); } @@ -184,7 +184,7 @@ tw32(GRC_MODE, tp->grc_mode); if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) { -@@ -9233,6 +9283,11 @@ static void tg3_timer(unsigned long __op +@@ -9247,6 +9297,11 @@ static void tg3_timer(unsigned long __op tg3_flag(tp, 57765_CLASS)) tg3_chk_missed_msi(tp); @@ -196,7 +196,7 @@ if (!tg3_flag(tp, TAGGED_STATUS)) { /* All of this garbage is because when using non-tagged * IRQ status the mailbox/status_block protocol the chip -@@ -10945,6 +11000,11 @@ static int tg3_test_nvram(struct tg3 *tp +@@ -10959,6 +11014,11 @@ static int tg3_test_nvram(struct tg3 *tp if (tg3_flag(tp, NO_NVRAM)) return 0; @@ -208,7 +208,7 @@ if (tg3_nvram_read(tp, 0, &magic) != 0) return -EIO; -@@ -11902,11 +11962,11 @@ static int tg3_ioctl(struct net_device * +@@ -11916,11 +11976,11 @@ static int tg3_ioctl(struct net_device * if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES) break; /* We have no PHY */ @@ -222,7 +222,7 @@ spin_unlock_bh(&tp->lock); data->val_out = mii_regval; -@@ -11918,11 +11978,11 @@ static int tg3_ioctl(struct net_device * +@@ -11932,11 +11992,11 @@ static int tg3_ioctl(struct net_device * if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES) break; /* We have no PHY */ @@ -236,7 +236,7 @@ spin_unlock_bh(&tp->lock); return err; -@@ -12656,6 +12716,13 @@ static void __devinit tg3_get_5720_nvram +@@ -12670,6 +12730,13 @@ static void __devinit tg3_get_5720_nvram /* Chips other than 5700/5701 use the NVRAM for fetching info. */ static void __devinit tg3_nvram_init(struct tg3 *tp) { @@ -250,7 +250,7 @@ tw32_f(GRC_EEPROM_ADDR, (EEPROM_ADDR_FSM_RESET | (EEPROM_DEFAULT_CLOCK_PERIOD << -@@ -12922,6 +12989,9 @@ static int tg3_nvram_write_block(struct +@@ -12936,6 +13003,9 @@ static int tg3_nvram_write_block(struct { int ret; @@ -260,7 +260,7 @@ if (tg3_flag(tp, EEPROM_WRITE_PROT)) { tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl & ~GRC_LCLCTRL_GPIO_OUTPUT1); -@@ -14368,6 +14438,11 @@ static int __devinit tg3_get_invariants( +@@ -14382,6 +14452,11 @@ static int __devinit tg3_get_invariants( } } @@ -272,7 +272,7 @@ /* Get eeprom hw config before calling tg3_set_power_state(). * In particular, the TG3_FLAG_IS_NIC flag must be * determined before calling tg3_set_power_state() so that -@@ -14784,6 +14859,10 @@ static int __devinit tg3_get_device_addr +@@ -14798,6 +14873,10 @@ static int __devinit tg3_get_device_addr } if (!is_valid_ether_addr(&dev->dev_addr[0])) { @@ -283,7 +283,7 @@ #ifdef CONFIG_SPARC if (!tg3_get_default_macaddr_sparc(tp)) return 0; -@@ -15282,6 +15361,8 @@ static char * __devinit tg3_phy_string(s +@@ -15296,6 +15375,8 @@ static char * __devinit tg3_phy_string(s case TG3_PHY_ID_BCM5704: return "5704"; case TG3_PHY_ID_BCM5705: return "5705"; case TG3_PHY_ID_BCM5750: return "5750"; @@ -292,7 +292,7 @@ case TG3_PHY_ID_BCM5752: return "5752"; case TG3_PHY_ID_BCM5714: return "5714"; case TG3_PHY_ID_BCM5780: return "5780"; -@@ -15492,6 +15573,13 @@ static int __devinit tg3_init_one(struct +@@ -15506,6 +15587,13 @@ static int __devinit tg3_init_one(struct tp->msg_enable = tg3_debug; else tp->msg_enable = TG3_DEF_MSG_ENABLE; diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile index 41c98c15e5..9072e9ba81 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.5 +LINUX_VERSION:=3.3.6 MAINTAINER:=Florian Fainelli include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/cns21xx/Makefile b/target/linux/cns21xx/Makefile index ec0685ab15..a3c2d932c0 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.5 +LINUX_VERSION:=3.3.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/gemini/Makefile b/target/linux/gemini/Makefile index 203c6361a4..0a208839a1 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.5 +LINUX_VERSION:=3.3.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/generic/patches-3.3/721-phy_packets.patch b/target/linux/generic/patches-3.3/721-phy_packets.patch index 8efd21a6c7..99837e2f00 100644 --- a/target/linux/generic/patches-3.3/721-phy_packets.patch +++ b/target/linux/generic/patches-3.3/721-phy_packets.patch @@ -79,7 +79,7 @@ help --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -2246,9 +2246,19 @@ int dev_hard_start_xmit(struct sk_buff * +@@ -2266,9 +2266,19 @@ int dev_hard_start_xmit(struct sk_buff * } } @@ -102,7 +102,7 @@ if (rc == NETDEV_TX_OK) txq_trans_update(txq); return rc; -@@ -2268,9 +2278,19 @@ gso: +@@ -2288,9 +2298,19 @@ gso: if (dev->priv_flags & IFF_XMIT_DST_RELEASE) skb_dst_drop(nskb); diff --git a/target/linux/iop32x/Makefile b/target/linux/iop32x/Makefile index 2281431dd3..6c2da5d3ae 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.5 +LINUX_VERSION:=3.3.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile index 1d9f3ab361..c3be9cb1a7 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.5 +LINUX_VERSION:=3.3.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile index e748788368..1057100ca0 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.5 +LINUX_VERSION:=3.3.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/lantiq/patches-3.3/201-owrt-mtd_split.patch b/target/linux/lantiq/patches-3.3/201-owrt-mtd_split.patch index 62cfc4ec93..5883d2a639 100644 --- a/target/linux/lantiq/patches-3.3/201-owrt-mtd_split.patch +++ b/target/linux/lantiq/patches-3.3/201-owrt-mtd_split.patch @@ -13,7 +13,7 @@ ---help--- --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -874,6 +874,169 @@ static int refresh_rootfs_split(struct m +@@ -867,6 +867,169 @@ static int refresh_rootfs_split(struct m } #endif /* CONFIG_MTD_ROOTFS_SPLIT */ @@ -183,7 +183,7 @@ /* * This function, given a master MTD object and a partition table, creates * and registers slave MTD objects which are bound to the master according to -@@ -890,7 +1053,7 @@ int add_mtd_partitions(struct mtd_info * +@@ -883,7 +1046,7 @@ int add_mtd_partitions(struct mtd_info * struct mtd_part *slave; uint64_t cur_offset = 0; int i; @@ -192,7 +192,7 @@ int ret; #endif -@@ -907,6 +1070,17 @@ int add_mtd_partitions(struct mtd_info * +@@ -900,6 +1063,17 @@ int add_mtd_partitions(struct mtd_info * add_mtd_device(&slave->mtd); diff --git a/target/linux/lantiq/patches-3.3/204-owrt-dm9000-polling.patch b/target/linux/lantiq/patches-3.3/204-owrt-dm9000-polling.patch index ff57422d55..7e898b810d 100644 --- a/target/linux/lantiq/patches-3.3/204-owrt-dm9000-polling.patch +++ b/target/linux/lantiq/patches-3.3/204-owrt-dm9000-polling.patch @@ -17,7 +17,7 @@ spinlock_t lock; struct mii_if_info mii; -@@ -844,6 +847,8 @@ static void dm9000_timeout(struct net_de +@@ -845,6 +848,8 @@ static void dm9000_timeout(struct net_de netif_stop_queue(dev); dm9000_reset(db); dm9000_init_dm9000(dev); @@ -26,7 +26,7 @@ /* We can accept TX packets again */ dev->trans_start = jiffies; /* prevent tx timeout */ netif_wake_queue(dev); -@@ -915,6 +920,12 @@ dm9000_start_xmit(struct sk_buff *skb, s +@@ -916,6 +921,12 @@ dm9000_start_xmit(struct sk_buff *skb, s /* free this SKB */ dev_kfree_skb(skb); @@ -39,7 +39,7 @@ return NETDEV_TX_OK; } -@@ -1156,6 +1167,18 @@ static void dm9000_poll_controller(struc +@@ -1157,6 +1168,18 @@ static void dm9000_poll_controller(struc } #endif @@ -58,7 +58,7 @@ /* * Open the interface. * The interface is opened whenever "ifconfig" actives it. -@@ -1169,14 +1192,15 @@ dm9000_open(struct net_device *dev) +@@ -1170,14 +1193,15 @@ dm9000_open(struct net_device *dev) if (netif_msg_ifup(db)) dev_dbg(db->dev, "enabling %s\n", dev->name); @@ -80,7 +80,7 @@ /* GPIO0 on pre-activate PHY, Reg 1F is not set by reset */ iow(db, DM9000_GPR, 0); /* REG_1F bit0 activate phyxcer */ mdelay(1); /* delay needs by DM9000B */ -@@ -1185,8 +1209,14 @@ dm9000_open(struct net_device *dev) +@@ -1186,8 +1210,14 @@ dm9000_open(struct net_device *dev) dm9000_reset(db); dm9000_init_dm9000(dev); @@ -97,7 +97,7 @@ /* Init driver variable */ db->dbug_cnt = 0; -@@ -1194,6 +1224,9 @@ dm9000_open(struct net_device *dev) +@@ -1195,6 +1225,9 @@ dm9000_open(struct net_device *dev) mii_check_media(&db->mii, netif_msg_link(db), 1); netif_start_queue(dev); @@ -107,7 +107,7 @@ dm9000_schedule_poll(db); return 0; -@@ -1391,6 +1424,7 @@ dm9000_probe(struct platform_device *pde +@@ -1392,6 +1425,7 @@ dm9000_probe(struct platform_device *pde mutex_init(&db->addr_lock); INIT_DELAYED_WORK(&db->phy_poll, dm9000_poll_work); diff --git a/target/linux/lantiq/patches-3.3/205-owrt-gpio-export.patch b/target/linux/lantiq/patches-3.3/205-owrt-gpio-export.patch index 670b224499..df4928463c 100644 --- a/target/linux/lantiq/patches-3.3/205-owrt-gpio-export.patch +++ b/target/linux/lantiq/patches-3.3/205-owrt-gpio-export.patch @@ -32,7 +32,7 @@ if (status == 0) { struct device *dev; -@@ -1347,11 +1346,11 @@ const char *gpiochip_is_requested(struct +@@ -1351,11 +1350,11 @@ const char *gpiochip_is_requested(struct return NULL; if (test_bit(FLAG_REQUESTED, &gpio_desc[gpio].flags) == 0) return NULL; diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile index fc68528a50..7cfacb97b4 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.5 +LINUX_VERSION:=3.3.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/mpc52xx/Makefile b/target/linux/mpc52xx/Makefile index e027ed5acc..ba9074537b 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.5 +LINUX_VERSION:=3.3.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/mpc83xx/Makefile b/target/linux/mpc83xx/Makefile index 7914c22f4c..711bd98533 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.5 +LINUX_VERSION:=3.3.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile index ff8997f2e1..270ac229f5 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.5 +LINUX_VERSION:=3.3.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/omap4/Makefile b/target/linux/omap4/Makefile index 92680e58b5..bc89c0808a 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.5 +LINUX_VERSION:=3.3.6 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 73782b7efe..8008c092cd 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.5 +LINUX_VERSION:=3.3.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile index 3fe2692fed..ac02493bfe 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.5 +LINUX_VERSION:=3.3.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/pxa/Makefile b/target/linux/pxa/Makefile index 472b7bff6e..cf6cf59ac4 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.5 +LINUX_VERSION:=3.3.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index 6ac3901725..5616168c81 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.5 +LINUX_VERSION:=3.3.6 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES+=\ diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile index 33b9219e43..fd0716181d 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.5 +LINUX_VERSION:=3.3.6 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 5451971134..8484759654 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.5 +LINUX_VERSION:=3.3.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/sibyte/Makefile b/target/linux/sibyte/Makefile index a96aed4e39..7ebf2576f1 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.5 +LINUX_VERSION:=3.3.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile index 9c94c43348..ef8af39080 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.5 +LINUX_VERSION:=3.3.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/x86/geos/target.mk b/target/linux/x86/geos/target.mk index bf9fc9c8a3..008aaba3a2 100644 --- a/target/linux/x86/geos/target.mk +++ b/target/linux/x86/geos/target.mk @@ -1,4 +1,4 @@ -LINUX_VERSION:=3.3.5 +LINUX_VERSION:=3.3.6 BOARDNAME:=Traverse Geos FEATURES:=squashfs jffs2 ext4 pci usb gpio DEFAULT_PACKAGES += \ -- 2.30.2