Changeset 10910

Timestamp:

11/14/08 00:19:54 (5 years ago)

Author:

BrainSlayer

Message:

decided to go this way

Location:

src/router

Files:

• httpd/visuals/dd-wrt.c (modified) (1 diff)
• services/networking/madwifi.c (modified) (1 diff)
• services/services/bonding.c (modified) (2 diffs)

src/router/httpd/visuals/dd-wrt.c

@@ -2097 +2097 @@
     websWrite( wp, "<div class=\"label\">Bonding Type</div>\n", count );
     showOptions( wp, "bonding_type",
-                 "balance-rr active-backup balance-xor broadcast 802.3ad balance-tlb balance-alb weighted-rr duplex-master duplex-slave",
+                 "balance-rr active-backup balance-xor broadcast 802.3ad balance-tlb balance-alb weighted-rr duplex",
                  nvram_default_get( "bonding_type", "balance-rr" ) );
     websWrite( wp, "&nbsp;Bonding Interfaces&nbsp;" );

src/router/services/networking/madwifi.c

@@ -1247 +1247 @@
             sysprintf("iwpriv %s wds 1",var);
 
+#ifdef HAVE_BONDING
+    if( !strcmp( m, "wdsap" ) && !isBond(var))
+#else
     if( !strcmp( m, "wdsap" ) )
+#endif
         sysprintf("iwpriv %s wdssep 1",var);
     else
-        sysprintf("iwpriv %s wdssep 1",var);
+        sysprintf("iwpriv %s wdssep 0",var);
 
         sysprintf("iwpriv %s hostroaming 0",var);

src/router/services/services/bonding.c

@@ -26 +26 @@
 #include <utils.h>
 #include <syslog.h>
-
-void start_bonding( void )
-{
-    char mode[64];
-    char count[64];
-
-    sprintf( mode, "mode=%s",
-             nvram_default_get( "bonding_type", "balance-rr" ) );
-    sprintf( count, "max_bonds=%s",
-             nvram_default_get( "bonding_number", "1" ) );
-    eval( "insmod", "bonding", "miimon=100","downdelay=200","updelay=200", mode, count );
-
-    static char word[256];
-    char *next, *wordlist;
-
-    wordlist = nvram_safe_get( "bondings" );
-    foreach( word, wordlist, next )
-    {
-        char *port = word;
-        char *tag = strsep( &port, ">" );
-
-        if( !tag || !port )
-        {
-            break;
-        }
-        eval( "ifconfig", tag, "0.0.0.0", "up" );
-        eval( "ifenslave", tag, port );
-    }
-    int c = atoi( nvram_safe_get( "bonding_number" ) );
-    int i;
-
-    for( i = 0; i < c; i++ )
-    {
-        sprintf( word, "bond%d", i );
-        char *br = getRealBridge( word );
-
-        if( br )
-            br_add_interface( br, word );
-
-    }
-}
 void stop_bonding( void )
 {
@@ -88 +47 @@
 }
 
+void start_bonding( void )
+{
+    char mode[64];
+    char count[64];
+    stop_bonding();
+
+    sprintf( mode, "mode=%s",
+             nvram_default_get( "bonding_type", "balance-rr" ) );
+    sprintf( count, "max_bonds=%s",
+             nvram_default_get( "bonding_number", "1" ) );
+    eval( "insmod", "bonding", "miimon=100","downdelay=200","updelay=200", mode, count );
+
+    static char word[256];
+    char *next, *wordlist;
+
+    wordlist = nvram_safe_get( "bondings" );
+    foreach( word, wordlist, next )
+    {
+        char *port = word;
+        char *tag = strsep( &port, ">" );
+
+        if( !tag || !port )
+        {
+            break;
+        }
+        if (!strncmp(port,"ath",3) && nvram_nmatch("wdsap","%s_mode",port))
+            {
+            sysprintf("ifconfig %s down",port);
+            sysprintf("iwpriv %s wdssep 0",port);
+            sysprintf("ifconfig %s up",port);
+            }
+        eval( "ifconfig", tag, "0.0.0.0", "up" );
+        eval( "ifenslave", tag, port );
+    }
+    int c = atoi( nvram_safe_get( "bonding_number" ) );
+    int i;
+
+    for( i = 0; i < c; i++ )
+    {
+        sprintf( word, "bond%d", i );
+        char *br = getRealBridge( word );
+
+        if( br )
+            br_add_interface( br, word );
+
+    }
+}
+
+int isBond(char *ifname)
+{
+    static char word[256];
+    char *next, *wordlist;
+
+    wordlist = nvram_safe_get( "bondings" );
+    foreach( word, wordlist, next )
+    {
+        char *port = word;
+        char *tag = strsep( &port, ">" );
+
+        if( !tag || !port )
+        {
+            break;
+        }
+        if (!strcmp(port,ifname))
+            return 1;
+    }
+    return 0;
+}
+
 #endif