X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Flantiq%2Fbase-files%2Fetc%2Fboard.d%2F02_network;h=3dd5cadc670f1a7960c0ce555c56bce531372023;hp=d824c66d1a54c44a3a66eddf1bfc15b6785e3b63;hb=6254a2028c181fe9863dc7758d47eda667b4f397;hpb=17094e9e642ffca19c6b6681766d2bcbb8e6e565

diff --git a/target/linux/lantiq/base-files/etc/board.d/02_network b/target/linux/lantiq/base-files/etc/board.d/02_network
index d824c66d1a..3dd5cadc67 100755
--- a/target/linux/lantiq/base-files/etc/board.d/02_network
+++ b/target/linux/lantiq/base-files/etc/board.d/02_network
@@ -58,7 +58,14 @@ ARV7519PW)
 ARV7519RW22)
 	wan_mac=$(macaddr_add "$(mtd_get_mac_binary boardconfig 22)" 1)
 	ucidef_add_switch "switch0" \
-		"0:lan" "2:lan" "3:lan" "4:lan" "5:lan" "6t@eth0"
+		"0:lan:5" "2:lan:3" "3:lan:4" "4:lan:1" "5:lan:2" "6t@eth0"
+	;;
+
+ASL56026)
+	lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
+	wan_mac=$(mtd_get_mac_ascii uboot_env wanmac)
+	ucidef_add_switch "switch0"\
+		"2:lan" "3:lan" "6t@eth0"
 	;;
 
 BTHOMEHUBV2B)
@@ -75,7 +82,8 @@ BTHOMEHUBV3A)
 	;;
 
 BTHOMEHUBV5A)
-	wan_mac=$(macaddr_add "$(mtd_get_mac_binary caldata 4364)" 1)
+	lan_mac=$(mtd_get_mac_binary_ubi caldata 4364)
+	wan_mac=$(macaddr_add "$lan_mac" 1)
 	ucidef_add_switch "switch0" \
 		"0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0"
 	;;
@@ -133,14 +141,14 @@ VR200v)
 		"0:lan" "2:lan" "4:lan" "5:lan" "6t@eth0"
 	;;
 
-VGV7510KW22)
-	wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 1)
+VGV7510KW22*)
+	wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 2)
 	ucidef_add_switch "switch0" \
 		"2:lan:2" "3:lan:1" "4:lan:4" "5:lan:3" "6t@eth0"
 	;;
 
-VGV7519)
-	wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 1)
+VGV7519*)
+	wan_mac=$(mtd_get_mac_binary board_config 22)
 	ucidef_add_switch "switch0" \
 		"0:lan:4" "1:lan:3" "2:lan:2" "4:lan:1" "6t@eth0"
 	;;
@@ -154,7 +162,7 @@ WBMR300)
 	lan_mac=$(mtd_get_mac_ascii ubootconfig ethaddr)
 	wan_mac="$lan_mac"
 	ucidef_add_switch "switch0" \
-		"2:lan:2" "3:lan:3" "5:lan:4" "4:wan:1" "6t@eth0"
+		"5:lan:2" "2:lan:3" "3:lan:4" "4:wan:1" "6t@eth0"
 	;;
 
 *)
@@ -163,11 +171,10 @@ WBMR300)
 
 esac
 
-if [ -n "$(ls /lib/modules/`uname -r`/ltq_atm*)" ]; then
+ls /lib/modules/$(uname -r)/ltq_atm* 1> /dev/null 2>&1 && \
 	ucidef_add_atm_bridge "$vpi" "$vci" "$encaps" "$payload"
-fi
 
-if grep -qE "system type.*: (VR9|xRX200)" /proc/cpuinfo; then
+if lantiq_is_vdsl_system; then
 	interface_wan="ptm0"
 	ucidef_add_vdsl_modem "$annex" "av" "ptm"
 else
@@ -183,3 +190,4 @@ ucidef_set_interface_wan "$interface_wan" "pppoe"
 board_config_flush
 
 exit 0
+