Snap for 4778776 from 0dc477cdcdb9cdbe94a4f3394d2ef408ccaace1b to pi-release
Change-Id: I2fe95fd7217358b66dfa512cbbc537cb29db6a13
diff --git a/wpa_supplicant/hidl/1.0/p2p_iface.cpp b/wpa_supplicant/hidl/1.0/p2p_iface.cpp
index ab4014d..7a94a31 100644
--- a/wpa_supplicant/hidl/1.0/p2p_iface.cpp
+++ b/wpa_supplicant/hidl/1.0/p2p_iface.cpp
@@ -697,11 +697,13 @@
wps_method = WPS_PIN_KEYPAD;
break;
}
+ int vht = wpa_s->conf->p2p_go_vht;
+ int ht40 = wpa_s->conf->p2p_go_ht40 || vht;
const char* pin = pre_selected_pin.length() > 0 ? pre_selected_pin.data() : nullptr;
int new_pin = wpas_p2p_connect(
wpa_s, peer_address.data(), pin, wps_method,
persistent, false, join_existing_group, false, go_intent_signed, 0, 0, -1,
- false, false, false, VHT_CHANWIDTH_USE_HT, nullptr, 0);
+ false, ht40, vht, VHT_CHANWIDTH_USE_HT, nullptr, 0);
if (new_pin < 0) {
return {{SupplicantStatusCode::FAILURE_UNKNOWN, ""}, {}};
}
diff --git a/wpa_supplicant/hidl/1.1/p2p_iface.cpp b/wpa_supplicant/hidl/1.1/p2p_iface.cpp
index fe04048..5de383d 100644
--- a/wpa_supplicant/hidl/1.1/p2p_iface.cpp
+++ b/wpa_supplicant/hidl/1.1/p2p_iface.cpp
@@ -697,11 +697,13 @@
wps_method = WPS_PIN_KEYPAD;
break;
}
+ int vht = wpa_s->conf->p2p_go_vht;
+ int ht40 = wpa_s->conf->p2p_go_ht40 || vht;
const char* pin = pre_selected_pin.length() > 0 ? pre_selected_pin.data() : nullptr;
int new_pin = wpas_p2p_connect(
wpa_s, peer_address.data(), pin, wps_method,
persistent, false, join_existing_group, false, go_intent_signed, 0, 0, -1,
- false, false, false, VHT_CHANWIDTH_USE_HT, nullptr, 0);
+ false, ht40, vht, VHT_CHANWIDTH_USE_HT, nullptr, 0);
if (new_pin < 0) {
return {{SupplicantStatusCode::FAILURE_UNKNOWN, ""}, {}};
}
