diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-05-11 03:24:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-11 03:24:07 +0000 |
| commit | 0dc477cdcdb9cdbe94a4f3394d2ef408ccaace1b (patch) | |
| tree | f37eed74221d708d8618236c45238d3fd96ca5f7 | |
| parent | 14cece23e88943f9253f23d34b941a7761cb555e (diff) | |
| parent | d33d4b8aa610fafd763e15a557b3e07f5ad6f2f7 (diff) | |
| download | wpa_supplicant_8-pie-dev.tar.gz | |
Merge "p2p: p2p_go_ht40 won't take effect" into pi-devpie-dev
| -rw-r--r-- | wpa_supplicant/hidl/1.0/p2p_iface.cpp | 4 | ||||
| -rw-r--r-- | 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<SupplicantStatus, std::string> 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<SupplicantStatus, std::string> 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, ""}, {}}; } |