From 1b166fb091b262273e129c6019c4d07a5ded665d Mon Sep 17 00:00:00 2001 From: Navtej Singh Mann Date: Wed, 2 Sep 2015 18:44:10 -0700 Subject: fix scan_id and flag for ScanData bug: 23766442 Change-Id: I4455e11e079468236800c45f98c0394f3ce26e96 --- bcmdhd/wifi_hal/gscan.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bcmdhd/wifi_hal/gscan.cpp b/bcmdhd/wifi_hal/gscan.cpp index 8a21a0d..b41c16a 100644 --- a/bcmdhd/wifi_hal/gscan.cpp +++ b/bcmdhd/wifi_hal/gscan.cpp @@ -19,7 +19,7 @@ #include "sync.h" #define LOG_TAG "WifiHAL" -//#define LOG_NDEBUG 1 //uncomment to enable verbose logging +//#define LOG_NDEBUG 0 //uncomment to enable verbose logging #include @@ -923,8 +923,8 @@ public: mCompleted = it.get_u8(); ALOGV("retrieved mCompleted flag : %d", mCompleted); } else if (it.get_type() == GSCAN_ATTRIBUTE_SCAN_RESULTS || it.get_type() == 0) { + int scan_id = 0, flags = 0, num = 0; for (nl_iterator it2(it.get()); it2.has_next(); it2.next()) { - int scan_id = 0, flags = 0, num = 0; if (it2.get_type() == GSCAN_ATTRIBUTE_SCAN_ID) { scan_id = it2.get_u32(); ALOGV("retrieved scan_id : 0x%0x", scan_id); @@ -952,6 +952,7 @@ public: mScans[mRetrieved].scan_id = scan_id; mScans[mRetrieved].flags = flags; mScans[mRetrieved].num_results = num; + ALOGV("Setting result of scan_id : 0x%0x", mScans[mRetrieved].scan_id); memcpy(mScans[mRetrieved].results, &(mScanResults[mNextScanResult]), num * sizeof(wifi_scan_result)); mNextScanResult += num; -- cgit v1.1