From d33d4b8aa610fafd763e15a557b3e07f5ad6f2f7 Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Wed, 25 Apr 2018 15:32:50 +0800 Subject: p2p: p2p_go_ht40 won't take effect Calling wpas_p2p_connect in HIDL will always pass FALSE for ht40 and vht arguments. This two arguments should follow config value normally. Bug: 78446806 Test: Manually on B1 PPR1.180412.005 Wifi Direct CtsVerifier Change-Id: I00803cc656ee15560ad1c8a27a92e036a21ea482 --- wpa_supplicant/hidl/1.0/p2p_iface.cpp | 4 +++- wpa_supplicant/hidl/1.1/p2p_iface.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/wpa_supplicant/hidl/1.0/p2p_iface.cpp b/wpa_supplicant/hidl/1.0/p2p_iface.cpp index ab4014d3..7a94a310 100644 --- a/wpa_supplicant/hidl/1.0/p2p_iface.cpp +++ b/wpa_supplicant/hidl/1.0/p2p_iface.cpp @@ -697,11 +697,13 @@ std::pair P2pIface::connectInternal( 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 fe040484..5de383d6 100644 --- a/wpa_supplicant/hidl/1.1/p2p_iface.cpp +++ b/wpa_supplicant/hidl/1.1/p2p_iface.cpp @@ -697,11 +697,13 @@ std::pair P2pIface::connectInternal( 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, ""}, {}}; } -- cgit v1.2.3