Changeset 9126

Timestamp:

02/27/08 02:37:19 (5 years ago)

Author:

BrainSlayer

Message:

prevent hammering

File:

• src/router/services/sysinit/sysinit-broadcom.c (modified) (3 diffs)

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

@@ -1159 +1159 @@
 enable_dtag_vlan (int enable)
 {
+  int donothing = 0;
+  if (nvram_match ("vdsl_state", "1") && enable)
+    donothing = 1;
+  if (nvram_match ("vdsl_state", "0") && !enable)
+    donothing = 1;
+
   char *vlan7ports = NULL;
   vlan7ports = "4t 5";
@@ -1176 +1182 @@
       if (getRouterBrand () == ROUTER_WRT600N)
         eth = "eth2";
+      if (donothing)
+        return eth;
       if (enable)
         {
@@ -1198 +1206 @@
   system2 ("echo 1 > /proc/switch/eth1/reset");
   char tmp[200];
-  if (enable)
-    {
-      sprintf (tmp, "echo %s > /proc/switch/eth0/vlan/1/ports", "");
-      system2 (tmp);
-      sprintf (tmp, "echo %s > /proc/switch/eth1/vlan/1/ports", "");
-      system2 (tmp);
-      sprintf (tmp, "echo %s > /proc/switch/eth0/vlan/0/ports",
-               nvram_safe_get ("vlan0ports"));
-      system2 (tmp);
-      sprintf (tmp, "echo %s > /proc/switch/eth1/vlan/0/ports",
-               nvram_safe_get ("vlan0ports"));
-      system2 (tmp);
-      sprintf (tmp, "echo %s > /proc/switch/eth0/vlan/7/ports", vlan7ports);
-      system2 (tmp);
-      sprintf (tmp, "echo %s > /proc/switch/eth1/vlan/7/ports", vlan7ports);
-      system2 (tmp);
-    }
-  else
-    {
-      int i;
-      for (i = 0; i < 16; i++)
-        {
-          sprintf (tmp, "echo %s > /proc/switch/eth0/vlan/%d/ports", "", i);
+  if (!donothing)
+    {
+      if (enable)
+        {
+          sprintf (tmp, "echo %s > /proc/switch/eth0/vlan/1/ports", "");
           system2 (tmp);
-          sprintf (tmp, "echo %s > /proc/switch/eth1/vlan/%d/ports", "", i);
+          sprintf (tmp, "echo %s > /proc/switch/eth1/vlan/1/ports", "");
           system2 (tmp);
-        }
-      for (i = 0; i < 16; i++)
-        {
-          char vlanb[16];
-          sprintf (vlanb, "vlan%dports", i);
-          if (nvram_get (vlanb) == NULL || nvram_match (vlanb, ""))
-            continue;
-          sprintf (tmp, "echo %s > /proc/switch/eth0/vlan/%d/ports",
-                   nvram_safe_get (vlanb), i);
+          sprintf (tmp, "echo %s > /proc/switch/eth0/vlan/0/ports",
+                   nvram_safe_get ("vlan0ports"));
           system2 (tmp);
-          sprintf (tmp, "echo %s > /proc/switch/eth1/vlan/%d/ports",
-                   nvram_safe_get (vlanb), i);
+          sprintf (tmp, "echo %s > /proc/switch/eth1/vlan/0/ports",
+                   nvram_safe_get ("vlan0ports"));
           system2 (tmp);
+          sprintf (tmp, "echo %s > /proc/switch/eth0/vlan/7/ports",
+                   vlan7ports);
+          system2 (tmp);
+          sprintf (tmp, "echo %s > /proc/switch/eth1/vlan/7/ports",
+                   vlan7ports);
+          system2 (tmp);
+        }
+      else
+        {
+          int i;
+          for (i = 0; i < 16; i++)
+            {
+              sprintf (tmp, "echo %s > /proc/switch/eth0/vlan/%d/ports", "",
+                       i);
+              system2 (tmp);
+              sprintf (tmp, "echo %s > /proc/switch/eth1/vlan/%d/ports", "",
+                       i);
+              system2 (tmp);
+            }
+          for (i = 0; i < 16; i++)
+            {
+              char vlanb[16];
+              sprintf (vlanb, "vlan%dports", i);
+              if (nvram_get (vlanb) == NULL || nvram_match (vlanb, ""))
+                continue;
+              sprintf (tmp, "echo %s > /proc/switch/eth0/vlan/%d/ports",
+                       nvram_safe_get (vlanb), i);
+              system2 (tmp);
+              sprintf (tmp, "echo %s > /proc/switch/eth1/vlan/%d/ports",
+                       nvram_safe_get (vlanb), i);
+              system2 (tmp);
+            }
         }
     }