diff options
| author | Roshan Pius <rpius@google.com> | 2017-05-16 15:35:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-16 15:35:46 +0000 |
| commit | 371e7edacd15d4a6e14dd6c811f5094429c1b4da (patch) | |
| tree | 6b9b7c99eeaad1d4fd91bb45372f487f351a15a5 | |
| parent | 6ce1376e2fd7f57464150a13467a39cad5a06e3d (diff) | |
| parent | 502ff36f1f5d010bb6347cdee07ef9cd98067c99 (diff) | |
| download | wpa_supplicant_8-371e7edacd15d4a6e14dd6c811f5094429c1b4da.tar.gz | |
Merge "wpa_supplicant(hidl): Reset disallowed frequencies" into oc-dev am: f2f12c8ac2
am: 502ff36f1f
Change-Id: Ic4e6d31fca9d097fe93e4b16e8d0fa2e35edb273
| -rw-r--r-- | wpa_supplicant/hidl/p2p_iface.cpp | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/wpa_supplicant/hidl/p2p_iface.cpp b/wpa_supplicant/hidl/p2p_iface.cpp index 195c6b95..1dddb340 100644 --- a/wpa_supplicant/hidl/p2p_iface.cpp +++ b/wpa_supplicant/hidl/p2p_iface.cpp @@ -856,21 +856,22 @@ SupplicantStatus P2pIface::setListenChannelInternal( SupplicantStatus P2pIface::setDisallowedFrequenciesInternal( const std::vector<FreqRange>& ranges) { - if (ranges.size() == 0) { - return {SupplicantStatusCode::FAILURE_ARGS_INVALID, ""}; - } struct wpa_supplicant* wpa_s = retrieveIfacePtr(); using DestT = struct wpa_freq_range_list::wpa_freq_range; - DestT* freq_ranges = - static_cast<DestT*>(os_malloc(sizeof(DestT) * ranges.size())); - if (!freq_ranges) { - return {SupplicantStatusCode::FAILURE_UNKNOWN, ""}; - } - uint32_t i = 0; - for (const auto& range : ranges) { - freq_ranges[i].min = range.min; - freq_ranges[i].max = range.max; - i++; + DestT* freq_ranges = nullptr; + // Empty ranges is used to enable all frequencies. + if (ranges.size() != 0) { + freq_ranges = + static_cast<DestT*>(os_malloc(sizeof(DestT) * ranges.size())); + if (!freq_ranges) { + return {SupplicantStatusCode::FAILURE_UNKNOWN, ""}; + } + uint32_t i = 0; + for (const auto& range : ranges) { + freq_ranges[i].min = range.min; + freq_ranges[i].max = range.max; + i++; + } } os_free(wpa_s->global->p2p_disallow_freq.range); |