Changeset 11614

Timestamp:

02/16/09 16:11:06 (4 years ago)

Author:

BrainSlayer

Message:

ralink requires manual channel selection for apsta

Location:

src/router

Files:

• httpd/visuals/dd-wrt.c (modified) (2 diffs)
• libutils/utils.c (modified) (4 diffs)
• services/networking/rt2880.c (modified) (1 diff)

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

@@ -3931 +3931 @@
                                     "apsta" ) ? "selected=\\\"selected\\\"" :
                        "" );
-#ifndef HAVE_RT2880
+//#ifndef HAVE_RT2880
             websWrite( wp,
                        "document.write(\"<option value=\\\"apstawet\\\" %s >\" + wl_basic.repeaterbridge + \"</option>\");\n",
@@ -3937 +3937 @@
                                     "apstawet" ) ? "selected=\\\"selected\\\""
                        : "" );
-#endif
+//#endif
 #else
             websWrite( wp,

src/router/libutils/utils.c

@@ -2163 +2163 @@
                 return "ra0";
         }
+        
         if( nvram_nmatch( "apsta", "wl%d_mode", i ) )
         {
@@ -2169 +2170 @@
         }
 
+        if( nvram_nmatch( "apstawet", "wl%d_mode", i ) )
+        {
+            if( !nvram_nmatch( "disabled", "wl%d_net_mode", i ) )
+                return "apcli0";
+        }
+
     }
     return NULL;
@@ -2180 +2187 @@
     for( i = 0; i < c; i++ )
     {
-        if( nvram_nmatch( "wet", "wl%d_mode", i ))
+        if( nvram_nmatch( "wet", "wl%d_mode", i ) ||  nvram_nmatch( "apstawet", "wl%d_mode", i ) ||  )
         {
             if( !nvram_nmatch( "disabled", "wl%d_net_mode", i ) )
@@ -2201 +2208 @@
     {
         if( nvram_nmatch( "sta", "wl%d_mode", i )
-            || nvram_nmatch( "apsta", "wl%d_mode", i ) )
+            || nvram_nmatch( "apsta", "wl%d_mode", i ))
         {
             if( !nvram_nmatch( "disabled", "wl%d_net_mode", i ) )

src/router/services/networking/rt2880.c

@@ -946 +946 @@
         fprintf( fp, "TxRate=0\n" );
 
-    if( isSTA(  ) && !nvram_match( "wl0_mode", "infra" ) && !nvram_match("wl0_mode","apsta"))
+    if( isSTA(  ) && !nvram_match( "wl0_mode", "infra" ) && !nvram_match("wl0_mode","apsta") && !nvram_match("wl0_mode","apstawet"))
         fprintf( fp, "Channel=0\n" );
     else