diff --git a/README.md b/README.md index ece1c2c3..6732dea5 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ TPLink CPE210 v1.0/v1.1 | ar71xx | cpe210-220-v1 | 64Mb | stable TPLink CPE210 v2.0 | ath79 | cpe210-v2 | 64Mb | stable TPLink CPE210 v3.0 | ath79 | cpe210-v3 | 64Mb | stable TPLink CPE220 v2.0 | ar71xx | cpe220-v2 | 64Mb | stable -TPLink CPE220 v3.0 | ar71xx | cpe220-v3 | 64Mb | stable +TPLink CPE220 v3.0 | ath79 | cpe220-v3 | 64Mb | stable TPLink CPE510 v1.0/v1.1 | ar71xx | cpe510-520-v1 | 64Mb | stable TPLink CPE510 v2.0 | ar71xx | cpe510-v2 | 64Mb | stable TPLink CPE510 v3.0 | ar71xx | cpe510-v3 | 64Mb | stable @@ -129,14 +129,21 @@ only. Depending on deployed usage, 2 cat5 cables may be needed. The following devices have enhanced Ethernet port usage. A single cat5 to the device could be plugged into ether the 'main' or 'secondary' port with standard port functionality. Both ports can be used interchangeably and simultaneously with LAN devices on both ports -at the same time. POE PassThough can be turned on in Advanced Settings to power ipCams or -other mesh nodes. +at the same time. + +If the device's hardware supports POE (Power Over Ethernet) pass-through from main port to secondary +port, an Advanced Setting option will show to turn on/off. This is useful to power ipCams or other +mesh nodes by daisy chaining the network cable from one device to another. Then only one network +cable may be needed to reach 2 or 3 devices on the tower. Be sure to check the power capacity in the +vendor specifications to not exceed. The first device in the chain will provide the DHCP address to +all LAN devices on all nodes (because it powers up first). -* NanoStation M5 XW * NanoStation M2 XW +* NanoStation M5 XW * NanoStation M2 XM * NanoStation M3 XM * NanoStation M5 XM +* TP-Link CPE220 v3 The Mikrotik hAP AC Lite, Ubiquiti AirRouter, and AirRouter HP are pre-configured with the following VLANs: diff --git a/configs/ar71xx-generic.config b/configs/ar71xx-generic.config index 32bcd894..077fe733 100644 --- a/configs/ar71xx-generic.config +++ b/configs/ar71xx-generic.config @@ -2,7 +2,6 @@ CONFIG_TARGET_ar71xx=y CONFIG_TARGET_ar71xx_generic=y CONFIG_TARGET_MULTI_PROFILE=y CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_cpe220-v2=y -CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_cpe220-v3=y CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_cpe210-220-v1=y CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_cpe510-520-v1=y CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_cpe510-v2=y diff --git a/configs/ath79-generic.config b/configs/ath79-generic.config index 79cd959c..d3459505 100644 --- a/configs/ath79-generic.config +++ b/configs/ath79-generic.config @@ -4,6 +4,7 @@ CONFIG_TARGET_MULTI_PROFILE=y CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_glinet_gl-ar150=y CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_cpe210-v2=y CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_cpe210-v3=y +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_cpe220-v3=y CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_airrouter=y CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_bullet-m=y CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_bullet-m-xw=y diff --git a/files/etc/config.mesh/network b/files/etc/config.mesh/network index 7fe5eeed..4b4c3e0c 100644 --- a/files/etc/config.mesh/network +++ b/files/etc/config.mesh/network @@ -20,7 +20,7 @@ include /etc/aredn_include/ethmacfixup #### WAN configuration config interface wan option ifname "" -include /etc/aredn_include/nanostation-xm +include /etc/aredn_include/bridge_ports option proto option ipaddr option netmask @@ -37,7 +37,7 @@ config interface wifi #### device to device configuration config interface dtdlink option ifname "" -include /etc/aredn_include/nanostation-xm +include /etc/aredn_include/bridge_ports option proto static option ipaddr option netmask 255.0.0.0 diff --git a/files/etc/uci-defaults/99_setup_aredn_include b/files/etc/uci-defaults/99_setup_aredn_include index 2f599fb9..07490b41 100755 --- a/files/etc/uci-defaults/99_setup_aredn_include +++ b/files/etc/uci-defaults/99_setup_aredn_include @@ -149,9 +149,9 @@ fi fi hwtype="$('/usr/local/bin/get_hardwaretype')" -touch /etc/aredn_include/nanostation-xm -if [ ! -f /etc/aredn_include/nanostation-m -a "$hwtype" = "nanostation-m" ]; then - echo " option type 'bridge'" > /etc/aredn_include/nanostation-xm +touch /etc/aredn_include/bridge_ports +if [ "$hwtype" = "nanostation-m" -o "$hwtype" = "cpe220-v3" ]; then + echo " option type 'bridge'" > /etc/aredn_include/bridge_ports fi exit 0 diff --git a/files/www/cgi-bin/perlfunc.pm b/files/www/cgi-bin/perlfunc.pm index 835eb3c8..4e007c5a 100644 --- a/files/www/cgi-bin/perlfunc.pm +++ b/files/www/cgi-bin/perlfunc.pm @@ -1039,8 +1039,8 @@ sub hardware_info 'rfband' => '2400', 'chanpower' => { 1 => '27', 2 => '28', 9 => '29', 14 => '27' }, }, - 'TP-Link CPE210 v3.0' => { - 'name' => 'TP-Link CPE210 v3.0', + 'TP-LINK CPE210 v3' => { + 'name' => 'TP-LINK CPE210 v3', 'comment' => '', 'supported' => '1', 'maxpower' => '25', @@ -1059,8 +1059,8 @@ sub hardware_info 'rfband' => '2400', 'chanpower' => { 1 => '25', 2 => '28', 11 => '27' }, }, - 'TP-Link CPE220 v3.0' => { - 'name' => 'TP-Link CPE220 v3.0', + 'TP-Link CPE220 v3' => { + 'name' => 'TP-Link CPE220 v3', 'comment' => '', 'supported' => '1', 'maxpower' => '30', diff --git a/openwrt.mk b/openwrt.mk index ac3299b9..fbef593d 100644 --- a/openwrt.mk +++ b/openwrt.mk @@ -2,5 +2,5 @@ OPENWRT_SRC=https://github.com/openwrt/openwrt.git # what branch, tag or commit in this repo? -OPENWRT_COMMIT=v19.07.0 +OPENWRT_COMMIT=af79c3bccce6781c7045bd09d37585a96c0a6137 diff --git a/patches/001-add_support_for_TP-Link_CPE220_v3.patch b/patches/001-add_support_for_TP-Link_CPE220_v3.patch index 61388e16..02fafae1 100644 --- a/patches/001-add_support_for_TP-Link_CPE220_v3.patch +++ b/patches/001-add_support_for_TP-Link_CPE220_v3.patch @@ -175,7 +175,7 @@ Index: openwrt/tools/firmware-utils/src/tplink-safeloader.c =================================================================== --- openwrt.orig/tools/firmware-utils/src/tplink-safeloader.c +++ openwrt/tools/firmware-utils/src/tplink-safeloader.c -@@ -232,6 +232,47 @@ static struct device_info boards[] = { +@@ -313,6 +313,47 @@ static struct device_info boards[] = { .last_sysupgrade_partition = "support-list", }, diff --git a/patches/001-add_support_for_TP-Link_CPE510_v3.patch b/patches/001-add_support_for_TP-Link_CPE510_v3.patch index 6dea00b5..df562e38 100644 --- a/patches/001-add_support_for_TP-Link_CPE510_v3.patch +++ b/patches/001-add_support_for_TP-Link_CPE510_v3.patch @@ -109,7 +109,7 @@ Index: openwrt/tools/firmware-utils/src/tplink-safeloader.c =================================================================== --- openwrt.orig/tools/firmware-utils/src/tplink-safeloader.c +++ openwrt/tools/firmware-utils/src/tplink-safeloader.c -@@ -368,7 +368,17 @@ static struct device_info boards[] = { +@@ -409,7 +409,17 @@ static struct device_info boards[] = { "CPE510(TP-LINK|US|N300-5|55530000):2.0\r\n" "CPE510(TP-LINK|UN|N300-5):2.0\r\n" "CPE510(TP-LINK|EU|N300-5):2.0\r\n" diff --git a/patches/001-add_support_for_TP-Link_CPE610_v1.patch b/patches/001-add_support_for_TP-Link_CPE610_v1.patch index 88ded442..566b7119 100644 --- a/patches/001-add_support_for_TP-Link_CPE610_v1.patch +++ b/patches/001-add_support_for_TP-Link_CPE610_v1.patch @@ -19,7 +19,7 @@ Index: openwrt/tools/firmware-utils/src/tplink-safeloader.c /* Copyright (c) 2014, Matthias Schiffer All rights reserved. -@@ -248,6 +249,46 @@ static struct device_info boards[] = { +@@ -250,6 +251,46 @@ static struct device_info boards[] = { .support_trail = '\xff', .soft_ver = NULL, diff --git a/patches/001-add_support_for_TP-Link_WBS510_v2.patch b/patches/001-add_support_for_TP-Link_WBS510_v2.patch index efdb8484..160305fa 100644 --- a/patches/001-add_support_for_TP-Link_WBS510_v2.patch +++ b/patches/001-add_support_for_TP-Link_WBS510_v2.patch @@ -151,7 +151,7 @@ Index: openwrt/tools/firmware-utils/src/tplink-safeloader.c =================================================================== --- openwrt.orig/tools/firmware-utils/src/tplink-safeloader.c +++ openwrt/tools/firmware-utils/src/tplink-safeloader.c -@@ -477,6 +477,39 @@ static struct device_info boards[] = { +@@ -518,6 +518,39 @@ static struct device_info boards[] = { .last_sysupgrade_partition = "support-list", }, diff --git a/patches/001-ath79-cpe220v3-sysupgrade-supported.patch b/patches/001-ath79-cpe220v3-sysupgrade-supported.patch new file mode 100644 index 00000000..87bfe069 --- /dev/null +++ b/patches/001-ath79-cpe220v3-sysupgrade-supported.patch @@ -0,0 +1,12 @@ +Index: openwrt/target/linux/ath79/image/generic-tp-link.mk +=================================================================== +--- openwrt.orig/target/linux/ath79/image/generic-tp-link.mk ++++ openwrt/target/linux/ath79/image/generic-tp-link.mk +@@ -175,6 +175,7 @@ define Device/tplink_cpe220-v3 + DEVICE_PACKAGES := rssileds + TPLINK_BOARD_ID := CPE220V3 + LOADER_TYPE := elf ++ SUPPORTED_DEVICES += cpe220-v3 + endef + TARGET_DEVICES += tplink_cpe220-v3 + diff --git a/patches/708-define-aredn-network-ath79.patch b/patches/708-define-aredn-network-ath79.patch index 3e528b36..3eabb228 100644 --- a/patches/708-define-aredn-network-ath79.patch +++ b/patches/708-define-aredn-network-ath79.patch @@ -2,15 +2,15 @@ Index: openwrt/target/linux/ath79/base-files/etc/board.d/02_network =================================================================== --- openwrt.orig/target/linux/ath79/base-files/etc/board.d/02_network +++ openwrt/target/linux/ath79/base-files/etc/board.d/02_network -@@ -38,6 +38,7 @@ ath79_setup_interfaces() - ubnt,lap-120|\ - ubnt,nanobeam-ac|\ +@@ -40,6 +40,7 @@ ath79_setup_interfaces() ubnt,nanostation-ac-loco|\ + ubnt,nanostation-loco-m|\ + ubnt,picostation-m|\ + ubnt,nanostation-m-xw|\ ubnt,rocket-m|\ ubnt,unifiac-lite|\ ubnt,unifiac-lr|\ -@@ -45,7 +46,9 @@ ath79_setup_interfaces() +@@ -47,7 +48,9 @@ ath79_setup_interfaces() ubnt,unifi|\ wd,mynet-wifi-rangeextender|\ winchannel,wb2000) @@ -21,7 +21,7 @@ Index: openwrt/target/linux/ath79/base-files/etc/board.d/02_network ;; avm,fritz4020|\ pcs,cr3000|\ -@@ -80,8 +83,9 @@ ath79_setup_interfaces() +@@ -84,8 +87,9 @@ ath79_setup_interfaces() tplink,tl-wr842n-v3|\ ubnt,airrouter) ucidef_set_interface_wan "eth1" @@ -32,8 +32,8 @@ Index: openwrt/target/linux/ath79/base-files/etc/board.d/02_network ;; buffalo,wzr-hp-g302h-a1a0) ucidef_add_switch "switch0" \ -@@ -91,7 +95,10 @@ ath79_setup_interfaces() - comfast,cf-e120a-v3|\ +@@ -96,7 +100,10 @@ ath79_setup_interfaces() + tplink,cpe220-v3|\ ubnt,nanostation-m|\ ubnt,routerstation) - ucidef_set_interfaces_lan_wan "eth1" "eth0" @@ -44,7 +44,7 @@ Index: openwrt/target/linux/ath79/base-files/etc/board.d/02_network ;; devolo,dvl1200e|\ devolo,dvl1750e|\ -@@ -252,18 +259,21 @@ ath79_setup_interfaces() +@@ -257,18 +264,21 @@ ath79_setup_interfaces() ucidef_add_switch "switch0" \ "0@eth1" "2:lan:3" "3:lan:2" "4:lan:1" ;; diff --git a/patches/714-vtun-openssl-fix.patch b/patches/714-vtun-openssl-fix.patch index 54ca54e7..0aed5ccc 100644 --- a/patches/714-vtun-openssl-fix.patch +++ b/patches/714-vtun-openssl-fix.patch @@ -1,5 +1,7 @@ +Index: openwrt/feeds/arednpackages/net/vtun/patches/102-vtun.patch +=================================================================== --- /dev/null -+++ b/feeds/arednpackages/net/vtun/patches/102-vtun.patch ++++ openwrt/feeds/arednpackages/net/vtun/patches/102-vtun.patch @@ -0,0 +1,287 @@ +diff -NarU5 a/lfd_encrypt.c b/lfd_encrypt.c +--- a/lfd_encrypt.c 2008-01-07 16:35:32.000000000 -0600 @@ -288,8 +290,10 @@ + } + #ifdef LFD_ENCRYPT_DEBUG + vtun_syslog(LOG_INFO, "Local decryptor out of sync"); +Index: openwrt/feeds/arednpackages/net/vtun/patches/103-vtun.patch +=================================================================== --- /dev/null -+++ b/feeds/arednpackages/net/vtun/patches/103-vtun.patch ++++ openwrt/feeds/arednpackages/net/vtun/patches/103-vtun.patch @@ -0,0 +1,2110 @@ +diff -NarU5 a/auth.c b/auth.c +--- a/auth.c 2009-05-15 02:23:39.000000000 -0500 diff --git a/patches/series b/patches/series index cc0c148e..d0b073e9 100644 --- a/patches/series +++ b/patches/series @@ -4,6 +4,7 @@ 001-add_support_for_TP-Link_CPE510_v3.patch 001-add_support_for_TP-Link_CPE220_v2.patch 001-add_support_for_TP-Link_WBS510_v2.patch +001-ath79-cpe220v3-sysupgrade-supported.patch 004-add-lhg-5hpnd-xl.patch 004-add-ldf-5nd.patch 005-add-haplite-new-model.patch