diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-08 20:07:47 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-08 20:07:47 +0000 |
commit | 41a7c3f648ab38b8792a827f0c83eea920c272c3 (patch) | |
tree | 233e4605cf0231626cb7997bf0fad77f0b5fdb59 | |
parent | 3fcbc190233c637776f8f7b3af56042128c31fed (diff) | |
parent | 4327cd2217a025b64dc8d62a7d16f994cf52b512 (diff) | |
download | wpa_supplicant_8-41a7c3f648ab38b8792a827f0c83eea920c272c3.tar.gz |
Merge cherrypicks of [14129455, 14130265, 14129457, 14130197, 14130199, 14130200, 14130201, 14130203, 14129438, 14129439, 14129732, 14129441, 14130241, 14129733, 14129734, 14130308, 14130309, 14130310, 14130312] into security-aosp-qt-releaseandroid-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android10-security-release
Change-Id: I5d12de6aee898413b0c627bf3e9a8ba119dc888a
-rw-r--r-- | src/p2p/p2p_pd.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c index 3994ec03..05fd5934 100644 --- a/src/p2p/p2p_pd.c +++ b/src/p2p/p2p_pd.c @@ -595,14 +595,12 @@ void p2p_process_prov_disc_req(struct p2p_data *p2p, const u8 *sa, goto out; } + dev = p2p_get_device(p2p, sa); if (!dev) { - dev = p2p_get_device(p2p, sa); - if (!dev) { - p2p_dbg(p2p, - "Provision Discovery device not found " - MACSTR, MAC2STR(sa)); - goto out; - } + p2p_dbg(p2p, + "Provision Discovery device not found " + MACSTR, MAC2STR(sa)); + goto out; } } else if (msg.wfd_subelems) { wpabuf_free(dev->info.wfd_subelems); |