commit b7677dc90699688aaad9ec25ec3d5312320ef895
author Sunil Ravi <sunilravi@google.com> Thu Sep 08 01:16:14 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 08 01:16:14 2022 +0000
tree 78caccafd4f8a1873be341ba65aabdc3255f5820
parent 349d97aab02a1fff6079b4faad05f583da76fd2c
parent 054eab9e17659eb10a2b1dcb6ee7b8c50af993e3

Merge "Don't set he_oper_chwidth for 2.4GHz only band" am: fedda03499 am: 054eab9e17

Original change: https://android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/2209802

Change-Id: I70216931bd179c54311f9ae9c02fc056fe35e296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

hostapd/aidl/hostapd.cpp

diff --git a/hostapd/aidl/hostapd.cpp b/hostapd/aidl/hostapd.cpp
index 11d1290..680d8d0 100644
--- a/hostapd/aidl/hostapd.cpp
+++ b/hostapd/aidl/hostapd.cpp
@@ -547,17 +547,18 @@
 			iface_params.hwModeParams.enable80211AC ? 2 : 0);
 		break;
 	default:
-		if (!is_2Ghz_band_only && !is_60Ghz_used
-		    && iface_params.hwModeParams.enable80211AC) {
-			ht_cap_vht_oper_he_oper_chwidth_as_string =
+		if (!is_2Ghz_band_only && !is_60Ghz_used) {
+			if (iface_params.hwModeParams.enable80211AC) {
+				ht_cap_vht_oper_he_oper_chwidth_as_string =
 					"ht_capab=[HT40+]\n"
 					"vht_oper_chwidth=1\n";
-		}
+			}
 #ifdef CONFIG_IEEE80211AX
-		if (iface_params.hwModeParams.enable80211AX && !is_60Ghz_used) {
-			ht_cap_vht_oper_he_oper_chwidth_as_string += "he_oper_chwidth=1";
-		}
+			if (iface_params.hwModeParams.enable80211AX) {
+				ht_cap_vht_oper_he_oper_chwidth_as_string += "he_oper_chwidth=1";
+			}
 #endif
+		}
 		break;
 	}