summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNavtej Singh Mann <navtejsingh@google.com>2015-07-13 23:37:37 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-13 23:37:37 +0000
commitf5e0a7dd912b5e242165c0c89d873e9e202a1472 (patch)
tree7d2528370743dd1e3b8eb90e999b25c812723d47
parentd0332688423d7f2dbba787e8bf03e3e1f274e8c9 (diff)
parent10619e8c9ed541a6a31db45a758f96c9c94c7fb7 (diff)
downloadhardware_broadcom_wlan-f5e0a7dd912b5e242165c0c89d873e9e202a1472.zip
hardware_broadcom_wlan-f5e0a7dd912b5e242165c0c89d873e9e202a1472.tar.gz
hardware_broadcom_wlan-f5e0a7dd912b5e242165c0c89d873e9e202a1472.tar.bz2
am 10619e8c: Merge "don\'t register command for BSSID blacklist because there is no stop for blacklist" into mnc-dev
* commit '10619e8c9ed541a6a31db45a758f96c9c94c7fb7': don't register command for BSSID blacklist because there is no stop for blacklist
-rw-r--r--bcmdhd/wifi_hal/gscan.cpp16
1 files changed, 6 insertions, 10 deletions
diff --git a/bcmdhd/wifi_hal/gscan.cpp b/bcmdhd/wifi_hal/gscan.cpp
index 7edeb6c..7b0f821 100644
--- a/bcmdhd/wifi_hal/gscan.cpp
+++ b/bcmdhd/wifi_hal/gscan.cpp
@@ -885,7 +885,7 @@ public:
request.destroy();
}
- // ALOGE("GetScanResults read %d results", mRetrieved);
+ ALOGV("GetScanResults read %d results", mRetrieved);
*mNum = mRetrieved;
return WIFI_SUCCESS;
}
@@ -969,7 +969,7 @@ public:
it.get_type(), it.get_len());
}
}
-
+ ALOGV("GetScanResults read %d results", mRetrieved);
return NL_OK;
}
};
@@ -1893,11 +1893,9 @@ wifi_error wifi_set_bssid_blacklist(wifi_request_id id, wifi_interface_handle if
wifi_handle handle = getWifiHandle(iface);
BssidBlacklistCommand *cmd = new BssidBlacklistCommand(iface, id, &params);
- wifi_register_cmd(handle, id, cmd);
wifi_error result = (wifi_error)cmd->start();
- if (result != WIFI_SUCCESS) {
- wifi_unregister_cmd(handle, id);
- }
+ //release the reference of command as well
+ cmd->releaseRef();
return result;
}
@@ -1991,11 +1989,9 @@ wifi_error wifi_set_bssid_preference(wifi_request_id id, wifi_interface_handle i
wifi_handle handle = getWifiHandle(iface);
BssidPreferenceCommand *cmd = new BssidPreferenceCommand(iface, id, num_bssid, prefs);
- wifi_register_cmd(handle, id, cmd);
wifi_error result = (wifi_error)cmd->start();
- if (result != WIFI_SUCCESS) {
- wifi_unregister_cmd(handle, id);
- }
+ //release the reference of command as well
+ cmd->releaseRef();
return result;
}