diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-10-10 17:56:13 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-10-10 17:56:13 -0700 |
| commit | 8bc8d61f47b31c12b3e858febca6c62f1e93fef5 (patch) | |
| tree | 27d425e794ee5483418953e7410fff65067e555b | |
| parent | 6f642747421d41d3e19322dc60f662af9be5be66 (diff) | |
| parent | 82ef0c66b9996009b29f59a2ea91474de3e17f52 (diff) | |
| download | android_hardware_qcom_wlan-8bc8d61f47b31c12b3e858febca6c62f1e93fef5.tar.gz android_hardware_qcom_wlan-8bc8d61f47b31c12b3e858febca6c62f1e93fef5.tar.bz2 android_hardware_qcom_wlan-8bc8d61f47b31c12b3e858febca6c62f1e93fef5.zip | |
Merge "Wi-Fi HAL GSCAN: remove check for matched request_id for FULL_SCAN_RESULT"
| -rw-r--r-- | qcwcn/wifi_hal/gscan_event_handler.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/qcwcn/wifi_hal/gscan_event_handler.cpp b/qcwcn/wifi_hal/gscan_event_handler.cpp index eca40dd..d2961e4 100644 --- a/qcwcn/wifi_hal/gscan_event_handler.cpp +++ b/qcwcn/wifi_hal/gscan_event_handler.cpp @@ -445,11 +445,13 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event) reqId = nla_get_u32( tbVendor[QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_REQUEST_ID] ); - /* If this is not for us, just ignore it. */ + /* If event has a different request_id, ignore that and use the + * request_id value which we're maintaining. + */ if (reqId != mRequestId) { - ALOGE("%s: Event has Req. ID:%d <> Ours:%d, ignore it.", + ALOGE("%s: Event has Req. ID:%d <> Ours:%d, continue...", __func__, reqId, mRequestId); - break; + reqId = mRequestId; } /* Parse and extract the results. */ |