Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
aredn/patches/708-define-aredn-networks.p...

191 lines
6.2 KiB
Diff
Raw Normal View History

aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
Index: openwrt/package/base-files/files/lib/functions/uci-defaults.sh
===================================================================
--- openwrt.orig/package/base-files/files/lib/functions/uci-defaults.sh
+++ openwrt/package/base-files/files/lib/functions/uci-defaults.sh
@@ -153,7 +153,7 @@ _ucidef_finish_switch_roles() {
aredn: define vlans for aredn devices (#7) aredn devices configured with lan, wan, and dtdlink networks.
2018-05-02 23:07:55 -06:00
if [ ${need_tag:-0} -eq 1 -o ${want_untag:-0} -ne 1 ]; then
num="${num}t"
- device="${device}.${index}"
+ device="${device}.$((index - 1))"
fi
json_select roles
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
Index: openwrt/package/base-files/files/bin/config_generate
===================================================================
--- openwrt.orig/package/base-files/files/bin/config_generate
+++ openwrt/package/base-files/files/bin/config_generate
@@ -165,10 +165,11 @@ generate_switch_vlans_ports() {
aredn: define vlans for aredn devices (#7) aredn devices configured with lan, wan, and dtdlink networks.
2018-05-02 23:07:55 -06:00
json_get_vars ports
json_select ..
+ vlan_num=$((role - 1))
uci -q batch <<-EOF
add network switch_vlan
set network.@switch_vlan[-1].device='$switch'
- set network.@switch_vlan[-1].vlan='$role'
+ set network.@switch_vlan[-1].vlan='$vlan_num'
set network.@switch_vlan[-1].ports='$ports'
EOF
done
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
Index: openwrt/target/linux/ar71xx/base-files/etc/board.d/02_network
===================================================================
--- openwrt.orig/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ openwrt/target/linux/ar71xx/base-files/etc/board.d/02_network
aredn: phase 1 support for Mikrotik rb952Ui-5ac2nD Add support for the hAP lite model rb952UI-5ac2nD equivilent to the UBNT AirRouter. The 5Ghz interface will be configured in a 2nd phase. This hAP lite model has double the RAM and Flash of the AR. the 2Ghz is MIMO (5Ghz is single antenna).
2018-09-01 17:39:19 -06:00
@@ -12,8 +12,9 @@ ar71xx_setup_interfaces()
aredn: define vlans for aredn devices (#7) aredn devices configured with lan, wan, and dtdlink networks.
2018-05-02 23:07:55 -06:00
case "$board" in
airgatewaypro)
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
+ ucidef_set_interface "wifi" ifname "wlan0" protocol "static"
aredn: define vlans for aredn devices (#7) aredn devices configured with lan, wan, and dtdlink networks.
2018-05-02 23:07:55 -06:00
ucidef_add_switch "switch0" \
- "0@eth0" "4:lan" "5:wan"
+ "0@eth0" "4:lan" "5t:wan" "5t:dtdlink"
;;
airrouter|\
ap121|\
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
@@ -55,9 +56,10 @@ ar71xx_setup_interfaces()
aredn: define vlans for aredn devices (#7) aredn devices configured with lan, wan, and dtdlink networks.
2018-05-02 23:07:55 -06:00
whr-hp-gn|\
wzr-hp-ag300h|\
zbt-we1526)
- ucidef_set_interfaces_lan_wan "eth0.1" "eth1"
+ ucidef_set_interface_wan "eth1"
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
+ ucidef_set_interface "wifi" ifname "wlan0" protocol "static"
aredn: define vlans for aredn devices (#7) aredn devices configured with lan, wan, and dtdlink networks.
2018-05-02 23:07:55 -06:00
ucidef_add_switch "switch0" \
- "0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1"
bugfix: correct port order on airrouter (#128) fixes #130 * bugfix: correct port order on airrouter * correct labels
2018-08-09 17:46:37 -06:00
+ "0@eth0" "4:lan:1" "3:lan:2" "2:lan:3" "1t:unused" "1t:dtdlink"
aredn: define vlans for aredn devices (#7) aredn devices configured with lan, wan, and dtdlink networks.
2018-05-02 23:07:55 -06:00
;;
alfa-ap120c|\
all0305|\
build: upgrade to OpenWrt 18.06.2 and refresh patches
2019-02-06 18:45:09 -07:00
@@ -101,6 +103,7 @@ ar71xx_setup_interfaces()
bugfix: AREDN standard port vlan function on NS XW devices The NanoStation M2 and M5 XW switch configuraiton had LAN on primary port (untagged) and DtDLink and WAN (vlan 1 and 2) on secondary port. This change enables untagged, vlan 1, and vlan 2 on primary port to function. This configuration also functions on the secondary port. However, devices on the same network can not communicate with one another across the two ports. Although, access works from the greater mesh and the node to devices on both ports on the same network. When using one port the behavior is now consitent with all other AREDN devices. The use of both ports offers some benefit, but with the above limitations.
2018-11-14 19:31:12 -07:00
mr900|\
mr900v2|\
mynet-rext|\
+ nanostation-m-xw|\
pqi-air-pen|\
rb-411|\
rb-411u|\
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
@@ -160,7 +163,9 @@ ar71xx_setup_interfaces()
aredn: define vlans for aredn devices (#7) aredn devices configured with lan, wan, and dtdlink networks.
2018-05-02 23:07:55 -06:00
wifi-pineapple-nano|\
wndap360|\
wp543)
- ucidef_set_interface_lan "eth0"
aredn: phase 1 support for Mikrotik rb952Ui-5ac2nD Add support for the hAP lite model rb952UI-5ac2nD equivilent to the UBNT AirRouter. The 5Ghz interface will be configured in a 2nd phase. This hAP lite model has double the RAM and Flash of the AR. the 2Ghz is MIMO (5Ghz is single antenna).
2018-09-01 17:39:19 -06:00
+ ucidef_set_interfaces_lan_wan "eth0" "eth0.1"
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
+ ucidef_set_interface "wifi" ifname "wlan0" protocol "static"
+ ucidef_set_interface "dtdlink" ifname "eth0.2" protocol "static"
aredn: define vlans for aredn devices (#7) aredn devices configured with lan, wan, and dtdlink networks.
2018-05-02 23:07:55 -06:00
;;
a40|\
a60|\
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
@@ -186,6 +191,8 @@ ar71xx_setup_interfaces()
aredn: define vlans for aredn devices (#7) aredn devices configured with lan, wan, and dtdlink networks.
2018-05-02 23:07:55 -06:00
wpe72|\
wrtnode2q)
Add experimental support for the GL.iNet GL-AR150 (#407) * Add experimental support for the GL.iNet GL-AR150 - https://openwrt.org/toh/gl.inet/gl-ar150 Mesh networking and tunneling have been confirmed working. This device has been confirmed capable of operating on channel -1, but /etc/config/wireless has to be manually edited to select this channel. * www/cgi-bin/perlfunc.pm patched to add UI support for the GL.iNet GL-AR150 * www/cgi-bin/perlfunc.pm patched to add UI support for the GL.iNet GL-AR150 - seems like only 18 dBm TX power is possible * Remove Experimental comments and designate as stable * Configure Ethernet ports & VLANs for GL-AR150, and update README.md * Fix misunderstanding re README.md * Patch Upstream OpenWRT GL-AR150 LAN & WAN LED mapping, configure WLAN LED as mesh linked indicator.
2019-04-30 19:55:09 -06:00
ucidef_set_interfaces_lan_wan "eth1" "eth0"
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
+ ucidef_set_interface "wifi" ifname "wlan0" protocol "static"
+ ucidef_set_interface "dtdlink" ifname "eth1.2" protocol "static"
aredn: define vlans for aredn devices (#7) aredn devices configured with lan, wan, and dtdlink networks.
2018-05-02 23:07:55 -06:00
;;
all0258n|\
all0315n|\
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
@@ -194,7 +201,9 @@ ar71xx_setup_interfaces()
aredn: define vlans for aredn devices (#7) aredn devices configured with lan, wan, and dtdlink networks.
2018-05-02 23:07:55 -06:00
ja76pf2|\
rocket-m-ti|\
ubnt-unifi-outdoor)
- ucidef_set_interface_lan "eth0 eth1"
+ ucidef_set_interfaces_lan_wan "eth0" "eth0.1"
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
+ ucidef_set_interface "wifi" ifname "wlan0" protocol "static"
+ ucidef_set_interface "dtdlink" ifname "eth0.2" protocol "static"
aredn: define vlans for aredn devices (#7) aredn devices configured with lan, wan, and dtdlink networks.
2018-05-02 23:07:55 -06:00
;;
wzr-hp-g300nh2)
ucidef_add_switch "switch0" \
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
@@ -209,8 +218,9 @@ ar71xx_setup_interfaces()
aredn: phase 1 support for Mikrotik rb952Ui-5ac2nD Add support for the hAP lite model rb952UI-5ac2nD equivilent to the UBNT AirRouter. The 5Ghz interface will be configured in a 2nd phase. This hAP lite model has double the RAM and Flash of the AR. the 2Ghz is MIMO (5Ghz is single antenna).
2018-09-01 17:39:19 -06:00
rb-962uigs-5hact2hnt|\
aredn: define vlans for aredn devices (#7) aredn devices configured with lan, wan, and dtdlink networks.
2018-05-02 23:07:55 -06:00
wlr8100|\
wzr-hp-g450h)
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
+ ucidef_set_interface "wifi" ifname "wlan0" protocol "static"
aredn: define vlans for aredn devices (#7) aredn devices configured with lan, wan, and dtdlink networks.
2018-05-02 23:07:55 -06:00
ucidef_add_switch "switch0" \
- "0@eth0" "2:lan" "3:lan" "4:lan" "5:lan" "1:wan"
+ "0@eth0" "2:lan" "3:lan" "4:lan" "1:wan" "5t:dtdlink"
;;
ap135-020|\
ap136-020|\
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
@@ -248,12 +258,18 @@ ar71xx_setup_interfaces()
rb-750-r2|\
rb-750p-pbr2|\
rb-750up-r2|\
- rb-951ui-2nd|\
- rb-952ui-5ac2nd)
- ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
+ rb-951ui-2nd)
+ ucidef_set_interface_wan "eth0"
+ ucidef_set_interface "wifi" ifname "wlan0" protocol "static"
ucidef_add_switch "switch0" \
- "0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1"
+ "0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4t:unused" "4t:dtdlink"
;;
+ rb-952ui-5ac2nd)
+ ucidef_set_interface_wan "eth0"
+ ucidef_set_interface "wifi" ifname "wlan1" protocol "static"
+ ucidef_add_switch "switch0" \
+ "0@eth1" "4:lan:1" "3:lan:2" "2:lan:3" "1t:unused" "1t:dtdlink"
+ ;;
archer-c58-v1|\
archer-c59-v1|\
archer-c59-v2|\
@@ -303,11 +319,13 @@ ar71xx_setup_interfaces()
aredn: define vlans for aredn devices (#7) aredn devices configured with lan, wan, and dtdlink networks.
2018-05-02 23:07:55 -06:00
wbs210|\
ar71xx: add Support for the TP-LINK WBS510 V2 This adds support for a popular low-cost 5GHz N based AP Specifications: - SoC: Atheros AR9344 - RAM: 64MB - Storage: 8 MB SPI NOR - Wireless: 5GHz 300 Mbps, 2x RP-SMA connector, 27 dBm TX power - Ethernet: 1x 10/100 Mbps with 24V POE IN, 1x 10/100 Mbps Installation: Flash factory image through stock firmware WEB UI or through TFTP To get to TFTP recovery just hold reset button while powering on for around 4-5 seconds and release. Rename factory image to recovery.bin Stock TFTP server IP:192.168.0.100 Stock device TFTP adress:192.168.0.254 Signed-off-by: Andrew Cameron <apcameron@softhome.net>
2019-11-20 19:43:12 -07:00
wbs510|\
wbs510-v2)
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
+ ucidef_set_interface "wifi" ifname "wlan0" protocol "static"
aredn: define vlans for aredn devices (#7) aredn devices configured with lan, wan, and dtdlink networks.
2018-05-02 23:07:55 -06:00
ucidef_add_switch "switch0" \
- "0@eth0" "5:lan" "4:wan"
+ "0@eth0" "5:lan" "4t:wan" "4t:dtdlink"
;;
cr3000)
ucidef_set_interfaces_lan_wan "eth0.1" "eth1"
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
+ ucidef_set_interface "wifi" ifname "wlan0" protocol "static"
aredn: phase 1 support for Mikrotik rb952Ui-5ac2nD Add support for the hAP lite model rb952UI-5ac2nD equivilent to the UBNT AirRouter. The 5Ghz interface will be configured in a 2nd phase. This hAP lite model has double the RAM and Flash of the AR. the 2Ghz is MIMO (5Ghz is single antenna).
2018-09-01 17:39:19 -06:00
ucidef_add_switch "switch0" \
"0@eth0" "1:lan:1" "2:lan:4" "3:lan:3" "4:lan:2"
;;
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
@@ -459,9 +477,10 @@ ar71xx_setup_interfaces()
aredn: add GL-iNet AR750 definitions
2019-05-26 16:27:49 -06:00
;;
gl-ar750|\
rb-435g)
- ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
+ ucidef_set_interface_wan "eth0"
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
+ ucidef_set_interface "wifi" ifname "wlan1" protocol "static"
aredn: add GL-iNet AR750 definitions
2019-05-26 16:27:49 -06:00
ucidef_add_switch "switch0" \
- "0@eth1" "1:lan" "2:lan"
+ "0@eth1" "1:lan" "2t:unused" "2t:dtdlink"
;;
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
gl-ar750s)
bugfix: AREDN standard port vlan function on NS XW devices The NanoStation M2 and M5 XW switch configuraiton had LAN on primary port (untagged) and DtDLink and WAN (vlan 1 and 2) on secondary port. This change enables untagged, vlan 1, and vlan 2 on primary port to function. This configuration also functions on the secondary port. However, devices on the same network can not communicate with one another across the two ports. Although, access works from the greater mesh and the node to devices on both ports on the same network. When using one port the behavior is now consitent with all other AREDN devices. The use of both ports offers some benefit, but with the above limitations.
2018-11-14 19:31:12 -07:00
ucidef_add_switch "switch0" \
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
@@ -485,9 +504,10 @@ ar71xx_setup_interfaces()
aredn: define vlans for aredn devices (#7) aredn devices configured with lan, wan, and dtdlink networks.
2018-05-02 23:07:55 -06:00
"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5@eth1"
;;
routerstation-pro)
- ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
+ ucidef_set_interface_wan "eth0"
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
+ ucidef_set_interface "wifi" ifname "wlan0" protocol "static"
aredn: define vlans for aredn devices (#7) aredn devices configured with lan, wan, and dtdlink networks.
2018-05-02 23:07:55 -06:00
ucidef_add_switch "switch0" \
- "0@eth1" "2:lan:3" "3:lan:2" "4:lan:1"
+ "0@eth1" "2:lan:3" "3:lan:2" "4t:unused" "4t:dtdlink"
;;
rb-493g)
ucidef_set_interfaces_lan_wan "eth0.1 eth1.1" "eth1.2"
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
@@ -599,8 +619,16 @@ ar71xx_setup_interfaces()
aredn: Standardize Ethernet Port vlans for UBNT XM devices (#297) The secondary port on Ubnt XM devices was non-functional. Enabled bridge type in network config to utilize both ports.
2018-12-02 18:52:48 -07:00
ucidef_add_switch "switch0" \
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
"0@eth1" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "1:wan"
aredn: define vlans for aredn devices (#7) aredn devices configured with lan, wan, and dtdlink networks.
2018-05-02 23:07:55 -06:00
;;
aredn: Standardize Ethernet Port vlans for UBNT XM devices (#297) The secondary port on Ubnt XM devices was non-functional. Enabled bridge type in network config to utilize both ports.
2018-12-02 18:52:48 -07:00
+ nanostation-m)
+ ucidef_set_interface_lan "eth0 eth1"
+ ucidef_set_interface_wan "eth0.1 eth1.1"
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
+ ucidef_set_interface "dtdlink" ifname "eth0.2 eth1.2" protocol "static"
+ ucidef_set_interface "wifi" ifname "wlan0" protocol "static"
aredn: Standardize Ethernet Port vlans for UBNT XM devices (#297) The secondary port on Ubnt XM devices was non-functional. Enabled bridge type in network config to utilize both ports.
2018-12-02 18:52:48 -07:00
+ ;;
aredn: define vlans for aredn devices (#7) aredn devices configured with lan, wan, and dtdlink networks.
2018-05-02 23:07:55 -06:00
*)
- ucidef_set_interfaces_lan_wan "eth0" "eth1"
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
+ ucidef_set_interface "wifi" ifname "wlan0" protocol "static"
aredn: define vlans for aredn devices (#7) aredn devices configured with lan, wan, and dtdlink networks.
2018-05-02 23:07:55 -06:00
+ ucidef_set_interfaces_lan_wan "eth0" "eth0.1"
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
+ ucidef_set_interface "dtdlink" ifname "eth0.2" protocol "static"
aredn: define vlans for aredn devices (#7) aredn devices configured with lan, wan, and dtdlink networks.
2018-05-02 23:07:55 -06:00
;;
esac
}