From 27f7234a5cadacc421ba8e8f69955b3606320adc Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@mozilla.com>
Date: Mon, 23 Jul 2012 14:41:29 -0700
Subject: [PATCH] Toggling off and on the Wifi Checkbox will not scan wifi
 networks anymore (bug 774876, r=gal).

---
 dom/wifi/WifiWorker.js | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/dom/wifi/WifiWorker.js b/dom/wifi/WifiWorker.js
index c7e57af6de05..e8c1b844ffaf 100644
--- a/dom/wifi/WifiWorker.js
+++ b/dom/wifi/WifiWorker.js
@@ -126,12 +126,30 @@ var WifiManager = (function() {
     });
   }
 
+  var driverLoaded = false;
   function loadDriver(callback) {
-    voidControlMessage("load_driver", callback);
+    if (driverLoaded) {
+      callback(0);
+      return;
+    }
+
+    voidControlMessage("load_driver", function(status) {
+      driverLoaded = (status >= 0);
+      callback(status)
+    });
   }
 
   function unloadDriver(callback) {
-    voidControlMessage("unload_driver", callback);
+    // Otoro ICS can't unload and then load the driver, so never unload it.
+    if (device === "otoro") {
+      callback(0);
+      return;
+    }
+
+    voidControlMessage("unload_driver", function(status) {
+      driverLoaded = (status < 0);
+      callback(status);
+    });
   }
 
   function startSupplicant(callback) {