Bug 520315 - Wifi scanning fails on the n900 device. r=biesinger
authorDoug Turner <dougt@meer.net>
Sat, 03 Oct 2009 08:33:05 -0700
changeset 33424 0c145a6507a37eff50918a0a1d683642741249e7
parent 33423 0a7dd88dbe676f5e36efb4fbceec13fe3666a8c2
child 33425 e289543dc11451f8de0ca829bde48d26e6aef834
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbiesinger
bugs520315
milestone1.9.3a1pre
Bug 520315 - Wifi scanning fails on the n900 device. r=biesinger
netwerk/wifi/src/nsWifiScannerUnix.cpp
--- a/netwerk/wifi/src/nsWifiScannerUnix.cpp
+++ b/netwerk/wifi/src/nsWifiScannerUnix.cpp
@@ -123,18 +123,21 @@ static int scan_wifi(int skfd, char* ifn
 
 nsresult
 nsWifiMonitor::DoScan()
 {
   void* iwlib_handle = dlopen("libiw.so", RTLD_NOW);
   if (!iwlib_handle) {
     iwlib_handle = dlopen("libiw.so.29", RTLD_NOW);
     if (!iwlib_handle) {
-      LOG(("Could not load libiw\n"));
-      return NS_ERROR_NOT_AVAILABLE;
+      iwlib_handle = dlopen("libiw.so.30", RTLD_NOW);
+      if (!iwlib_handle) {
+        LOG(("Could not load libiw\n"));
+        return NS_ERROR_NOT_AVAILABLE;
+      }
     }
   }
   else {
     LOG(("Loaded libiw\n"));
   }
 
   iw_open_t iw_open = (iw_open_t) dlsym(iwlib_handle, "iw_sockets_open");
   iw_enum_t iw_enum = (iw_enum_t) dlsym(iwlib_handle, "iw_enum_devices");