diff options
| author | Navtej Singh Mann <navtejsingh@google.com> | 2015-09-04 21:51:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-04 21:51:39 +0000 |
| commit | 12adb215ec340bb452148d8cf9010b84012484d2 (patch) | |
| tree | 46952bd087809b724bda8f4183936631d3d20d3e | |
| parent | a3682de7467a41e268bc31a3681caa77ca00122f (diff) | |
| parent | 00ba595d14221e3f78e286fac51073124e362538 (diff) | |
| download | hardware_broadcom_wlan-12adb215ec340bb452148d8cf9010b84012484d2.zip hardware_broadcom_wlan-12adb215ec340bb452148d8cf9010b84012484d2.tar.gz hardware_broadcom_wlan-12adb215ec340bb452148d8cf9010b84012484d2.tar.bz2 | |
am 00ba595d: Merge "fix scan_id and flag for ScanData" into mnc-dr-dev
* commit '00ba595d14221e3f78e286fac51073124e362538':
fix scan_id and flag for ScanData
| -rw-r--r-- | bcmdhd/wifi_hal/gscan.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bcmdhd/wifi_hal/gscan.cpp b/bcmdhd/wifi_hal/gscan.cpp index 31d35a1..418537b 100644 --- a/bcmdhd/wifi_hal/gscan.cpp +++ b/bcmdhd/wifi_hal/gscan.cpp @@ -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); @@ -956,6 +956,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; |