lantiq: fix warning if ltq_atm modules are missing

[openwrt/openwrt.git] / target / linux / lantiq / base-files / etc / board.d / 02_network

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 d9221dab8676b92d6242e43d65297a8efe3f9a1a..576bb7d86bc8f2746e96bde716f51e553a4dd774 100755 (executable)
--- 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,7 @@ 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"
        ;;
 
 BTHOMEHUBV2B)
@@ -75,7 +75,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,13 +134,13 @@ VR200v)
                "0:lan" "2:lan" "4:lan" "5:lan" "6t@eth0"
        ;;
 
-VGV7510KW22)
+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)
+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 +155,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 +164,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