Changeset 12229

Timestamp:

06/01/09 06:57:42 (4 years ago)

Author:

eko

Message:

some more dual radio stuff

Location:

src/router/rc

Files:

• init.c (modified) (4 diffs)
• radio_timer.c (modified) (5 diffs)

src/router/rc/init.c

@@ -543 +543 @@
 
         fclose(fp);
+        
+        int cnt = get_wl_instances();
+    int c;
+    
         /* 
          * Loop forever 
@@ -575 +579 @@
 
 #if !defined(HAVE_MADWIFI) && !defined(HAVE_RT2880)
-                        eval("wlconf", nvram_safe_get("wl0_ifname"), "down");
-                        eval("wlconf", nvram_safe_get("wl1_ifname"), "down");
-                        char *next;
-                        char var[80];
-                        char *vifs = nvram_safe_get("wl0_vifs");
+    for (c = 0; c < cnt; c++) {
+                eval("wlconf", get_wl_instance_name(c), "down");
+                char *next;
+                char var[80];
+                char *vifs = nvram_nget("wl%d_vifs", c);
 
                         if (vifs != NULL)
@@ -585 +589 @@
                                 eval("ifconfig", var, "down");
                                 }
+        }
 #endif
 
@@ -702 +707 @@
 #if !defined(HAVE_MADWIFI) && !defined(HAVE_RT2880)
 #ifdef HAVE_RADIOOFF
-                        if (nvram_match("radiooff_button", "1")
-                            && nvram_match("radiooff_boot_off", "1")) {
-                                eval("wl", "-i", get_wl_instance_name(0),
-                                     "radio", "off");
-                        } else
-#endif
-                                start_service("nas");
+                if (nvram_match("radiooff_button", "1")
+                    && nvram_match("radiooff_boot_off", "1" ))
+                {
+                    for (c = 0; c < cnt; c++) {
+                    eval("wl", "-i", get_wl_instance_name(c), "radio",
+                          "off");
+                        }
+                        led_control( LED_SEC0, LED_OFF );
+                        led_control( LED_SEC1, LED_OFF );
+                }
+                else
+#endif
+                        {
+                        start_service("nas");
                         start_service("guest_nas");
+                        }
 #endif
 

src/router/rc/radio_timer.c

@@ -165 +165 @@
                                              "RadioOn=1");
 #else
-                                        if (pidof("nas") > 0
-                                            || pidof("wrt-radauth") > 0) {
-                                                stop_service("nas");
-                                        }
+                                        stop_service("nas");
                                         eval("wl", "-i",
                                              get_wl_instance_name(0), "radio",
@@ -186 +183 @@
                                              "RadioOn=0");
 #else
-                                        if (pidof("nas") > 0
-                                            || pidof("wrt-radauth") > 0) {
-                                                stop_service("nas");
-                                        }
+                                        stop_service("nas");
                                         eval("wl", "-i",
                                              get_wl_instance_name(0), "radio",
                                              "off");
+                                        eval("startservice", "nas");
+                                        start_service("guest_nas");
 #endif
                                         break;
@@ -203 +199 @@
                                         syslog(LOG_DEBUG,
                                                "Turning radio 1 on\n");
-                                        if (pidof("nas") > 0
-                                            || pidof("wrt-radauth") > 0) {
-                                                stop_service("nas");
-                                        }
+#ifdef HAVE_MADWIFI
+                                        eval("ifconfig", "ath1", "up");
+#elif HAVE_RT2880
+                                        eval("iwpriv", "ra1", "set",
+                                             "RadioOn=1");
+#else
+                                        stop_service("nas");
                                         eval("wl", "-i",
                                              get_wl_instance_name(1), "radio",
@@ -212 +211 @@
                                         eval("startservice", "nas");
                                         start_service("guest_nas");
+#endif
                                         break;
 
@@ -217 +217 @@
                                         syslog(LOG_DEBUG,
                                                "Turning radio 1 off\n");
-                                        if (pidof("nas") > 0
-                                            || pidof("wrt-radauth") > 0) {
-                                                stop_service("nas");
-                                        }
+#ifdef HAVE_MADWIFI
+                                        eval("ifconfig", "ath1", "down");
+#elif HAVE_RT2880
+                                        eval("iwpriv", "ra1", "set",
+                                             "RadioOn=0");
+#else
+                                        stop_service("nas");
                                         eval("wl", "-i",
                                              get_wl_instance_name(1), "radio",
                                              "off");
+                                        eval("startservice", "nas");
+                                        start_service("guest_nas");
+#endif
                                         break;
                                 }