wpa: Enable MBO

Enable WiFi 6 MBO (Multi Band Operation). MBO is a prereq to 802.11ax.

MBO allows the efficient use of multiple frequency bands (channels).

To facilitate MBO, WNM (Wireless Network Monitoring) is a prerequisite.
It is required to build.

Tested by:	philip

(cherry picked from commit 3968b47cd974e503df303265f3be9ba5865499ab)

3 files changed, 7 insertions, 0 deletions

diff --git a/usr.sbin/wpa/Makefile.inc b/usr.sbin/wpa/Makefile.inc
index a6d54812f5f9..16b2e94959f3 100644
--- a/usr.sbin/wpa/Makefile.inc
+++ b/usr.sbin/wpa/Makefile.inc
@@ -66,6 +66,9 @@ CFLAGS+=-DEAP_SERVER_TLS
 CFLAGS+=-DEAP_SERVER_TTLS
 CFLAGS+=-DEAP_SERVER_WSC
 CFLAGS+=-DEAP_TLS_FUNCS
+CFLAGS+=-DCONFIG_WNM
+CFLAGS+=-DCONFIG_WNM_AP
+CFLAGS+=-DCONFIG_MBO
 
 .if ${MK_WPA_SUPPLICANT_EAPOL} != "no"
 CFLAGS+=-DCONFIG_HS20 \
diff --git a/usr.sbin/wpa/src/ap/Makefile b/usr.sbin/wpa/src/ap/Makefile
index b6d53b0d5dbb..162b8b5444aa 100644
--- a/usr.sbin/wpa/src/ap/Makefile
+++ b/usr.sbin/wpa/src/ap/Makefile
@@ -28,6 +28,7 @@ SRCS=	accounting.c \
 	ieee802_11_shared.c \
 	ieee802_11_vht.c \
 	ieee802_1x.c \
+	mbo_ap.c \
 	neighbor_db.c \
 	pmksa_cache_auth.c \
 	preauth_auth.c \
@@ -39,6 +40,7 @@ SRCS=	accounting.c \
 	vlan_ifconfig.c \
 	vlan_init.c \
 	wmm.c \
+	wnm_ap.c \
 	wpa_auth.c \
 	wpa_auth_glue.c \
 	wpa_auth_ie.c \
diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile
index edebe05b4515..e71b491ebe8b 100644
--- a/usr.sbin/wpa/wpa_supplicant/Makefile
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile
@@ -22,6 +22,7 @@ SRCS=	bss.c \
 	events.c \
 	gas_query.c \
 	main.c \
+	mbo.c \
 	notify.c \
 	op_classes.c \
 	offchannel.c \
@@ -31,6 +32,7 @@ SRCS=	bss.c \
 	scan.c \
 	twt.c \
 	wmm_ac.c \
+	wnm_sta.c \
 	wpa_supplicant.c \
 	wpas_glue.c