commit 29ecca6d67dc6d73842a2b1dd13e6b4911239200
author Les Lee <lesl@google.com> Tue Nov 03 04:59:47 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 03 04:59:47 2020 +0000
tree 5d4de30e22a69c7c4bb11b47ebc2d4c6a5f2f825
parent 04a4ca61333df2c57d6f9aa54d7e998a7c22da9c
parent fb44dcb6524a82a613e52b9e9d1a0abd74f7f0ea

Merge "wifi: Remove ACS check to set HT/VHT capability"

hostapd/hidl/1.3/hostapd.cpp

diff --git a/hostapd/hidl/1.3/hostapd.cpp b/hostapd/hidl/1.3/hostapd.cpp
index 668d8f4..ee3a44e 100644
--- a/hostapd/hidl/1.3/hostapd.cpp
+++ b/hostapd/hidl/1.3/hostapd.cpp
@@ -359,7 +359,7 @@
 		if (((band & IHostapd::BandMask::BAND_5_GHZ) != 0)
 		    || ((band & IHostapd::BandMask::BAND_6_GHZ) != 0)) {
 			hw_mode_as_string = "hw_mode=any";
-			if (iface_params.V1_1.V1_0.channelParams.enableAcs) {
+			if (iface_params.V1_1.V1_0.hwModeParams.enable80211AC) {
 				ht_cap_vht_oper_chwidth_as_string =
 				    "ht_capab=[HT40+]\n"
 				    "vht_oper_chwidth=1";
@@ -371,7 +371,7 @@
 		if (((band & IHostapd::BandMask::BAND_5_GHZ) != 0)
 		    || ((band & IHostapd::BandMask::BAND_6_GHZ) != 0)) {
 			hw_mode_as_string = "hw_mode=a";
-			if (iface_params.V1_1.V1_0.channelParams.enableAcs) {
+			if (iface_params.V1_1.V1_0.hwModeParams.enable80211AC) {
 				ht_cap_vht_oper_chwidth_as_string =
 				    "ht_capab=[HT40+]\n"
 				    "vht_oper_chwidth=1";