Changeset 31709


Ignore:
Timestamp:
2012-05-14T11:18:32+02:00 (6 years ago)
Author:
juhosg
Message:

kernel: update linux 3.3 to 3.3.6

Location:
trunk
Files:
35 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/kernel-version.mk

    r31645 r31709  
    3939  LINUX_KERNEL_MD5SUM:=246e6bd28ea44c90ec66c7f8b56e4803 
    4040endif 
    41 ifeq ($(LINUX_VERSION),3.3.5) 
    42   LINUX_KERNEL_MD5SUM:=2f6b7da0418e26312bcabd08ab448569 
     41ifeq ($(LINUX_VERSION),3.3.6) 
     42  LINUX_KERNEL_MD5SUM:=35f7f41aed080ca03995e06112182677 
    4343endif 
    4444 
  • trunk/target/linux/adm5120/Makefile

    r31645 r31709  
    1010BOARD:=adm5120 
    1111BOARDNAME:=Infineon/ADMtek ADM5120 
    12 LINUX_VERSION:=3.3.5 
     12LINUX_VERSION:=3.3.6 
    1313SUBTARGETS:=router_le router_be rb1xx 
    1414INITRAMFS_EXTRA_FILES:= 
  • trunk/target/linux/adm8668/Makefile

    r31645 r31709  
    1313MAINTAINER:=Florian Fainelli <florian@openwrt.org> 
    1414 
    15 LINUX_VERSION:=3.3.5 
     15LINUX_VERSION:=3.3.6 
    1616 
    1717include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/amazon/Makefile

    r31706 r31709  
    1111BOARDNAME:=Infineon Amazon 
    1212FEATURES:=squashfs jffs2 broken 
    13 LINUX_VERSION:=3.3.5 
     13LINUX_VERSION:=3.3.6 
    1414 
    1515include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/ar7/Makefile

    r31645 r31709  
    1313MAINTAINER:=Florian Fainelli <florian@openwrt.org> 
    1414 
    15 LINUX_VERSION:=3.3.5 
     15LINUX_VERSION:=3.3.6 
    1616 
    1717include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/ar71xx/Makefile

    r31645 r31709  
    1414SUBTARGETS:=generic nand 
    1515 
    16 LINUX_VERSION:=3.3.5 
     16LINUX_VERSION:=3.3.6 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/at91/Makefile

    r31645 r31709  
    1515SUBTARGETS:=9g20 9260 9263 
    1616 
    17 LINUX_VERSION:=3.3.5 
     17LINUX_VERSION:=3.3.6 
    1818DEVICE_TYPE= 
    1919 
  • trunk/target/linux/atheros/Makefile

    r31645 r31709  
    1212FEATURES:=squashfs jffs2 
    1313 
    14 LINUX_VERSION:=3.3.5 
     14LINUX_VERSION:=3.3.6 
    1515 
    1616include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/avr32/Makefile

    r31645 r31709  
    1313MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> 
    1414 
    15 LINUX_VERSION:=3.3.5 
     15LINUX_VERSION:=3.3.6 
    1616 
    1717include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/brcm47xx/Makefile

    r31645 r31709  
    1212FEATURES:=squashfs usb pcmcia 
    1313 
    14 LINUX_VERSION:=3.3.5 
     14LINUX_VERSION:=3.3.6 
    1515 
    1616include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/brcm47xx/patches-3.3/700-ssb-gigabit-ethernet-driver.patch

    r31694 r31709  
    3636 } 
    3737  
    38 @@ -943,7 +946,7 @@ static void tg3_switch_clocks(struct tg3 
     38@@ -948,7 +951,7 @@ static void tg3_switch_clocks(struct tg3 
    3939  
    4040 #define PHY_BUSY_LOOPS 5000 
     
    4545        u32 frame_val; 
    4646        unsigned int loops; 
    47 @@ -957,7 +960,7 @@ static int tg3_readphy(struct tg3 *tp, i 
     47@@ -962,7 +965,7 @@ static int tg3_readphy(struct tg3 *tp, i 
    4848  
    4949        *val = 0x0; 
     
    5454        frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) & 
    5555                      MI_COM_REG_ADDR_MASK); 
    56 @@ -992,7 +995,12 @@ static int tg3_readphy(struct tg3 *tp, i 
     56@@ -997,7 +1000,12 @@ static int tg3_readphy(struct tg3 *tp, i 
    5757        return ret; 
    5858 } 
     
    6868        u32 frame_val; 
    6969        unsigned int loops; 
    70 @@ -1008,7 +1016,7 @@ static int tg3_writephy(struct tg3 *tp, 
     70@@ -1013,7 +1021,7 @@ static int tg3_writephy(struct tg3 *tp, 
    7171                udelay(80); 
    7272        } 
     
    7777        frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) & 
    7878                      MI_COM_REG_ADDR_MASK); 
    79 @@ -1041,6 +1049,11 @@ static int tg3_writephy(struct tg3 *tp, 
     79@@ -1046,6 +1054,11 @@ static int tg3_writephy(struct tg3 *tp, 
    8080        return ret; 
    8181 } 
     
    8989 { 
    9090        int err; 
    91 @@ -1603,6 +1616,11 @@ static int tg3_poll_fw(struct tg3 *tp) 
     91@@ -1608,6 +1621,11 @@ static int tg3_poll_fw(struct tg3 *tp) 
    9292        int i; 
    9393        u32 val; 
     
    101101                /* Wait up to 20ms for init done. */ 
    102102                for (i = 0; i < 200; i++) { 
    103 @@ -3024,9 +3042,12 @@ static int tg3_halt_cpu(struct tg3 *tp, 
     103@@ -3029,9 +3047,12 @@ static int tg3_halt_cpu(struct tg3 *tp, 
    104104                return -ENODEV; 
    105105        } 
     
    117117 } 
    118118  
    119 @@ -3089,6 +3110,11 @@ static int tg3_load_5701_a0_firmware_fix 
     119@@ -3094,6 +3115,11 @@ static int tg3_load_5701_a0_firmware_fix 
    120120        const __be32 *fw_data; 
    121121        int err, i; 
     
    129129  
    130130        /* Firmware blob starts with version numbers, followed by 
    131 @@ -3145,6 +3171,11 @@ static int tg3_load_tso_firmware(struct 
     131@@ -3150,6 +3176,11 @@ static int tg3_load_tso_firmware(struct 
    132132        unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size; 
    133133        int err, i; 
     
    141141            tg3_flag(tp, HW_TSO_2) || 
    142142            tg3_flag(tp, HW_TSO_3)) 
    143 @@ -3491,8 +3522,11 @@ static int tg3_power_down_prepare(struct 
     143@@ -3496,8 +3527,11 @@ static int tg3_power_down_prepare(struct 
    144144        tg3_frob_aux_power(tp, true); 
    145145  
     
    155155  
    156156                val &= ~((1 << 16) | (1 << 4) | (1 << 2) | (1 << 1) | 1); 
    157 @@ -4006,6 +4040,14 @@ relink: 
     157@@ -4011,6 +4045,14 @@ relink: 
    158158        if (current_link_up == 0 || (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)) { 
    159159                tg3_phy_copper_begin(tp); 
     
    170170                if ((!tg3_readphy(tp, MII_BMSR, &bmsr) && (bmsr & BMSR_LSTATUS)) || 
    171171                    (tp->mac_mode & MAC_MODE_PORT_INT_LPBACK)) 
    172 @@ -7819,6 +7861,14 @@ static int tg3_chip_reset(struct tg3 *tp 
     172@@ -7833,6 +7875,14 @@ static int tg3_chip_reset(struct tg3 *tp 
    173173                tw32(0x5000, 0x400); 
    174174        } 
     
    185185  
    186186        if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) { 
    187 @@ -9233,6 +9283,11 @@ static void tg3_timer(unsigned long __op 
     187@@ -9247,6 +9297,11 @@ static void tg3_timer(unsigned long __op 
    188188            tg3_flag(tp, 57765_CLASS)) 
    189189                tg3_chk_missed_msi(tp); 
     
    197197                /* All of this garbage is because when using non-tagged 
    198198                 * IRQ status the mailbox/status_block protocol the chip 
    199 @@ -10945,6 +11000,11 @@ static int tg3_test_nvram(struct tg3 *tp 
     199@@ -10959,6 +11014,11 @@ static int tg3_test_nvram(struct tg3 *tp 
    200200        if (tg3_flag(tp, NO_NVRAM)) 
    201201                return 0; 
     
    209209                return -EIO; 
    210210  
    211 @@ -11902,11 +11962,11 @@ static int tg3_ioctl(struct net_device * 
     211@@ -11916,11 +11976,11 @@ static int tg3_ioctl(struct net_device * 
    212212                if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES) 
    213213                        break;                  /* We have no PHY */ 
     
    223223  
    224224                data->val_out = mii_regval; 
    225 @@ -11918,11 +11978,11 @@ static int tg3_ioctl(struct net_device * 
     225@@ -11932,11 +11992,11 @@ static int tg3_ioctl(struct net_device * 
    226226                if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES) 
    227227                        break;                  /* We have no PHY */ 
     
    237237  
    238238                return err; 
    239 @@ -12656,6 +12716,13 @@ static void __devinit tg3_get_5720_nvram 
     239@@ -12670,6 +12730,13 @@ static void __devinit tg3_get_5720_nvram 
    240240 /* Chips other than 5700/5701 use the NVRAM for fetching info. */ 
    241241 static void __devinit tg3_nvram_init(struct tg3 *tp) 
     
    251251             (EEPROM_ADDR_FSM_RESET | 
    252252              (EEPROM_DEFAULT_CLOCK_PERIOD << 
    253 @@ -12922,6 +12989,9 @@ static int tg3_nvram_write_block(struct 
     253@@ -12936,6 +13003,9 @@ static int tg3_nvram_write_block(struct 
    254254 { 
    255255        int ret; 
     
    261261                tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl & 
    262262                       ~GRC_LCLCTRL_GPIO_OUTPUT1); 
    263 @@ -14368,6 +14438,11 @@ static int __devinit tg3_get_invariants( 
     263@@ -14382,6 +14452,11 @@ static int __devinit tg3_get_invariants( 
    264264                } 
    265265        } 
     
    273273         * In particular, the TG3_FLAG_IS_NIC flag must be 
    274274         * determined before calling tg3_set_power_state() so that 
    275 @@ -14784,6 +14859,10 @@ static int __devinit tg3_get_device_addr 
     275@@ -14798,6 +14873,10 @@ static int __devinit tg3_get_device_addr 
    276276        } 
    277277  
     
    284284                if (!tg3_get_default_macaddr_sparc(tp)) 
    285285                        return 0; 
    286 @@ -15282,6 +15361,8 @@ static char * __devinit tg3_phy_string(s 
     286@@ -15296,6 +15375,8 @@ static char * __devinit tg3_phy_string(s 
    287287        case TG3_PHY_ID_BCM5704:        return "5704"; 
    288288        case TG3_PHY_ID_BCM5705:        return "5705"; 
     
    293293        case TG3_PHY_ID_BCM5714:        return "5714"; 
    294294        case TG3_PHY_ID_BCM5780:        return "5780"; 
    295 @@ -15492,6 +15573,13 @@ static int __devinit tg3_init_one(struct 
     295@@ -15506,6 +15587,13 @@ static int __devinit tg3_init_one(struct 
    296296                tp->msg_enable = tg3_debug; 
    297297        else 
  • trunk/target/linux/brcm63xx/Makefile

    r31645 r31709  
    1111BOARDNAME:=Broadcom BCM63xx 
    1212FEATURES:=squashfs jffs2 usb atm pci pcmcia 
    13 LINUX_VERSION:=3.3.5 
     13LINUX_VERSION:=3.3.6 
    1414MAINTAINER:=Florian Fainelli <florian@openwrt.org> 
    1515 
  • trunk/target/linux/cns21xx/Makefile

    r31645 r31709  
    1313CFLAGS:=-Os -pipe -march=armv4 -mtune=fa526 -fno-caller-saves 
    1414 
    15 LINUX_VERSION:=3.3.5 
     15LINUX_VERSION:=3.3.6 
    1616 
    1717include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/gemini/Makefile

    r31699 r31709  
    1414MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> 
    1515 
    16 LINUX_VERSION:=3.3.5 
     16LINUX_VERSION:=3.3.6 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/generic/patches-3.3/721-phy_packets.patch

    r31637 r31709  
    8080--- a/net/core/dev.c 
    8181+++ b/net/core/dev.c 
    82 @@ -2246,9 +2246,19 @@ int dev_hard_start_xmit(struct sk_buff * 
     82@@ -2266,9 +2266,19 @@ int dev_hard_start_xmit(struct sk_buff * 
    8383                        } 
    8484                } 
     
    103103                        txq_trans_update(txq); 
    104104                return rc; 
    105 @@ -2268,9 +2278,19 @@ gso: 
     105@@ -2288,9 +2298,19 @@ gso: 
    106106                if (dev->priv_flags & IFF_XMIT_DST_RELEASE) 
    107107                        skb_dst_drop(nskb); 
  • trunk/target/linux/iop32x/Makefile

    r31684 r31709  
    1313MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> 
    1414 
    15 LINUX_VERSION:=3.3.5 
     15LINUX_VERSION:=3.3.6 
    1616 
    1717include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/ixp4xx/Makefile

    r31662 r31709  
    1414SUBTARGETS=generic harddisk 
    1515 
    16 LINUX_VERSION:=3.3.5 
     16LINUX_VERSION:=3.3.6 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/kirkwood/Makefile

    r31665 r31709  
    1313MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> 
    1414 
    15 LINUX_VERSION:=3.3.5 
     15LINUX_VERSION:=3.3.6 
    1616 
    1717include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/lantiq/patches-3.3/201-owrt-mtd_split.patch

    r31671 r31709  
    1414--- a/drivers/mtd/mtdpart.c 
    1515+++ b/drivers/mtd/mtdpart.c 
    16 @@ -874,6 +874,169 @@ static int refresh_rootfs_split(struct m 
     16@@ -867,6 +867,169 @@ static int refresh_rootfs_split(struct m 
    1717 } 
    1818 #endif /* CONFIG_MTD_ROOTFS_SPLIT */ 
     
    184184  * This function, given a master MTD object and a partition table, creates 
    185185  * and registers slave MTD objects which are bound to the master according to 
    186 @@ -890,7 +1053,7 @@ int add_mtd_partitions(struct mtd_info * 
     186@@ -883,7 +1046,7 @@ int add_mtd_partitions(struct mtd_info * 
    187187        struct mtd_part *slave; 
    188188        uint64_t cur_offset = 0; 
     
    193193 #endif 
    194194  
    195 @@ -907,6 +1070,17 @@ int add_mtd_partitions(struct mtd_info * 
     195@@ -900,6 +1063,17 @@ int add_mtd_partitions(struct mtd_info * 
    196196  
    197197                add_mtd_device(&slave->mtd); 
  • trunk/target/linux/lantiq/patches-3.3/204-owrt-dm9000-polling.patch

    r31671 r31709  
    1818  
    1919        struct mii_if_info mii; 
    20 @@ -844,6 +847,8 @@ static void dm9000_timeout(struct net_de 
     20@@ -845,6 +848,8 @@ static void dm9000_timeout(struct net_de 
    2121        netif_stop_queue(dev); 
    2222        dm9000_reset(db); 
     
    2727        dev->trans_start = jiffies; /* prevent tx timeout */ 
    2828        netif_wake_queue(dev); 
    29 @@ -915,6 +920,12 @@ dm9000_start_xmit(struct sk_buff *skb, s 
     29@@ -916,6 +921,12 @@ dm9000_start_xmit(struct sk_buff *skb, s 
    3030        /* free this SKB */ 
    3131        dev_kfree_skb(skb); 
     
    4040 } 
    4141  
    42 @@ -1156,6 +1167,18 @@ static void dm9000_poll_controller(struc 
     42@@ -1157,6 +1168,18 @@ static void dm9000_poll_controller(struc 
    4343 } 
    4444 #endif 
     
    5959  *  Open the interface. 
    6060  *  The interface is opened whenever "ifconfig" actives it. 
    61 @@ -1169,14 +1192,15 @@ dm9000_open(struct net_device *dev) 
     61@@ -1170,14 +1193,15 @@ dm9000_open(struct net_device *dev) 
    6262        if (netif_msg_ifup(db)) 
    6363                dev_dbg(db->dev, "enabling %s\n", dev->name); 
     
    8181        iow(db, DM9000_GPR, 0); /* REG_1F bit0 activate phyxcer */ 
    8282        mdelay(1); /* delay needs by DM9000B */ 
    83 @@ -1185,8 +1209,14 @@ dm9000_open(struct net_device *dev) 
     83@@ -1186,8 +1210,14 @@ dm9000_open(struct net_device *dev) 
    8484        dm9000_reset(db); 
    8585        dm9000_init_dm9000(dev); 
     
    9898        /* Init driver variable */ 
    9999        db->dbug_cnt = 0; 
    100 @@ -1194,6 +1224,9 @@ dm9000_open(struct net_device *dev) 
     100@@ -1195,6 +1225,9 @@ dm9000_open(struct net_device *dev) 
    101101        mii_check_media(&db->mii, netif_msg_link(db), 1); 
    102102        netif_start_queue(dev); 
     
    108108  
    109109        return 0; 
    110 @@ -1391,6 +1424,7 @@ dm9000_probe(struct platform_device *pde 
     110@@ -1392,6 +1425,7 @@ dm9000_probe(struct platform_device *pde 
    111111        mutex_init(&db->addr_lock); 
    112112  
  • trunk/target/linux/lantiq/patches-3.3/205-owrt-gpio-export.patch

    r31671 r31709  
    3333                struct device   *dev; 
    3434  
    35 @@ -1347,11 +1346,11 @@ const char *gpiochip_is_requested(struct 
     35@@ -1351,11 +1350,11 @@ const char *gpiochip_is_requested(struct 
    3636                return NULL; 
    3737        if (test_bit(FLAG_REQUESTED, &gpio_desc[gpio].flags) == 0) 
  • trunk/target/linux/malta/Makefile

    r31645 r31709  
    1414MAINTAINER:=Florian Fainelli <florian@openwrt.org> 
    1515 
    16 LINUX_VERSION:=3.3.5 
     16LINUX_VERSION:=3.3.6 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/mpc52xx/Makefile

    r31645 r31709  
    1313FEATURES:=targz ext4 
    1414 
    15 LINUX_VERSION:=3.3.5 
     15LINUX_VERSION:=3.3.6 
    1616 
    1717include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/mpc83xx/Makefile

    r31645 r31709  
    1414MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> 
    1515 
    16 LINUX_VERSION:=3.3.5 
     16LINUX_VERSION:=3.3.6 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/mpc85xx/Makefile

    r31660 r31709  
    1414MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> 
    1515 
    16 LINUX_VERSION:=3.3.5 
     16LINUX_VERSION:=3.3.6 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/omap4/Makefile

    r31645 r31709  
    1212FEATURES:=usb targz audio display 
    1313 
    14 LINUX_VERSION:=3.3.5 
     14LINUX_VERSION:=3.3.6 
    1515 
    1616CFLAGS:=-Os -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp 
  • trunk/target/linux/orion/Makefile

    r31674 r31709  
    1414MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> 
    1515 
    16 LINUX_VERSION:=3.3.5 
     16LINUX_VERSION:=3.3.6 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/ppc40x/Makefile

    r31645 r31709  
    1414MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> 
    1515 
    16 LINUX_VERSION:=3.3.5 
     16LINUX_VERSION:=3.3.6 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/pxa/Makefile

    r31645 r31709  
    1313MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> 
    1414 
    15 LINUX_VERSION:=3.3.5 
     15LINUX_VERSION:=3.3.6 
    1616 
    1717include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/ramips/Makefile

    r31645 r31709  
    1414FEATURES:=squashfs 
    1515 
    16 LINUX_VERSION:=3.3.5 
     16LINUX_VERSION:=3.3.6 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/rb532/Makefile

    r31645 r31709  
    1212FEATURES:=jffs2 pci targz broken 
    1313 
    14 LINUX_VERSION:=3.3.5 
     14LINUX_VERSION:=3.3.6 
    1515 
    1616include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/rdc/Makefile

    r31645 r31709  
    1414MAINTAINER:=Florian Fainelli <florian@openwrt.org> 
    1515 
    16 LINUX_VERSION:=3.3.5 
     16LINUX_VERSION:=3.3.6 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/sibyte/Makefile

    r31681 r31709  
    1414MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> 
    1515 
    16 LINUX_VERSION:=3.3.5 
     16LINUX_VERSION:=3.3.6 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/uml/Makefile

    r31645 r31709  
    2424MAINTAINER:=Florian Fainelli <florian@openwrt.org> 
    2525 
    26 LINUX_VERSION:=3.3.5 
     26LINUX_VERSION:=3.3.6 
    2727 
    2828include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/x86/geos/target.mk

    r31645 r31709  
    1 LINUX_VERSION:=3.3.5 
     1LINUX_VERSION:=3.3.6 
    22BOARDNAME:=Traverse Geos 
    33FEATURES:=squashfs jffs2 ext4 pci usb gpio 
Note: See TracChangeset for help on using the changeset viewer.