KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ramips: switch ucidef_add_switch_vlan() to ucidef_add_switch_ports()

Browse source 
This migrates the final board.d user of ucidef_add_switch_vlan() to the new
ucidef_add_switch_ports() approach, fixing some logic errors for a few boards
along the way.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 47717
This commit is contained in:
Jo-Philipp Wich 2015-12-03 15:46:29 +00:00
parent 2a68bea073
commit de51026515
1 changed files with 41 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
target/linux/ramips/base-files/etc/board.d/02_network
View file

@ -19,15 +19,14 @@ ramips_setup_rt3x5x_vlans()
continue continue
fi fi
if [ `swconfig dev rt305x port $port get lan` = "0" ]; then if [ `swconfig dev rt305x port $port get lan` = "0" ]; then
wanports="$port $wanports" wanports="$port:wan $wanports"
else else
lanports="$port $lanports" lanports="$port:lan $lanports"
fi fi
done done
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
ucidef_add_switch "rt305x" "1" "1" ucidef_add_switch "rt305x" "1" "1"
ucidef_add_switch_vlan "rt305x" "1" "$lanports 6t" ucidef_add_switch_ports "rt305x" $lanports $wanports "6@eth0"
ucidef_add_switch_vlan "rt305x" "2" "$wanports 6t"
} }
ramips_setup_interfaces() ramips_setup_interfaces()
@ -89,13 +88,14 @@ ramips_setup_interfaces()
youku-yk1) youku-yk1)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
ucidef_add_switch "switch0" "1" "1" ucidef_add_switch "switch0" "1" "1"
ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 6t" ucidef_add_switch_ports "switch0" \
ucidef_add_switch_vlan "switch0" "2" "4 6t" "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0"
;; ;;
a5-v11) a5-v11)
ucidef_set_interface_lan "eth0.1" ucidef_set_interface_lan "eth0.1"
ucidef_add_switch "switch0" "1" "1" ucidef_add_switch "switch0" "1" "1"
ucidef_add_switch_vlan "switch0" "1" "0 6t" ucidef_add_switch_ports "switch0" \
"0:lan" "6t@eth0"
;; ;;
ar670w|\ ar670w|\
ar725w|\ ar725w|\
@ -103,15 +103,16 @@ ramips_setup_interfaces()
wl-351) wl-351)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
ucidef_add_switch "switch0" "1" "1" ucidef_add_switch "switch0" "1" "1"
ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t" ucidef_add_switch_ports "switch0" \
ucidef_add_switch_vlan "switch0" "2" "4 5t" "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0"
;; ;;
asl26555|\ asl26555|\
re6500|\ re6500|\
rp-n53) rp-n53)
ucidef_set_interface_lan "eth0.1" ucidef_set_interface_lan "eth0.1"
ucidef_add_switch "switch0" "1" "1" ucidef_add_switch "switch0" "1" "1"
ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 6t" ucidef_add_switch_ports "switch0" \
"1:lan" "2:lan" "3:lan" "4:lan" "6t@eth0"
;; ;;
atp-52b|\ atp-52b|\
awm002-evb|\ awm002-evb|\
@ -128,14 +129,14 @@ ramips_setup_interfaces()
zbt-wa05) zbt-wa05)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
ucidef_add_switch "switch0" "1" "1" ucidef_add_switch "switch0" "1" "1"
ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 6t" ucidef_add_switch_ports "switch0" \
ucidef_add_switch_vlan "switch0" "2" "0 6t" "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0"
;; ;;
awapn2403) awapn2403)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
ucidef_add_switch "switch0" "1" "1" ucidef_add_switch "switch0" "1" "1"
ucidef_add_switch_vlan "switch0" "1" "0 6t" ucidef_add_switch_ports "switch0" \
ucidef_add_switch_vlan "switch0" "2" "1 6t" "0:lan" "1:wan" "6@eth0"
;; ;;
b2c|\ b2c|\
nw718|\ nw718|\
@ -149,19 +150,20 @@ ramips_setup_interfaces()
br-6475nd) br-6475nd)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
ucidef_add_switch "switch0" "1" "1" ucidef_add_switch "switch0" "1" "1"
ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 9t" ucidef_add_switch_ports "switch0" \
ucidef_add_switch_vlan "switch0" "2" "0 9t" "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "9@eth0"
;; ;;
cf-wr800n) cf-wr800n)
ucidef_set_interface_lan "eth0.1" ucidef_set_interface_lan "eth0.1"
ucidef_add_switch "switch0" "1" "1" ucidef_add_switch "switch0" "1" "1"
ucidef_add_switch_vlan "switch0" "1" "4 6t" ucidef_add_switch_ports "switch0" \
"4:lan" "6t@eth0"
;; ;;
cy-swr1100) cy-swr1100)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
ucidef_add_switch "switch0" "1" "1" ucidef_add_switch "switch0" "1" "1"
ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 9t" ucidef_add_switch_ports "switch0" \
ucidef_add_switch_vlan "switch0" "2" "4 9t" "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "9@eth0"
;; ;;
d105|\ d105|\
hpm|\ hpm|\
@ -173,15 +175,15 @@ ramips_setup_interfaces()
mt7620a_mt7530) mt7620a_mt7530)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
ucidef_add_switch "switch1" "1" "1" ucidef_add_switch "switch1" "1" "1"
ucidef_add_switch_vlan "switch1" "1" "0 1 2 3 6t" ucidef_add_switch_ports "switch1" \
ucidef_add_switch_vlan "switch1" "2" "4 6t" "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0"
;; ;;
hc5*61|\ hc5*61|\
y1s) y1s)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
ucidef_add_switch "switch0" "1" "1" ucidef_add_switch "switch0" "1" "1"
ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 5 6t" ucidef_add_switch_ports "switch0" \
ucidef_add_switch_vlan "switch0" "2" "0 6t" "1:lan" "2:lan" "3:lan" "4:lan" "5:lan" "0:wan" "6@eth0"
;; ;;
m2m) m2m)
ucidef_add_switch "switch0" "4" ucidef_add_switch "switch0" "4"
@ -197,51 +199,52 @@ ramips_setup_interfaces()
vocore) vocore)
ucidef_set_interface_lan "eth0.1" ucidef_set_interface_lan "eth0.1"
ucidef_add_switch "switch0" "1" "1" ucidef_add_switch "switch0" "1" "1"
ucidef_add_switch_vlan "switch0" "1" "0 4 6t" ucidef_add_switch_ports "switch0" \
"0:lan" "4:lan" "6t@eth0"
;; ;;
rt-n56u) rt-n56u)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
ucidef_add_switch "switch0" "1" "1" ucidef_add_switch "switch0" "1" "1"
ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 8t" ucidef_add_switch_ports "switch0" \
ucidef_add_switch_vlan "switch0" "2" "4 8t" "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "8@eth0"
;; ;;
tew-691gr|\ tew-691gr|\
tew-692gr) tew-692gr)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
ucidef_add_switch "switch0" "1" "1" ucidef_add_switch "switch0" "1" "1"
ucidef_add_switch_vlan "switch0" "1" "0t 1 2 3 4" ucidef_add_switch_ports "switch0" \
ucidef_add_switch_vlan "switch0" "2" "0t 5" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan" "0@eth0"
;; ;;
v11st-fe|\ v11st-fe|\
wzr-agl300nh) wzr-agl300nh)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
ucidef_add_switch "switch0" "1" "1" ucidef_add_switch "switch0" "1" "1"
ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 5t" ucidef_add_switch_ports "switch0" \
ucidef_add_switch_vlan "switch0" "2" "0 5t" "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "5@eth0"
;; ;;
wcr-150gn) wcr-150gn)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
ucidef_add_switch "switch0" "1" "1" ucidef_add_switch "switch0" "1" "1"
ucidef_add_switch_vlan "switch0" "1" "0 6t" ucidef_add_switch_ports "switch0" \
ucidef_add_switch_vlan "switch0" "2" "6t" "0:lan" "6t@eth0"
;; ;;
whr-1166d) whr-1166d)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
ucidef_add_switch "switch0" "1" "1" ucidef_add_switch "switch0" "1" "1"
ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 6t" ucidef_add_switch_ports "switch0" \
ucidef_add_switch_vlan "switch0" "2" "5 6t" "0:lan" "1:lan" "2:lan" "3:lan" "5:wan" "6@eth0"
;; ;;
wizfi630a) wizfi630a)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
ucidef_add_switch "switch0" "1" "1" ucidef_add_switch "switch0" "1" "1"
ucidef_add_switch_vlan "switch0" "1" "1 2 6t" ucidef_add_switch_ports "switch0" \
ucidef_add_switch_vlan "switch0" "2" "0 6t" "1:lan" "2:lan" "0:wan" "6@eth0"
;; ;;
zbt-wr8305rt) zbt-wr8305rt)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
ucidef_add_switch "switch0" "1" "1" ucidef_add_switch "switch0" "1" "1"
ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 4 6t" ucidef_add_switch_ports "switch0" \
ucidef_add_switch_vlan "switch0" "2" "4 6t" "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0"
;; ;;
*) *)
RT3X5X=`cat /proc/cpuinfo | egrep "(RT3.5|RT5350)"` RT3X5X=`cat /proc/cpuinfo | egrep "(RT3.5|RT5350)"`