diff options
| author | Glen Kuhne <kuh@google.com> | 2017-05-19 22:41:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-19 22:41:39 +0000 |
| commit | b77f4c6ed5d4d598963f344530fac74dfd673882 (patch) | |
| tree | e5b3d459a89541205e78e1b4327829618e6be02a | |
| parent | f401e087473f37562fa7dbc56a3d8c49de8d4d66 (diff) | |
| parent | 553d451a3d75f70ef8eb5996222532c9312697ae (diff) | |
| download | wpa_supplicant_8-b77f4c6ed5d4d598963f344530fac74dfd673882.tar.gz | |
Merge "P2P: Fix hidl service discovery request" into oc-dev
am: 553d451a3d
Change-Id: I46c61ae1be6b8ff0cfe10a9eb224d917d675cf32
| -rw-r--r-- | wpa_supplicant/hidl/1.0/p2p_iface.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/wpa_supplicant/hidl/1.0/p2p_iface.cpp b/wpa_supplicant/hidl/1.0/p2p_iface.cpp index 40b4b9cd..9a048eb5 100644 --- a/wpa_supplicant/hidl/1.0/p2p_iface.cpp +++ b/wpa_supplicant/hidl/1.0/p2p_iface.cpp @@ -987,8 +987,11 @@ std::pair<SupplicantStatus, uint64_t> P2pIface::requestServiceDiscoveryInternal( if (!query_buf) { return {{SupplicantStatusCode::FAILURE_UNKNOWN, ""}, {}}; } + const uint8_t* dst_addr = is_zero_ether_addr(peer_address.data()) + ? nullptr + : peer_address.data(); uint64_t identifier = - wpas_p2p_sd_request(wpa_s, peer_address.data(), query_buf.get()); + wpas_p2p_sd_request(wpa_s, dst_addr, query_buf.get()); if (identifier == 0) { return {{SupplicantStatusCode::FAILURE_UNKNOWN, ""}, {}}; } |