ar71xx: fix WNDR3x00 model detection

[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 a00e162..f78f9bf 100755 (executable)
--- a/target/linux/ramips/base-files/etc/uci-defaults/network
+++ b/target/linux/ramips/base-files/etc/uci-defaults/network
@@ -9,39 +9,6 @@ if [ ! -x /usr/sbin/maccalc ]; then
        return
 fi
 
        return
 fi
 

-get_mac_binary()
-{
-       local mtdname="$1"
-       local seek="$2"
-       local part
-
-       part=$(find_mtd_part "$mtdname")
-       if [ -z "$part" ]; then
-               echo "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()
-{
-       local mtdname="$1"
-       local key="$2"
-       local part
-       local mac_dirty
-
-       part=$(find_mtd_part "$mtdname")
-       if [ -z "$part" ]; then
-               echo "get_mac_nvram: partition $mtdname not found!" >&2
-               return
-       fi
-
-       mac_dirty=$(strings "$part" | sed -n 's/'"$key"'=//p')
-       # "canonicalize" mac
-       maccalc add "$mac_dirty" 0
-}
-

 ramips_setup_interfaces()
 {
        local board="$1"
 ramips_setup_interfaces()
 {
        local board="$1"


@@ -53,15 +20,22 @@ ramips_setup_interfaces()
        b2c | \
        f5d8235-v2 | \
        nw718)
        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`
                if [ -n "${RT3X5X}" ]; then
                ;;
 
        *)
                RT3X5X=`cat /proc/cpuinfo | grep RT3.5`
                if [ -n "${RT3X5X}" ]; then

-                       ucidef_set_interfaces_lan_wan "eth0.1 eth0.2"
+                       ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"

                else
                else

-                       ucidef_set_interfaces_lan_wan "eth0 eth1"
+                       ucidef_set_interfaces_lan_wan "eth0" "eth1"

                fi
                ;;
        esac
                fi
                ;;
        esac


@@ -75,16 +49,29 @@ ramips_setup_macs()
 
        case $board in
        f5d8235-v2)
 
        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 | \
                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)
+               ;;
+
+       dir-300-b1 |\
+       dir-300-b2 |\
+       dir-600-b1)
+               lan_mac=$(ramips_get_mac_binary devdata 16388)

                wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
                ;;
                wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
                ;;

+
+       nbg-419n)
+                lan_mac=$(ramips_get_mac_binary factory 4)
+                wan_mac=$(ramips_get_mac_binary factory 40)
+               ;;

        esac
 
        [ -n $lan_mac ] && ucidef_set_interface_macaddr lan $lan_mac
        esac
 
        [ -n $lan_mac ] && ucidef_set_interface_macaddr lan $lan_mac