Snap for 11275524 from 153f22ebfb9e3ef921cdc93d8462a7c5dcaca672 to 24Q2-release

Change-Id: I5761996ab95f83f66140ff041b0a433ffa54afe4
diff --git a/hostapd/android.config b/hostapd/android.config
index eaeda89..1c4dab2 100644
--- a/hostapd/android.config
+++ b/hostapd/android.config
@@ -141,6 +141,14 @@
 CONFIG_IEEE80211AX=y
 endif
 
+# IEEE 802.11be EHT (Extremely High Throughput) support
+# Note: Enabling CONFIG_IEEE80211BE requires CONFIG_IEEE80211AX to be enabled as well. Therefore,
+# the hostapd/Android.mk file automatically enables CONFIG_IEEE80211AX when CONFIG_IEEE80211BE is
+# enabled here.
+ifeq ($(WIFI_FEATURE_HOSTAPD_11BE), true)
+CONFIG_IEEE80211BE=y
+endif
+
 # Remove debugging code that is printing out debug messages to stdout.
 # This can be used to reduce the size of the hostapd considerably if debugging
 # code is not needed.
diff --git a/src/ap/ieee802_11_eht.c b/src/ap/ieee802_11_eht.c
index 1d17518..c1ccda4 100644
--- a/src/ap/ieee802_11_eht.c
+++ b/src/ap/ieee802_11_eht.c
@@ -955,7 +955,7 @@
 		goto out;
 	}
 
-	wpa_printf(MSG_DEBUG, "MLD: expected_common_info_len=%lu",
+	wpa_printf(MSG_DEBUG, "MLD: expected_common_info_len=%zu",
 		   common_info_len);
 
 	if (sizeof(*ml) + common_info_len > ml_len) {
@@ -1125,7 +1125,7 @@
 		ml_len -= sub_elem_len;
 
 		wpa_printf(MSG_DEBUG, "MLD: link ctrl=0x%x, " MACSTR
-			   ", nstr bitmap len=%lu",
+			   ", nstr bitmap len=%zu",
 			   control, MAC2STR(link_info->peer_addr),
 			   link_info->nstr_bitmap_len);