AOSP: Leftover edits from old commit

This came in as a part of the following AOSP commit. The actual
change was since then removed, but the remaining code was not
restored to match the upstream version. This should be reverted.

commit 687922c7347bdc3b4f8c921efe1d1388cb3baac0
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Mon Mar 26 14:02:32 2012 -0700

    Update to Version 0.8.24 from BRCM

    - Add 'conc_priority' command
    - Fix handling a single channel concurrency case: If conc_priority
      is not set, advertise the frequency conflict to the framework and
      disable the new connection attempted
    - When P2P Interface gets removed due to single channel frequency
      conflict, show GROUP_REMOVE reason=FREQ_CONFLICT
    - Fix sched scan processing

    Change-Id: Ie6fe105cebd379a0a9c49ace62d2e48e71571107
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index a2584bd31cdc430d22fb5fe800dab52ef1aa2e00..a0f51d0cb225f1b9343cb01b66b1c5737bd2e029 100644 (file)
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -271,8 +271,9 @@ wpa_supplicant_start_sched_scan(struct wpa_supplicant *wpa_s,
        ret = wpa_drv_sched_scan(wpa_s, params, interval * 1000);
        if (ret)
                wpa_supplicant_notify_scanning(wpa_s, 0);
-       else
+       else {
                wpa_s->sched_scanning = 1;
+       }
 
        return ret;
 }