commit 803b245ef485f16245234a42b8885a2ec50c5e5a
author Jean-Baptiste Queru <jbq@google.com> Mon Mar 11 12:28:05 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 11 12:28:05 2013 -0700
tree 1accede5e43bb6ad38058079de2f839ad5bd22f3
parent 917e120f736f95292a40b6c7da9940d6369955e1
parent 469dbc0aec2b85c3ac9947f1d1572c27bd5ce99e

am 469dbc0a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '469dbc0aec2b85c3ac9947f1d1572c27bd5ce99e':

tests/wifi/stress/wifiLoadScanAssoc.c

diff --git a/tests/wifi/stress/wifiLoadScanAssoc.c b/tests/wifi/stress/wifiLoadScanAssoc.c
index 17536e4..801e44a 100644
--- a/tests/wifi/stress/wifiLoadScanAssoc.c
+++ b/tests/wifi/stress/wifiLoadScanAssoc.c
@@ -311,7 +311,7 @@
 
         // Stop Supplicant
         randBind(&availCPU, &cpu);
-        if ((rv = wifi_stop_supplicant()) != 0) {
+        if ((rv = wifi_stop_supplicant(false)) != 0) {
             testPrintE("CPU: %i wifi_stop_supplicant() failed, rv: %i\n",
                 cpu, rv);
             exit(23);
@@ -420,7 +420,7 @@
         // Stop wpa_supplicant
         // Might already be stopped, in which case request should
         // return immediately with success.
-        if ((rv = wifi_stop_supplicant()) != 0) {
+        if ((rv = wifi_stop_supplicant(false)) != 0) {
             testPrintE("init stop supplicant failed, rv: %i", rv);
             exit(42);
         }