From c3a85189181827c8d5c2ab736428be30e4c13128 Mon Sep 17 00:00:00 2001 From: Chuanhong Guo Date: Thu, 16 May 2019 12:50:10 +0800 Subject: [PATCH] ath79: fix default config for devices with eth0/eth1 swapped also fix the following problems in this commit: glinet,gl-ar150: This router uses an uncommon order of setting up gmacs in ar71xx. gmac0 is preferred to be wan port because of the additional link status info available. So this router will have eth0/eth1 swapped comparing to ar71xx. tplink,tl-wr710n-v1: same as gl-ar150 embeddedwireless,dorin: eth0 is used as switch port, which was incorrect. It's correct now, so keep this one untouched. tplink,tl-wr842n-v1: we don't swap PHYs on ar7241 so the original port order is incorrect. reorder archer-a7-v5 entry. Signed-off-by: Chuanhong Guo --- .../ath79/base-files/etc/board.d/01_leds | 26 ++--- .../ath79/base-files/etc/board.d/02_network | 100 ++++++++---------- 2 files changed, 56 insertions(+), 70 deletions(-) diff --git a/target/linux/ath79/base-files/etc/board.d/01_leds b/target/linux/ath79/base-files/etc/board.d/01_leds index 2250c83b4d..22a395c59f 100755 --- a/target/linux/ath79/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/base-files/etc/board.d/01_leds @@ -18,7 +18,7 @@ avm,fritz300e) ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "$boardname:green:rssi4" "wlan0" "80" "100" ;; avm,fritz4020) - ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth0" + ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth1" ucidef_set_led_switch "lan" "LAN" "$boardname:green:lan" "switch0" "0x1E" ;; buffalo,whr-g301n) @@ -29,7 +29,7 @@ buffalo,whr-g301n) ucidef_set_led_switch "lan4" "LAN4" "$boardname:green:lan4" "switch0" "0x10" ;; comfast,cf-e110n-v2) - ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth0" + ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth1" ucidef_set_led_switch "wan" "WAN" "$boardname:green:wan" "switch0" "0x02" ucidef_set_led_wlan "wlan" "WLAN" "$boardname:green:wlan" "phy0tpt" ucidef_set_rssimon "wlan0" "200000" "1" @@ -39,7 +39,7 @@ comfast,cf-e110n-v2) ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "$boardname:green:rssihigh" "wlan0" "76" "100" ;; comfast,cf-e120a-v3) - ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth0" + ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth1" ucidef_set_led_switch "wan" "WAN" "$boardname:green:wan" "switch0" "0x04" ucidef_set_rssimon "wlan0" "200000" "1" ucidef_set_led_rssi "rssilow" "RSSILOW" "$boardname:red:rssilow" "wlan0" "1" "100" @@ -49,7 +49,7 @@ comfast,cf-e120a-v3) ;; comfast,cf-e5) ucidef_set_led_switch "lan" "LAN" "$boardname:blue:lan" "switch0" "0x02" - ucidef_set_led_netdev "wan" "WAN" "$boardname:blue:wan" "eth0" + ucidef_set_led_netdev "wan" "WAN" "$boardname:blue:wan" "eth1" ucidef_set_rssimon "wlan0" "200000" "1" ucidef_set_led_rssi "rssilow" "RSSILOW" "$boardname:blue:rssi0" "wlan0" "1" "100" ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "$boardname:blue:rssi1" "wlan0" "33" "100" @@ -62,8 +62,8 @@ engenius,ecb1750) ucidef_set_led_netdev "lan" "LAN" "$boardname:blue:lan" "eth0" ;; engenius,ews511ap) - ucidef_set_led_netdev "lan1" "LAN1" "$boardname:blue:lan1" "eth0" - ucidef_set_led_netdev "lan2" "LAN2" "$boardname:blue:lan2" "eth1" + ucidef_set_led_netdev "lan1" "LAN1" "$boardname:blue:lan1" "eth1" + ucidef_set_led_netdev "lan2" "LAN2" "$boardname:blue:lan2" "eth0" ;; etactica,eg200) ucidef_set_led_netdev "lan" "LAN" "$boardname:red:eth0" "eth0" @@ -71,18 +71,18 @@ etactica,eg200) ucidef_set_led_default "etactica" "etactica" "$boardname:red:etactica" "ignore" ;; glinet,gl-ar150) - ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth0" + ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth1" ucidef_set_led_switch "lan" "LAN" "$boardname:green:lan" "switch0" "0x02" ;; glinet,gl-ar300m-nand|\ glinet,gl-ar300m-nor) - ucidef_set_led_netdev "lan" "LAN" "gl-ar300m:green:lan" "eth1" + ucidef_set_led_netdev "lan" "LAN" "gl-ar300m:green:lan" "eth0" ;; glinet,gl-ar300m-lite) ucidef_set_led_netdev "lan" "LAN" "gl-ar300m-lite:green:lan" "eth0" ;; glinet,gl-x750) - ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth0" + ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth1" ;; netgear,wnr612-v2|\ on,n150r) @@ -121,7 +121,7 @@ tplink,tl-wr1043n-v5) tplink,archer-c58-v1|\ tplink,archer-c59-v1) ucidef_set_led_switch "lan" "LAN" "tp-link:green:lan" "switch0" "0x1E" - ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth0" + ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1" ;; tplink,archer-c6-v2) ucidef_set_led_switch "lan" "LAN" "tp-link:green:lan" "switch0" "0x3C" @@ -165,7 +165,7 @@ tplink,tl-wr740n-v4|\ tplink,tl-wr741nd-v4|\ tplink,tl-wr841-v8|\ tplink,tl-wr842n-v2) - ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth0" + ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1" ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x04" ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08" ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x10" @@ -174,7 +174,7 @@ tplink,tl-wr842n-v2) tplink,tl-wr841-v9|\ tplink,tl-wr841-v11|\ tplink,tl-wr842n-v3) - ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth0" + ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1" ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10" ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08" ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x04" @@ -207,7 +207,7 @@ wd,mynet-wifi-rangeextender) ucidef_set_led_rssi "rssihigh" "RSSIMAX" "$boardname:blue:rssi-max" "wlan0" "66" "100" ;; yuncore,a770) - ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth0" + ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth1" ucidef_set_led_switch "lan" "LAN" "$boardname:green:lan" "switch0" "0x10" ;; esac diff --git a/target/linux/ath79/base-files/etc/board.d/02_network b/target/linux/ath79/base-files/etc/board.d/02_network index c2e994530d..105d4dbf8a 100755 --- a/target/linux/ath79/base-files/etc/board.d/02_network +++ b/target/linux/ath79/base-files/etc/board.d/02_network @@ -49,9 +49,9 @@ ath79_setup_interfaces() pcs,cr3000|\ tplink,archer-c58-v1|\ tplink,archer-c59-v1) - ucidef_set_interface_wan "eth0" + ucidef_set_interface_wan "eth1" ucidef_add_switch "switch0" \ - "0@eth1" "1:lan:1" "2:lan:4" "3:lan:3" "4:lan:2" + "0@eth0" "1:lan:1" "2:lan:4" "3:lan:3" "4:lan:2" ;; buffalo,bhr-4grv|\ buffalo,wzr-hp-g450h) @@ -62,7 +62,20 @@ ath79_setup_interfaces() ucidef_add_switch "switch0" \ "0@eth1" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan" "6@eth0" ;; - buffalo,wzr-hp-ag300h) + buffalo,whr-g301n) + ucidef_set_interface_wan "eth0" + ucidef_add_switch "switch0" \ + "0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" + ;; + buffalo,wzr-hp-ag300h|\ + tplink,tl-mr3220-v1|\ + tplink,tl-mr3420-v1|\ + tplink,tl-wr841-v7|\ + tplink,tl-wr841-v9|\ + tplink,tl-wr841-v11|\ + tplink,tl-wr842n-v1|\ + tplink,tl-wr842n-v3|\ + ubnt,airrouter) ucidef_set_interface_wan "eth1" ucidef_add_switch "switch0" \ "0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" @@ -71,15 +84,10 @@ ath79_setup_interfaces() ucidef_add_switch "switch0" \ "0@eth0" "1:lan:1" "3:lan:4" "4:lan:3" "5:lan:2" "2:wan" ;; - comfast,cf-e5|\ - glinet,gl-ar150|\ - glinet,gl-ar300m-nand|\ - glinet,gl-ar300m-nor|\ - glinet,gl-x750|\ - tplink,tl-wr810n-v1|\ - tplink,tl-wr810n-v2|\ - ubnt,routerstation|\ - yuncore,a770) + comfast,cf-e110n-v2|\ + comfast,cf-e120a-v3|\ + ubnt,nanostation-m|\ + ubnt,routerstation) ucidef_set_interfaces_lan_wan "eth1" "eth0" ;; devolo,dvl1200e|\ @@ -159,7 +167,12 @@ ath79_setup_interfaces() ;; netgear,wnr612-v2|\ on,n150r|\ - tplink,tl-wr841-v7) + tplink,tl-wr740n-v1|\ + tplink,tl-wr740n-v3|\ + tplink,tl-wr741-v1|\ + tplink,tl-wr743nd-v1|\ + tplink,tl-wr841-v5|\ + tplink,tl-wr941-v4) ucidef_set_interface_wan "eth0" ucidef_add_switch "switch0" \ "0@eth1" "1:lan" "2:lan" "3:lan" "4:lan" @@ -172,28 +185,6 @@ ath79_setup_interfaces() ucidef_add_switch "switch0" \ "0@eth0" "1:lan" "2:lan" "3:wan" ;; - tplink,archer-c5-v1|\ - tplink,archer-c7-v1|\ - tplink,archer-c7-v2|\ - tplink,tl-wdr4900-v2) - ucidef_add_switch "switch0" \ - "0@eth1" "2:lan" "3:lan" "4:lan" "5:lan" "6@eth0" "1:wan" - ;; - tplink,archer-d50-v1) - ucidef_add_switch "switch0" \ - "0@eth1" "2:lan:3" "3:lan:2" "4:lan:1" "1:wan" - ;; - buffalo,whr-g301n|\ - tplink,tl-mr3220-v1|\ - tplink,tl-mr3420-v1|\ - tplink,tl-wr841-v9|\ - tplink,tl-wr841-v11|\ - tplink,tl-wr842n-v3|\ - ubnt,airrouter) - ucidef_set_interface_wan "eth0" - ucidef_add_switch "switch0" \ - "0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" - ;; tplink,archer-a7-v5|\ tplink,archer-c6-v2|\ tplink,archer-c7-v4|\ @@ -204,6 +195,17 @@ ath79_setup_interfaces() ucidef_add_switch "switch0" \ "0@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "1:wan" ;; + tplink,archer-c5-v1|\ + tplink,archer-c7-v1|\ + tplink,archer-c7-v2|\ + tplink,tl-wdr4900-v2) + ucidef_add_switch "switch0" \ + "0@eth1" "2:lan" "3:lan" "4:lan" "5:lan" "6@eth0" "1:wan" + ;; + tplink,archer-d50-v1) + ucidef_add_switch "switch0" \ + "0@eth0" "2:lan:3" "3:lan:2" "4:lan:1" "1:wan" + ;; tplink,tl-wr1043nd-v1) ucidef_add_switch "switch0" \ "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "5@eth0" @@ -217,37 +219,21 @@ ath79_setup_interfaces() ucidef_add_switch "switch0" \ "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "9@eth0" ;; - tplink,tl-wr740n-v1|\ - tplink,tl-wr740n-v3|\ - tplink,tl-wr741-v1|\ - tplink,tl-wr743nd-v1|\ - tplink,tl-wr841-v5|\ - tplink,tl-wr941-v4) - ucidef_set_interface_wan "eth0" - ucidef_add_switch "switch0" \ - "0@eth1" "1:lan" "2:lan" "3:lan" "4:lan" - ;; - tplink,tl-wr710n-v1) - ucidef_set_interface_wan "eth0" - ucidef_add_switch "switch0" \ - "0@eth1" "3:lan" - ;; tplink,tl-wr740n-v4|\ tplink,tl-wr741nd-v4|\ tplink,tl-wr841-v8|\ - tplink,tl-wr842n-v1|\ tplink,tl-wr842n-v2) - ucidef_set_interface_wan "eth0" + ucidef_set_interface_wan "eth1" ucidef_add_switch "switch0" \ - "0@eth1" "1:lan:4" "2:lan:1" "3:lan:2" "4:lan:3" + "0@eth0" "1:lan:4" "2:lan:1" "3:lan:2" "4:lan:3" ;; tplink,tl-wr941-v2) ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan" ;; ubnt,acb-isp) - ucidef_set_interface_wan "eth0" + ucidef_set_interface_wan "eth1" ucidef_add_switch "switch0" \ - "0@eth1" "2:lan:1" "3:lan:3" "4:lan:2" + "0@eth0" "2:lan:1" "3:lan:3" "4:lan:2" ;; ubnt,routerstation-pro) ucidef_set_interface_wan "eth0" @@ -259,9 +245,9 @@ ath79_setup_interfaces() "0@eth0" "5:lan" "1:wan" ;; xiaomi,mi-router-4q) - ucidef_set_interface_wan "eth0" + ucidef_set_interface_wan "eth1" ucidef_add_switch "switch0" \ - "0@eth1" "3:lan:1" "4:lan:2" + "0@eth0" "3:lan:1" "4:lan:2" ;; *) ucidef_set_interfaces_lan_wan "eth0" "eth1" -- 2.25.1