add Buffalo WHR-G125 specifc switch quirks to netconfig, shorten code by merging...

SVN-Revision: 20846

diff --git a/target/linux/brcm-2.4/base-files/etc/init.d/netconfig b/target/linux/brcm-2.4/base-files/etc/init.d/netconfig
index d20ff43b8006a8b5f7707e0e31042ab3eaa0e38d..d7839b6b494833c43ec84b1cb36684a4bf019542 100755 (executable)
--- a/target/linux/brcm-2.4/base-files/etc/init.d/netconfig
+++ b/target/linux/brcm-2.4/base-files/etc/init.d/netconfig
@@ -112,9 +112,9 @@ start() {
                        c["wan_ifname"] = "eth1"
                        c["lan_ifname"] = "eth0"
                }
-               if (model == "ASUS WL-500g Premium V2") {
-                               c["vlan0ports"] = "0 1 2 3 5"
-                               c["vlan1ports"] = "4 5"
+               if ((model == "ASUS WL-500g Premium V2") || (model == "Dell TrueMobile 2300 v2") || (model == "Buffalo WHR-G125")) {
+                       c["vlan0ports"] = "0 1 2 3 5"
+                       c["vlan1ports"] = "4 5"
                }
                if (model == "Dell TrueMobile 2300") {
                        c["lan_ifname"] = "eth0"
@@ -122,20 +122,12 @@ start() {
                        c["vlan0ports"] = "0 1 2 3 4 5u"
                        c["vlan1ports"] = ""
                }
-               if (model == "Dell TrueMobile 2300 v2") {
-                       c["vlan0ports"] = "0 1 2 3 5"
-                       c["vlan1ports"] = "4 5"
-               }
                if (nvram["boardtype"] == "bcm94710r4") {
                        # Toshiba WRC-1000
                        c["lan_ifname"] = "eth0"
                        c["wan_ifname"] = "eth1"
                }
-               if (nvram["boardtype"] == "wgt634u") {
-                       c["vlan0ports"] = "0 1 2 3 5"
-                       c["vlan1ports"] = "4 5"
-               }
-               if (nvram["boardtype"] == "0x0467") {
+               if ((nvram["boardtype"] == "wgt634u") || (nvram["boardtype"] == "0x0467")) {
                        c["vlan0ports"] = "0 1 2 3 5"
                        c["vlan1ports"] = "4 5"
                }