Bug 903859 - [WiFi] setWifiEnabled tries to configure the WiFi operation mode before any driver being loaded. r=mwu

This commit is contained in:
Vincent Chang 2013-08-12 11:22:20 +08:00
parent a4ae239c93
commit 5df15c81a6

View File

@ -1226,16 +1226,15 @@ var WifiManager = (function() {
null);
prepareForStartup(function() {
gNetworkManager.setWifiOperationMode(ifname,
WIFI_FIRMWARE_STATION,
function (status) {
loadDriver(function (status) {
if (status) {
callback(status);
manager.state = "UNINITIALIZED";
return;
}
loadDriver(function (status) {
gNetworkManager.setWifiOperationMode(ifname,
WIFI_FIRMWARE_STATION,
function (status) {
if (status < 0) {
callback(status);
manager.state = "UNINITIALIZED";
@ -1264,7 +1263,7 @@ var WifiManager = (function() {
// to return from loadDriver, so wait 2 seconds before starting
// the supplicant to give it a chance to start.
createWaitForDriverReadyTimer(doStartSupplicant);
});
});
});
});
});