local wanports=""
local lanports=""
for port in 5 4 3 2 1 0; do
- if [ `swconfig dev rt305x port $port get disable` = "1" ]; then
+ if [ "$(swconfig dev rt305x port $port get disable)" = "1" ]; then
continue
fi
- if [ `swconfig dev rt305x port $port get lan` = "0" ]; then
+ if [ "$(swconfig dev rt305x port $port get lan)" = "0" ]; then
wanports="$port:wan $wanports"
else
lanports="$port:lan $lanports"
dlink,dir-300-b7|\
dlink,dir-320-b1|\
dlink,dir-610-a1|\
- dlink,dir-615-h1|\
dlink,dir-810l|\
dlink,dwr-116-a1|\
dlink,dwr-921-c1|\
wavlink,wl-wn575a3|\
xiaomi,miwifi-mini|\
xiaomi,miwifi-nano|\
+ xiaoyu,xy-c5|\
xzwifi,creativebox-v1|\
youku,yk-l2|\
youku,yk1|\
asiarf,ap7621-001)
ucidef_add_switch "switch0" "0:lan" "4:wan" "6@eth0"
;;
+ asiarf,ap7621-nv1)
+ ucidef_add_switch "switch0" "0:wan" "2:lan" "3:lan" "6@eth0"
+ ;;
asiarf,awapn2403)
ucidef_add_switch "switch0" \
"0:lan" "1:wan" "6@eth0"
;;
+ asus,rt-ac85p|\
+ dlink,dir-860l-b1|\
+ elecom,wrc-1167ghbk2-s|\
+ elecom,wrc-1900gst|\
+ elecom,wrc-2533gst|\
+ huawei,hg255d|\
+ iodata,wn-ax1167gr|\
+ iodata,wn-gx300gr|\
+ iodata,wnpr2600g|\
+ iptime,a604m)
+ ucidef_add_switch "switch0" \
+ "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "6@eth0"
+ ;;
asus,rt-n15|\
belkin,f9k1109v1|\
sitecom,wl-351)
ucidef_add_switch "switch0" \
"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan:5" "6@eth0"
;;
- dlink,dir-860l-b1|\
- elecom,wrc-1167ghbk2-s|\
- elecom,wrc-1900gst|\
- elecom,wrc-2533gst|\
- huawei,hg255d|\
- iodata,wn-ax1167gr|\
- iodata,wn-gx300gr|\
- iptime,a604m)
- ucidef_add_switch "switch0" \
- "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "6@eth0"
- ;;
dlink,dwr-118-a1)
ucidef_add_switch "switch0" \
"1:lan:2" "2:lan:3" "3:lan:1" "4:lan:0" "5:wan" "6@eth0"
ucidef_add_switch "switch1" \
"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0"
;;
+ engenius,esr600)
+ ucidef_add_switch "switch0" \
+ "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan" "0@eth0"
+ ;;
fon,fon2601)
ucidef_add_switch "switch0" \
"0:lan" "4:wan" "6@eth0"
;;
+ edimax,rg21s)
+ ucidef_add_switch "switch0" \
+ "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "6@eth0"
+ ;;
gehua,ghl-r-001)
ucidef_add_switch "switch0" \
"0:lan" "1:lan" "2:lan" "4:wan" "6@eth0"
ucidef_add_switch "switch1" \
"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "6@eth0"
;;
+ iptime,a3)
+ ucidef_add_switch "switch0" \
+ "2:lan:2" "3:lan:1" "0:wan" "6@eth0"
+ ;;
lava,lr-25g001|\
sitecom,wlr-6000|\
trendnet,tew-691gr|\
;;
netgear,r6120|\
netgear,r6220|\
+ netgear,r6260|\
netgear,r6350|\
+ netgear,r6850|\
netgear,wndr3700-v5)
ucidef_add_switch "switch0" \
"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan" "6@eth0"
"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "7t@eth0"
;;
*)
- RT3X5X=`cat /proc/cpuinfo | egrep "(RT3.5|RT5350)"`
+ RT3X5X=$(grep -E "(RT3.5|RT5350)" /proc/cpuinfo)
if [ -n "${RT3X5X}" ]; then
ramips_setup_rt3x5x_vlans
else
8devices,carambola|\
alfa-network,w502u|\
arcwireless,freestation5|\
- cudy,wr1000|\
- netgear,wnce2001)
+ lenovo,newifi-y1|\
+ lenovo,newifi-y1s|\
+ netgear,wnce2001|\
+ ohyeah,oy-0001|\
+ phicomm,k2g|\
+ skylab,skw92a|\
+ totolink,lr1200)
wan_mac=$(mtd_get_mac_binary factory 0x2e)
;;
- arcwireless,freestation5|\
dlink,dir-300-b7|\
dlink,dir-320-b1|\
dlink,dir-620-a1|\
huawei,d105|\
hilink,hlk-7628n|\
hilink,hlk-rm04|\
- lenovo,newifi-y1|\
- lenovo,newifi-y1s|\
nexaira,bc2|\
petatel,psr-680w|\
skyline,sl-r7205)
wan_mac=$(macaddr_add "$lan_mac" 1)
;;
asus,rt-ac57u|\
+ d-team,newifi-d2|\
+ d-team,pbr-m1|\
+ elecom,wrc-1167ghbk2-s|\
+ elecom,wrc-1900gst|\
+ elecom,wrc-2533gst|\
+ lenovo,newifi-d1|\
phicomm,k2p|\
- planex,vr500)
- lan_mac=$(mtd_get_mac_binary factory 0xe000)
+ planex,vr500|\
+ samknows,whitebox-v8|\
+ youku,yk-l2|\
+ zbtlink,zbt-we3526)
wan_mac=$(mtd_get_mac_binary factory 0xe006)
;;
+ asus,rt-ac85p)
+ wan_mac=$(mtd_get_mac_ascii u-boot-env et1macaddr)
+ ;;
asus,rt-n56u)
lan_mac=$(macaddr_setbit_la "$(cat /sys/class/net/eth0/address)")
wan_mac=$(mtd_get_mac_binary factory 0x8004)
belkin,f9k1109v1)
wan_mac=$(mtd_get_mac_ascii uboot-env HW_WAN_MAC)
lan_mac=$(mtd_get_mac_ascii uboot-env HW_LAN_MAC)
+ label_mac=$wan_mac
;;
buffalo,wcr-1166ds|\
buffalo,wsr-1166dhp)
buffalo,whr-1166d|\
buffalo,whr-300hp2|\
buffalo,whr-600d|\
- buffalo,wsr-600dhp)
- wan_mac=$(mtd_get_mac_binary factory 0x4)
- lan_mac=$wan_mac
- ;;
buffalo,whr-g300n|\
- glinet,gl-mt300n-v2)
- wan_mac=$(mtd_get_mac_binary factory 0x4)
+ buffalo,wsr-600dhp|\
+ glinet,gl-mt300n-v2|\
+ zyxel,keenetic-start)
+ # This empty case has to be kept for devices without any MAC address adjustments
+ ;;
+ cudy,wr1000)
+ wan_mac=$(mtd_get_mac_binary factory 0x2e)
+ label_mac=$(cat /sys/class/ieee80211/phy0/macaddress)
;;
dlink,dch-m225|\
samsung,cy-swr1100)
lava,lr-25g001)
wan_mac=$(jboot_config_read -m -i $(find_mtd_part "config") -o 0xE000)
lan_mac=$(macaddr_add "$wan_mac" 1)
+ label_mac=$wan_mac
+ ;;
+ dlink,dir-615-d|\
+ dlink,dir-615-h1|\
+ glinet,gl-mt300a|\
+ glinet,gl-mt300n|\
+ glinet,gl-mt750|\
+ zbtlink,zbt-wg3526-16m|\
+ zbtlink,zbt-wg3526-32m)
+ wan_mac=$(macaddr_add "$(cat /sys/class/net/eth0/address)" 1)
+ label_mac=$(cat /sys/class/ieee80211/phy0/macaddress)
;;
dlink,dir-645)
lan_mac=$(mtd_get_mac_ascii nvram lanmac)
dlink,dir-860l-b1)
lan_mac=$(mtd_get_mac_ascii factory lanmac)
wan_mac=$(mtd_get_mac_ascii factory wanmac)
+ label_mac=$(cat /sys/class/ieee80211/phy1/macaddress)
;;
dovado,tiny-ac)
lan_mac=$(mtd_get_mac_ascii u-boot-env LAN_MAC_ADDR)
wan_mac=$(mtd_get_mac_binary devdata 0x7)
;;
edimax,br-6478ac-v2|\
- netgear,r6350)
+ netgear,r6260|\
+ netgear,r6350|\
+ netgear,r6850)
wan_mac=$(macaddr_add "$(cat /sys/class/net/eth0/address)" 2)
;;
- elecom,wrc-1167ghbk2-s|\
- elecom,wrc-1900gst|\
- elecom,wrc-2533gst|\
- samknows,whitebox-v8)
- wan_mac=$(mtd_get_mac_binary factory 0xe006)
+ edimax,rg21s|\
+ engenius,esr600)
+ lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)
+ wan_mac=$(mtd_get_mac_ascii u-boot-env wanaddr)
;;
hiwifi,hc5661|\
hiwifi,hc5661a|\
hiwifi,hc5861|\
hiwifi,hc5861b|\
hiwifi,hc5962)
- lan_mac=`mtd_get_mac_ascii bdinfo "Vfac_mac "`
+ lan_mac=$(mtd_get_mac_ascii bdinfo "Vfac_mac ")
+ label_mac=$lan_mac
[ -n "$lan_mac" ] || lan_mac=$(cat /sys/class/net/eth0/address)
wan_mac=$(macaddr_add "$lan_mac" 1)
;;
iodata,wn-ac1167gr|\
iodata,wn-ac733gr3)
- wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x4)" -1)
+ wan_mac=$(mtd_get_mac_ascii u-boot-env wanaddr)
;;
iodata,wn-ax1167gr|\
iodata,wn-gx300gr|\
trendnet,tew-692gr)
wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x4)" 1)
;;
+ iodata,wnpr2600g)
+ wan_mac=$(mtd_get_mac_ascii u-boot-env wanaddr)
+ label_mac=$wan_mac
+ ;;
+ iptime,a3|\
iptime,a604m)
wan_mac=$(mtd_get_mac_binary u-boot 0x1fc40)
;;
- lenovo,newifi-d1)
- lan_mac=$(macaddr_add "$(cat /sys/class/net/eth0/address)" 2)
- ;;
linksys,e1700)
wan_mac=$(mtd_get_mac_ascii config WAN_MAC_ADDR)
;;
lan_mac=$(mtd_get_mac_binary factory 0x2e)
;;
mercury,mac1200r-v2)
- lan_mac=$(mtd_get_mac_binary factory_info 0xd)
- wan_mac=$(macaddr_add "$lan_mac" 1)
- ;;
- ohyeah,oy-0001|\
- phicomm,k2g|\
- skylab,skw92a)
- lan_mac=$(mtd_get_mac_binary factory 0x28)
- wan_mac=$(mtd_get_mac_binary factory 0x2e)
+ wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory_info 0xd)" 1)
;;
poray,m3|\
poray,m4-4m|\
wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x8004)" 2)
;;
sparklan,wcr-150gn|\
+ wiznet,wizfi630a|\
zyxel,keenetic-omni|\
zyxel,keenetic-omni-ii|\
- zyxel,keenetic-start|\
zyxel,keenetic-viva)
wan_mac=$(mtd_get_mac_binary factory 0x28)
;;
trendnet,tew-691gr)
wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x4)" 3)
;;
- wiznet,wizfi630a)
- lan_mac=$(mtd_get_mac_binary factory 0x4)
- wan_mac=$(mtd_get_mac_binary factory 0x28)
+ vocore,vocore2|\
+ vocore,vocore2-lite)
+ label_mac=$(cat /sys/class/ieee80211/phy0/macaddress)
+ ;;
+ xiaomi,mir3g)
+ lan_mac=$(mtd_get_mac_binary factory 0xe006)
;;
- xiaomi,mir3g|\
xiaomi,mir3p)
lan_mac=$(mtd_get_mac_binary factory 0xe006)
+ label_mac=$lan_mac
;;
xiaomi,miwifi-mini)
lan_mac=$(macaddr_setbit_la "$(cat /sys/class/net/eth0/address)")
;;
+ zbtlink,zbt-we1326)
+ wan_mac=$(mtd_get_mac_binary factory 0xe006)
+ label_mac=$(cat /sys/class/ieee80211/phy0/macaddress)
+ ;;
*)
wan_mac=$(macaddr_add "$(cat /sys/class/net/eth0/address)" 1)
;;
[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" $wan_mac
+ [ -n "$label_mac" ] && ucidef_set_label_macaddr $label_mac
}
board_config_update