diff options
Diffstat (limited to 'bcmdhd')
| -rw-r--r-- | bcmdhd/firmware/bcm4339/fw_bcmdhd.bin | bin | 562183 -> 562183 bytes | |||
| -rw-r--r-- | bcmdhd/firmware/bcm4339/fw_bcmdhd_apsta.bin | bin | 500032 -> 500031 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | bcmdhd/firmware/bcm4356/fw_bcm4356_ap_pcie.bin | bin | 587904 -> 588177 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | bcmdhd/firmware/bcm4356/fw_bcm4356_pcie.bin | bin | 660565 -> 660986 bytes | |||
| -rw-r--r-- | bcmdhd/firmware/bcm4358/fw_bcm4358.bin | bin | 636836 -> 638488 bytes | |||
| -rw-r--r-- | bcmdhd/firmware/bcm4358/fw_bcm4358_ap.bin | bin | 552717 -> 554369 bytes | |||
| -rw-r--r-- | bcmdhd/wifi_hal/gscan.cpp | 7 |
7 files changed, 4 insertions, 3 deletions
diff --git a/bcmdhd/firmware/bcm4339/fw_bcmdhd.bin b/bcmdhd/firmware/bcm4339/fw_bcmdhd.bin Binary files differindex 044f73b..69f622a 100644 --- a/bcmdhd/firmware/bcm4339/fw_bcmdhd.bin +++ b/bcmdhd/firmware/bcm4339/fw_bcmdhd.bin diff --git a/bcmdhd/firmware/bcm4339/fw_bcmdhd_apsta.bin b/bcmdhd/firmware/bcm4339/fw_bcmdhd_apsta.bin Binary files differindex 5cf5df5..4546384 100644 --- a/bcmdhd/firmware/bcm4339/fw_bcmdhd_apsta.bin +++ b/bcmdhd/firmware/bcm4339/fw_bcmdhd_apsta.bin diff --git a/bcmdhd/firmware/bcm4356/fw_bcm4356_ap_pcie.bin b/bcmdhd/firmware/bcm4356/fw_bcm4356_ap_pcie.bin Binary files differindex ff38ccb..977bc79 100755..100644 --- a/bcmdhd/firmware/bcm4356/fw_bcm4356_ap_pcie.bin +++ b/bcmdhd/firmware/bcm4356/fw_bcm4356_ap_pcie.bin diff --git a/bcmdhd/firmware/bcm4356/fw_bcm4356_pcie.bin b/bcmdhd/firmware/bcm4356/fw_bcm4356_pcie.bin Binary files differindex 98c6c48..8184b44 100755..100644 --- a/bcmdhd/firmware/bcm4356/fw_bcm4356_pcie.bin +++ b/bcmdhd/firmware/bcm4356/fw_bcm4356_pcie.bin diff --git a/bcmdhd/firmware/bcm4358/fw_bcm4358.bin b/bcmdhd/firmware/bcm4358/fw_bcm4358.bin Binary files differindex 25fd8ec..41b02f3 100644 --- a/bcmdhd/firmware/bcm4358/fw_bcm4358.bin +++ b/bcmdhd/firmware/bcm4358/fw_bcm4358.bin diff --git a/bcmdhd/firmware/bcm4358/fw_bcm4358_ap.bin b/bcmdhd/firmware/bcm4358/fw_bcm4358_ap.bin Binary files differindex be4fae9..bc836e6 100644 --- a/bcmdhd/firmware/bcm4358/fw_bcm4358_ap.bin +++ b/bcmdhd/firmware/bcm4358/fw_bcm4358_ap.bin diff --git a/bcmdhd/wifi_hal/gscan.cpp b/bcmdhd/wifi_hal/gscan.cpp index b41c16a..418537b 100644 --- a/bcmdhd/wifi_hal/gscan.cpp +++ b/bcmdhd/wifi_hal/gscan.cpp @@ -935,6 +935,10 @@ public: num = it2.get_u32(); ALOGV("retrieved num_results: %d", num); } else if (it2.get_type() == GSCAN_ATTRIBUTE_SCAN_RESULTS) { + if (mRetrieved >= mMax) { + ALOGW("Stored %d scans, ignoring excess results", mRetrieved); + break; + } num = it2.get_len() / sizeof(wifi_scan_result); num = min(MAX_RESULTS - mNextScanResult, num); num = min((int)MAX_AP_CACHE_PER_SCAN, num); @@ -957,9 +961,6 @@ public: &(mScanResults[mNextScanResult]), num * sizeof(wifi_scan_result)); mNextScanResult += num; mRetrieved++; - if (mRetrieved >= mMax && it.has_next()) { - ALOGW("Ignoring attributes after this scan"); - } } else { ALOGW("Ignoring invalid attribute type = %d, size = %d", it.get_type(), it.get_len()); |