diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-08 16:40:52 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-08 16:40:52 +0000 |
| commit | 7be6a8e76d0a24d8f3bdf6ee0778e745a78c0faf (patch) | |
| tree | bac95ce69d0fe89942391c20927a210e6d16a483 | |
| parent | 7a5cc012fbb0d62ce93b3e684fec8480cfa170b8 (diff) | |
| parent | 4cfd7155c5591118dde945f8809778f4ec4e3158 (diff) | |
| download | wpa_supplicant_8-pie-security-release.tar.gz | |
Merge cherrypicks of [14126781, 14126782, 14127202, 14128466, 14127516, 14128057, 14127204, 14128747, 14128708, 14128059, 14128686, 14128127, 14128507, 14128809, 14128810, 14128811, 14128812] into security-aosp-pi-releaseandroid-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69pie-security-release
Change-Id: I1a7887877d8299d5121eb45d3b99200f4597391a
| -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); |