Changeset 8580

Timestamp:

12/11/07 19:43:23 (5 years ago)

Author:

BrainSlayer

Message:

crashfixes if no wificard is installed

Location:

src/router

Files:

• httpd/modules/broadcom.c (modified) (1 diff)
• services/networking/network.c (modified) (2 diffs)
• services/sysinit/sysinit-broadcom.c (modified) (2 diffs)
• shared/wl.c (modified) (1 diff)

src/router/httpd/modules/broadcom.c

@@ -4979 +4979 @@
 {
 #ifndef HAVE_MADWIFI
-  websWrite (wp, "%s mW", nvram_safe_get ("txpwr"));
+  websWrite (wp, "%s mW", nvram_safe_get ("wl0_txpwr"));
 #else
   char mode[32];

src/router/services/networking/network.c

@@ -465 +465 @@
 #endif
 int instance = get_wl_instance(name);
-
+if (instance==-1)
+    return -1; //no wireless device
   if (nvram_nmatch ("infra","wl%d_mode", instance))
     {
@@ -1409 +1410 @@
                 ether_atoe (mac, ifr.ifr_hwaddr.sa_data);
                 int instance = get_wl_instance(name);
+                if (instance==-1)
+                    continue; // no wireless device
                 if (nvram_nmatch ("","wl%d_hwaddr",instance )
                     || !nvram_nget ("wl%d_hwaddr",instance))

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

@@ -117 +117 @@
 
   int brand = getRouterBrand ();
+      char macbuf[32];
+      char eaddr[32];
 
 #ifdef HAVE_MSSID               //v24
@@ -228 +230 @@
     case ROUTER_WRT600N:
       eval ("insmod", "wl");    //load module
-      char macbuf[32];
-      char eaddr[32];
       wl_hwaddr("eth1",macbuf);
       ether_etoa((uchar *)macbuf, eaddr);

src/router/shared/wl.c

@@ -843 +843 @@
 if (get_wl_instance("eth3")==instance)
     return "eth3";
+return "eth1"; // dirty for debugging
 }