Changeset 18928

Timestamp:

04/05/12 22:09:05 (14 months ago)

Author:

BrainSlayer

Message:

work in progress

Location:

src/router/services

Files:

• networking/interface.c (modified) (1 diff)
• networking/network.c (modified) (2 diffs)
• networking/wshaper.c (modified) (1 diff)
• sysinit/sysinit-ca8.c (modified) (1 diff)
• sysinit/sysinit-dir300.c (modified) (2 diffs)
• sysinit/sysinit-fonera.c (modified) (1 diff)
• sysinit/sysinit-rcaa01.c (modified) (1 diff)

src/router/services/networking/interface.c

@@ -547 +547 @@
                  nvram_safe_get("lan_ifnames"), nvram_safe_get("wan_ifnames"));
 #elif HAVE_DIR300
-        snprintf(all_ifnames, 255, "%s %s %s", "eth0 vlan0 vlan2",
+        snprintf(all_ifnames, 255, "%s %s %s", "eth0 vlan1 vlan2",
                  nvram_safe_get("lan_ifnames"), nvram_safe_get("wan_ifnames"));
 #elif HAVE_MR3202A

src/router/services/networking/network.c

@@ -954 +954 @@
 #ifdef HAVE_DIR300
         if (getSTA() || getWET() || CANBRIDGE()) {
-                nvram_setz(lan_ifnames, "vlan0 vlan2 ath0");
+                nvram_setz(lan_ifnames, "vlan1 vlan2 ath0");
                 PORTSETUPWAN("");
         } else {
-                nvram_setz(lan_ifnames, "vlan0 vlan2 ath0");
+                nvram_setz(lan_ifnames, "vlan1 vlan2 ath0");
                 PORTSETUPWAN("vlan2");
         }
@@ -4021 +4021 @@
                     nvram_safe_get("wan_gateway");
                 if (strcmp(gateway, "0.0.0.0")) {
-                        route_add(wan_ifname, 0, gateway, NULL,
-                                  "255.255.255.255");
+//                      route_add(wan_ifname, 0, gateway, NULL,"255.255.255.255");
 
                         while (route_add

src/router/services/networking/wshaper.c

@@ -844 +844 @@
         ret = eval(script_name, "stop", "XX", "ath0");
 #elif HAVE_DIR300
-        ret = eval(script_name, "stop", "XX", "vlan0");
+        ret = eval(script_name, "stop", "XX", "vlan1");
         ret = eval(script_name, "stop", "XX", "vlan2");
         ret = eval(script_name, "stop", "XX", "ath0");

src/router/services/sysinit/sysinit-ca8.c

@@ -97 +97 @@
         struct ifreq ifr;
         if (getRouterBrand() == ROUTER_BOARD_CA8PRO) {
-                eval("ifconfig", "eth0", "up", "promisc");      // required for vlan config
+//              eval("ifconfig", "eth0", "up", "promisc");      // required for vlan config
                 eval("/sbin/vconfig", "set_name_type", "VLAN_PLUS_VID_NO_PAD");
                 eval("/sbin/vconfig", "add", "eth0", "0");

src/router/services/sysinit/sysinit-dir300.c

@@ -200 +200 @@
         writeproc("/proc/sys/dev/wifi0/softled","1");
         if (getRouterBrand() == ROUTER_BOARD_FONERA2200) {
-                eval("ifconfig", "eth0", "up", "promisc");      // required for vlan config
+//              eval("ifconfig", "eth0", "up", "promisc");      // required for vlan config
                 eval("/sbin/vconfig", "set_name_type", "VLAN_PLUS_VID_NO_PAD");
                 eval("/sbin/vconfig", "add", "eth0", "0");
@@ -227 +227 @@
                 }
         } else {
-//      system("swconfig dev eth0 set reset 1");
-//      system("swconfig dev eth0 set enable_vlan 1");
 #ifdef HAVE_SWCONFIG
+                system("swconfig dev eth0 set reset 1");
+                system("swconfig dev eth0 set enable_vlan 1");
                 system("swconfig dev eth0 vlan 1 set ports \"0 1 2 3 5t\"");
                 system("swconfig dev eth0 vlan 2 set ports \"4 5t\"");

src/router/services/sysinit/sysinit-fonera.c

@@ -125 +125 @@
         struct ifreq ifr;
         if (getRouterBrand() == ROUTER_BOARD_FONERA2200) {
-                eval("ifconfig", "eth0", "up", "promisc");      // required for vlan config
+//              eval("ifconfig", "eth0", "up", "promisc");      // required for vlan config
                 eval("/sbin/vconfig", "set_name_type", "VLAN_PLUS_VID_NO_PAD");
                 eval("/sbin/vconfig", "add", "eth0", "0");

src/router/services/sysinit/sysinit-rcaa01.c

@@ -103 +103 @@
         if (getRouterBrand() == ROUTER_BOARD_RCAA01) {
                 insmod("mvswitch");
-                eval("ifconfig", "eth0", "up", "promisc");      // required for vlan config
+//              eval("ifconfig", "eth0", "up", "promisc");      // required for vlan config
                 eval("/sbin/vconfig", "set_name_type", "VLAN_PLUS_VID_NO_PAD");
                 eval("/sbin/vconfig", "add", "eth0", "0");