ramips: explicitly disable built-in switch when needed

previously we rely on the failsafe setup in preinit scripts to disable
built-in switch implicitly for single-port devices. This doesn't work
anymore due to preinit script removal.
this patch explicitly disable built-in switch for needed devices.

Fixes: a8d62a4eb1 ("ramips: remove set_preinit_iface script")
Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
This commit is contained in:
Chuanhong Guo 2020-04-10 12:32:42 +08:00
parent f017f617ae
commit 8f6334eb94
3 changed files with 29 additions and 29 deletions

View File

@ -40,8 +40,14 @@ ramips_setup_interfaces()
alfa-network,tube-e4g|\
buffalo,wmr-300|\
dlink,dch-m225|\
edimax,ew-7476rpc|\
edimax,ew-7478ac|\
elecom,wrh-300cr|\
kimax,u25awf-h1|\
kimax,u35wf|\
kingston,mlw221|\
kingston,mlwg2|\
microduino,microwrt|\
netgear,ex2700|\
netgear,ex3700|\
netgear,ex6130|\
@ -52,7 +58,12 @@ ramips_setup_interfaces()
ravpower,wd03|\
sercomm,na930|\
tplink,re200-v1|\
tplink,re210-v1)
tplink,re210-v1|\
yukai,bocco|\
zbtlink,zbt-cpe102|\
zte,q7)
ucidef_add_switch "switch0"
ucidef_add_switch_attr "switch0" "enable" "false"
ucidef_set_interface_lan "eth0"
;;
asus,rp-n53)
@ -106,19 +117,10 @@ ramips_setup_interfaces()
;;
edimax,br-6478ac-v2|\
tplink,archer-c2-v1)
ucidef_add_switch "switch1" \
"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0"
;;
edimax,ew-7476rpc|\
edimax,ew-7478ac|\
kimax,u35wf|\
microduino,microwrt|\
yukai,bocco|\
zbtlink,zbt-cpe102|\
zte,q7)
ucidef_add_switch "switch0"
ucidef_add_switch_attr "switch0" "enable" "false"
ucidef_set_interface_lan "eth0"
ucidef_add_switch "switch1" \
"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0"
;;
engenius,esr600)
ucidef_add_switch "switch0" \
@ -142,6 +144,8 @@ ramips_setup_interfaces()
;;
iodata,wn-ac1167gr|\
iodata,wn-ac733gr3)
ucidef_add_switch "switch0"
ucidef_add_switch_attr "switch0" "enable" "false"
ucidef_add_switch "switch1" \
"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "6@eth0"
;;
@ -149,12 +153,6 @@ ramips_setup_interfaces()
ucidef_add_switch "switch0" \
"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "6@eth0"
;;
kingston,mlw221)
ucidef_set_interface_lan "eth0.2"
;;
kingston,mlwg2)
ucidef_set_interface_lan "eth0.1"
;;
lava,lr-25g001)
ucidef_add_switch "switch0" \
"1:lan" "2:lan" "3:lan" "4:lan" "5:wan" "0@eth0"
@ -170,6 +168,8 @@ ramips_setup_interfaces()
;;
linksys,e1700|\
ralink,mt7620a-mt7530-evb)
ucidef_add_switch "switch0"
ucidef_add_switch_attr "switch0" "enable" "false"
ucidef_add_switch "switch1" \
"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0"
;;

View File

@ -11,11 +11,19 @@ ramips_setup_interfaces()
case $board in
alfa-network,awusfree1|\
d-team,pbr-d1|\
mediatek,linkit-smart-7688|\
onion,omega2p|\
onion,omega2|\
tama,w06|\
tplink,re200-v2|\
tplink,re305-v1|\
tplink,tl-mr3020-v3|\
tplink,tl-wr802n-v4)
tplink,tl-wr802n-v4|\
tplink,tl-wa801nd-v5|\
widora,neo-16m|\
widora,neo-32m)
ucidef_add_switch "switch0"
ucidef_add_switch_attr "switch0" "enable" "false"
ucidef_set_interface_lan "eth0"
;;
buffalo,wcr-1166ds)
@ -81,16 +89,6 @@ ramips_setup_interfaces()
ucidef_add_switch "switch0" \
"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "6@eth0"
;;
mediatek,linkit-smart-7688|\
onion,omega2p|\
onion,omega2|\
tplink,tl-wa801nd-v5|\
widora,neo-16m|\
widora,neo-32m)
ucidef_add_switch "switch0"
ucidef_add_switch_attr "switch0" "enable" "false"
ucidef_set_interface_lan "eth0"
;;
netgear,r6120)
ucidef_add_switch "switch0" \
"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan" "6@eth0"

View File

@ -110,6 +110,8 @@ ramips_setup_interfaces()
"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan:5" "6@eth0"
;;
huawei,d105)
ucidef_add_switch "switch0"
ucidef_add_switch_attr "switch0" "enable" "false"
ucidef_set_interface_lan "eth0"
;;
huawei,hg255d)