From b739881fe45afeddb716ef5404719416a6294a91 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 1 Sep 2014 15:54:43 +0200 Subject: [PATCH] Update OpenWrt --- modules | 2 +- ...R1043N-ND-v2-Fix-MAC-address-of-WMAC.patch | 32 ------------------- ...evision-on-TP-Link-Archer-C5-and-C7.patch} | 10 +++--- 3 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 patches/openwrt/0003-ar71xx-TL-WR1043N-ND-v2-Fix-MAC-address-of-WMAC.patch rename patches/openwrt/{0004-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch => 0003-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch} (81%) diff --git a/modules b/modules index c4e26f79..7a25b765 100644 --- a/modules +++ b/modules @@ -1,7 +1,7 @@ GLUON_FEEDS='openwrt gluon routing luci' OPENWRT_REPO=git://git.openwrt.org/14.07/openwrt.git -OPENWRT_COMMIT=32d501a8daa57b58a961ed81e3fd85f92b20c7dd +OPENWRT_COMMIT=088b1cbba7c9b114b6b0bc9171561d20b86bfecf PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git PACKAGES_OPENWRT_COMMIT=eaa3e00d345a52c6dc67f8b9b0b2d4a2971425d5 diff --git a/patches/openwrt/0003-ar71xx-TL-WR1043N-ND-v2-Fix-MAC-address-of-WMAC.patch b/patches/openwrt/0003-ar71xx-TL-WR1043N-ND-v2-Fix-MAC-address-of-WMAC.patch deleted file mode 100644 index dd40c598..00000000 --- a/patches/openwrt/0003-ar71xx-TL-WR1043N-ND-v2-Fix-MAC-address-of-WMAC.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Matthias Schiffer -Date: Thu, 7 Aug 2014 15:07:15 +0200 -Subject: ar71xx: TL-WR1043N/ND v2: Fix MAC address of WMAC - -This sets the MAC address of the WLAN interface to the "official" primary MAC -address (the one on the label under the devices, and the one used with the stock -firmware). The MAC address used so far (primary-1) isn't even used at all with -the stock firmware, which sets (primary) on LAN and WLAN and (primary+1) on the -WAN interface (like OpenWrt does with this patch). - -diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c -index 4f873e2..3e79ee1 100644 ---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c -+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c -@@ -168,7 +168,6 @@ static void __init tl_wr1043nd_v2_setup(void) - { - u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00); - u8 *art = (u8 *) KSEG1ADDR(0x1fff0000); -- u8 tmpmac[ETH_ALEN]; - - ath79_register_m25p80(&wr1043nd_v2_flash_data); - -@@ -178,8 +177,7 @@ static void __init tl_wr1043nd_v2_setup(void) - ARRAY_SIZE(tl_wr1043_v2_gpio_keys), - tl_wr1043_v2_gpio_keys); - -- ath79_init_mac(tmpmac, mac, -1); -- ath79_register_wmac(art + TL_WR1043_V2_WMAC_CALDATA_OFFSET, tmpmac); -+ ath79_register_wmac(art + TL_WR1043_V2_WMAC_CALDATA_OFFSET, mac); - - mdiobus_register_board_info(wr1043nd_v2_mdio0_info, - ARRAY_SIZE(wr1043nd_v2_mdio0_info)); diff --git a/patches/openwrt/0004-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch b/patches/openwrt/0003-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch similarity index 81% rename from patches/openwrt/0004-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch rename to patches/openwrt/0003-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch index 84b2b69e..e6371420 100644 --- a/patches/openwrt/0004-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch +++ b/patches/openwrt/0003-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch @@ -3,12 +3,12 @@ Date: Sat, 16 Aug 2014 17:52:34 +0200 Subject: ar71xx: correctly detect hardware revision on TP-Link Archer C5 and C7 diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index a067604..8654d6a 100755 +index 1e96b6d..5aceaee 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh -@@ -211,6 +211,13 @@ tplink_board_detect() { - "453000"*) - model="MERCURY MW4530R" +@@ -214,6 +214,13 @@ tplink_board_detect() { + "934100"*) + model="NC-LINK SMART-300" ;; + "c50000"*) + model="TP-Link Archer C5" @@ -20,7 +20,7 @@ index a067604..8654d6a 100755 *) hwver="" ;; -@@ -736,7 +743,7 @@ ar71xx_board_detect() { +@@ -745,7 +752,7 @@ ar71xx_board_detect() { esac case "$machine" in