Return detailed error code at wpas_p2p_mac_setup
Change wpas_p2p_mac_setup to return internal function's error code
when error occurs, not returning just -EINVAL.
Bug: 235182238
Test: After apply ag/19035853 and ag/19212748 and this,
atest VtsHalWifiSupplicantP2pIfaceTargetTest
Change-Id: I81a07d7cb0772aee72c45509298cc7aad646be20
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index ccbb1b7..14ce58c 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -4743,6 +4743,7 @@
int wpas_p2p_mac_setup(struct wpa_supplicant *wpa_s)
{
+ int ret = 0;
u8 addr[ETH_ALEN] = {0};
if (wpa_s->conf->p2p_device_random_mac_addr == 0)
@@ -4780,16 +4781,20 @@
wpa_msg(wpa_s, MSG_DEBUG, "Restore last used MAC address.");
}
- if (wpa_drv_set_mac_addr(wpa_s, addr) < 0) {
+ ret = wpa_drv_set_mac_addr(wpa_s, addr);
+
+ if (ret < 0) {
wpa_msg(wpa_s, MSG_INFO,
"Failed to set random MAC address");
- return -EINVAL;
+ return ret;
}
- if (wpa_supplicant_update_mac_addr(wpa_s) < 0) {
+ ret = wpa_supplicant_update_mac_addr(wpa_s);
+
+ if (ret < 0) {
wpa_msg(wpa_s, MSG_INFO,
"Could not update MAC address information");
- return -EINVAL;
+ return ret;
}
wpa_msg(wpa_s, MSG_DEBUG, "Using random MAC address " MACSTR,