diff options
| author | Xin Li <delphij@google.com> | 2024-03-06 09:29:57 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2024-03-06 09:29:57 -0800 |
| commit | 553f743a4dec11d53d79ab8dc213a0af8d646230 (patch) | |
| tree | bdd3a5ddb83ba783284898191e6c4c73abb1b346 /wpa_supplicant/p2p_supplicant.c | |
| parent | 0e57f94e6a0b9d6804a86ac04a831657875f3ae2 (diff) | |
| parent | 990ff3dfe094e669ef0bf3c1176d02cd01ce8807 (diff) | |
| download | wpa_supplicant_8-553f743a4dec11d53d79ab8dc213a0af8d646230.tar.gz | |
Merge Android 14 QPR2 to AOSP main
Bug: 319669529
Merged-In: Ie6d6540f66a9ed5fb2043909637b51382b198292
Change-Id: I536561ee611c72971701c86a7e30dc7bc29e6432
Diffstat (limited to 'wpa_supplicant/p2p_supplicant.c')
| -rw-r--r-- | wpa_supplicant/p2p_supplicant.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index 09c11e06..db991779 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -2666,6 +2666,7 @@ done: wfd_dev_info_len, wfd_r2_dev_info, wfd_r2_dev_info_len, new_device); os_free(wfd_dev_info); + os_free(wfd_r2_dev_info); } @@ -2904,7 +2905,7 @@ static void wpas_prov_disc_req(void *ctx, const u8 *peer, u16 config_methods, wpa_printf(MSG_DEBUG, "P2P: Could not generate PIN"); wpas_notify_p2p_provision_discovery( wpa_s, peer, 0 /* response */, - P2P_PROV_DISC_INFO_UNAVAILABLE, 0, 0); + P2P_PROV_DISC_INFO_UNAVAILABLE, 0, 0, NULL); return; } wpas_prov_disc_local_display(wpa_s, peer, params, @@ -2917,7 +2918,8 @@ static void wpas_prov_disc_req(void *ctx, const u8 *peer, u16 config_methods, wpas_notify_p2p_provision_discovery(wpa_s, peer, 1 /* request */, P2P_PROV_DISC_SUCCESS, - config_methods, generated_pin); + config_methods, generated_pin, + group ? group->ifname : NULL); } @@ -2955,7 +2957,7 @@ static void wpas_prov_disc_resp(void *ctx, const u8 *peer, u16 config_methods) wpa_printf(MSG_DEBUG, "P2P: Could not generate PIN"); wpas_notify_p2p_provision_discovery( wpa_s, peer, 0 /* response */, - P2P_PROV_DISC_INFO_UNAVAILABLE, 0, 0); + P2P_PROV_DISC_INFO_UNAVAILABLE, 0, 0, NULL); return; } wpas_prov_disc_local_display(wpa_s, peer, params, @@ -2966,7 +2968,8 @@ static void wpas_prov_disc_resp(void *ctx, const u8 *peer, u16 config_methods) wpas_notify_p2p_provision_discovery(wpa_s, peer, 0 /* response */, P2P_PROV_DISC_SUCCESS, - config_methods, generated_pin); + config_methods, generated_pin, + NULL); } @@ -3013,7 +3016,7 @@ static void wpas_prov_disc_fail(void *ctx, const u8 *peer, } wpas_notify_p2p_provision_discovery(wpa_s, peer, 0 /* response */, - status, 0, 0); + status, 0, 0, NULL); } |