ramips: add ramips_ prefix to get_mac_{binary,nvram} functions

[openwrt.git] / target / linux / ramips / base-files / etc / uci-defaults / network

diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network
index 7cb6b83..5891b48 100755 (executable)
--- a/target/linux/ramips/base-files/etc/uci-defaults/network
+++ b/target/linux/ramips/base-files/etc/uci-defaults/network
@@ -9,7 +9,7 @@ if [ ! -x /usr/sbin/maccalc ]; then
        return
 fi
 
-get_mac_binary()
+ramips_get_mac_binary()
 {
        local mtdname="$1"
        local seek="$2"
@@ -17,14 +17,14 @@ get_mac_binary()
 
        part=$(find_mtd_part "$mtdname")
        if [ -z "$part" ]; then
-               echo "get_mac_binary: partition $mtdname not found!" >&2
+               echo "ramips_get_mac_binary: partition $mtdname not found!" >&2
                return
        fi
 
        dd bs=1 skip=$seek count=6 if=$part 2>/dev/null | /usr/sbin/maccalc bin2mac
 }
 
-get_mac_nvram()
+ramips_get_mac_nvram()
 {
        local mtdname="$1"
        local key="$2"
@@ -33,7 +33,7 @@ get_mac_nvram()
 
        part=$(find_mtd_part "$mtdname")
        if [ -z "$part" ]; then
-               echo "get_mac_nvram: partition $mtdname not found!" >&2
+               echo "ramips_get_mac_nvram: partition $mtdname not found!" >&2
                return
        fi
 
@@ -53,13 +53,23 @@ ramips_setup_interfaces()
        b2c | \
        f5d8235-v2 | \
        nw718)
-               ucidef_set_interfaces_lan_wan "eth0.1 eth0.2"
+               ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+               ;;
+
+       rt-n15)
+               ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+               ucidef_add_switch "rtl8366s" "1" "1"
+               ucidef_add_switch_vlan "rtl8366s" "1" "1 2 3 4 5t"
+               ucidef_add_switch_vlan "rtl8366s" "2" "0 5t"
                ;;
 
        *)
                RT3X5X=`cat /proc/cpuinfo | grep RT3.5`
-               [ -z "${RT3X5X}" ] || \
-                       ucidef_set_interfaces_lan_wan "eth0.1 eth0.2"
+               if [ -n "${RT3X5X}" ]; then
+                       ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+               else
+                       ucidef_set_interfaces_lan_wan "eth0" "eth1"
+               fi
                ;;
        esac
 }
@@ -72,14 +82,15 @@ ramips_setup_macs()
 
        case $board in
        f5d8235-v2)
-               lan_mac=$(get_mac_nvram "u-boot" 262148)
+               lan_mac=$(ramips_get_mac_nvram "u-boot" 262148)
                wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
                ;;
 
        argus-atp52b | \
        b2c | \
-       nw718)
-               lan_mac=$(get_mac_binary factory 4)
+       nw718 | \
+       rt-n15)
+               lan_mac=$(ramips_get_mac_binary factory 4)
                wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
                ;;
        esac
@@ -88,6 +99,10 @@ ramips_setup_macs()
        [ -n $wan_mac ] && ucidef_set_interface_macaddr wan $wan_mac
 }
 
+[ -e /etc/config/network ] && exit 0
+
+touch /etc/config/network
+
 board=$(ramips_board_name)
 
 ramips_setup_interfaces $board