Multi-bss (aka vap) support for 802.11 devices.

Note this includes changes to all drivers and moves some device firmware
loading to use firmware(9) and a separate module (e.g. ral).  Also there
no longer are separate wlan_scan* modules; this functionality is now
bundled into the wlan module.

Supported by:	Hobnob and Marvell
Reviewed by:	many
Obtained from:	Atheros (some bits)

21 files changed, 125 insertions, 32 deletions

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index b5de9b8e0c54..46b5eb07d137 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -311,8 +311,7 @@ SUBDIR=	${_3dfx} \
 	wlan_acl \
 	wlan_amrr \
 	wlan_ccmp \
-	wlan_scan_ap \
-	wlan_scan_sta \
+	wlan_rssadapt \
 	wlan_tkip \
 	wlan_wep \
 	wlan_xauth \
diff --git a/sys/modules/ath_rate_amrr/Makefile b/sys/modules/ath_rate_amrr/Makefile
index 5523815cd96f..0405da2f4685 100644
--- a/sys/modules/ath_rate_amrr/Makefile
+++ b/sys/modules/ath_rate_amrr/Makefile
@@ -40,7 +40,7 @@
 
 KMOD=	ath_rate
 SRCS=	amrr.c
-SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h
+SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h opt_wlan.h
 
 HAL=	${.CURDIR}/../../contrib/dev/ath
 CFLAGS+=  -I. -I${.CURDIR}/../../dev/ath -I${HAL}
@@ -56,7 +56,13 @@ ATH_MODULE_ARCH=powerpc-be
 ATH_MODULE_ARCH=${MACHINE_ARCH}
 .endif
 
+.if !defined(KERNBUILDDIR)
 opt_ah.h: ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h
 	cp ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h ${.TARGET}
 
+opt_wlan.h:
+#	echo "#define IEEE80211_DEBUG 1" > opt_wlan.h
+	echo > opt_wlan.h
+.endif
+
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ath_rate_onoe/Makefile b/sys/modules/ath_rate_onoe/Makefile
index c111e2644da3..2edd73f138dc 100644
--- a/sys/modules/ath_rate_onoe/Makefile
+++ b/sys/modules/ath_rate_onoe/Makefile
@@ -40,7 +40,7 @@
 
 KMOD=	ath_rate
 SRCS=	onoe.c
-SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h
+SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h opt_wlan.h
 
 HAL=	${.CURDIR}/../../contrib/dev/ath
 CFLAGS+=  -I. -I${.CURDIR}/../../dev/ath -I${HAL}
@@ -56,7 +56,13 @@ ATH_MODULE_ARCH=powerpc-be
 ATH_MODULE_ARCH=${MACHINE_ARCH}
 .endif
 
+.if !defined(KERNBUILDDIR)
 opt_ah.h: ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h
 	cp ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h ${.TARGET}
 
+opt_wlan.h:
+	echo "#define IEEE80211_DEBUG 1" > opt_wlan.h
+#	echo > opt_wlan.h
+.endif
+
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ath_rate_sample/Makefile b/sys/modules/ath_rate_sample/Makefile
index fc91e2b8562e..4a13f23e484d 100644
--- a/sys/modules/ath_rate_sample/Makefile
+++ b/sys/modules/ath_rate_sample/Makefile
@@ -40,7 +40,7 @@
 
 KMOD=	ath_rate
 SRCS=	sample.c
-SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h
+SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h opt_wlan.h
 
 HAL=	${.CURDIR}/../../contrib/dev/ath
 CFLAGS+=  -I. -I${.CURDIR}/../../dev/ath -I${HAL}
@@ -56,7 +56,13 @@ ATH_MODULE_ARCH=powerpc-be
 ATH_MODULE_ARCH=${MACHINE_ARCH}
 .endif
 
+.if !defined(KERNBUILDDIR)
 opt_ah.h: ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h
 	cp ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h ${.TARGET}
 
+opt_wlan.h:
+#	echo "#define IEEE80211_DEBUG 1" > opt_wlan.h
+	echo > opt_wlan.h
+.endif
+
 .include <bsd.kmod.mk>
diff --git a/sys/modules/malo/Makefile b/sys/modules/malo/Makefile
index c0e88c5c022b..78861027dfa4 100644
--- a/sys/modules/malo/Makefile
+++ b/sys/modules/malo/Makefile
@@ -3,6 +3,10 @@
 .PATH: ${.CURDIR}/../../dev/malo
 
 KMOD    = if_malo
-SRCS    = if_malo.c if_malohal.c if_malo_pci.c device_if.h bus_if.h pci_if.h
+SRCS    = if_malo.c if_malohal.c if_malo_pci.c
+SRCS+=	device_if.h bus_if.h pci_if.h opt_malo.h
+
+opt_malo.h:
+	echo '#define MALO_DEBUG 1'> $@
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ral/Makefile b/sys/modules/ral/Makefile
index 2ec55bff722e..6a3b269f5bb3 100644
--- a/sys/modules/ral/Makefile
+++ b/sys/modules/ral/Makefile
@@ -2,8 +2,8 @@
 
 .PATH: ${.CURDIR}/../../dev/ral
 
-KMOD    = if_ral
-SRCS    = rt2560.c rt2661.c if_ralrate.c if_ral_pci.c \
-          device_if.h bus_if.h pci_if.h
+KMOD=	if_ral
+SRCS=	rt2560.c rt2661.c if_ral_pci.c
+SRCS+=	device_if.h bus_if.h pci_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ralfw/Makefile b/sys/modules/ralfw/Makefile
new file mode 100644
index 000000000000..3db53add36cb
--- /dev/null
+++ b/sys/modules/ralfw/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR=	rt2561 rt2561s rt2661 rt2860
+
+.include <bsd.subdir.mk>
diff --git a/sys/modules/ralfw/Makefile.inc b/sys/modules/ralfw/Makefile.inc
new file mode 100644
index 000000000000..2dc6b47a1043
--- /dev/null
+++ b/sys/modules/ralfw/Makefile.inc
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+#
+# Common rules for building firmware.  Note this gets auto-included
+# by the subdir Makefile's as a consequence of included bsd.kmod.mk.
+#
+KMOD=	${IMG}fw
+_FIRM=	${IMG}.fw
+
+CLEANFILES+=	${_FIRM}
+
+FIRMWS=	${_FIRM}:${KMOD}
+
+${_FIRM}: ${.CURDIR}/../../../contrib/dev/ral/${_FIRM}.uu
+	uudecode -p $? > ${.TARGET}
diff --git a/sys/modules/ralfw/rt2561/Makefile b/sys/modules/ralfw/rt2561/Makefile
new file mode 100644
index 000000000000..71044a60927a
--- /dev/null
+++ b/sys/modules/ralfw/rt2561/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+IMG=	rt2561
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/ralfw/rt2561s/Makefile b/sys/modules/ralfw/rt2561s/Makefile
new file mode 100644
index 000000000000..40c6bc1cc94c
--- /dev/null
+++ b/sys/modules/ralfw/rt2561s/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+IMG=	rt2561s
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/ralfw/rt2661/Makefile b/sys/modules/ralfw/rt2661/Makefile
new file mode 100644
index 000000000000..b372786c1a74
--- /dev/null
+++ b/sys/modules/ralfw/rt2661/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+IMG=	rt2661
+
+.include <bsd.kmod.mk>
+
diff --git a/sys/modules/wlan/Makefile b/sys/modules/wlan/Makefile
index 57122180a39a..b6f10e308818 100644
--- a/sys/modules/wlan/Makefile
+++ b/sys/modules/wlan/Makefile
@@ -3,16 +3,18 @@
 .PATH: ${.CURDIR}/../../net80211
 
 KMOD=	wlan
-SRCS=	ieee80211.c ieee80211_crypto.c ieee80211_crypto_none.c \
+SRCS=	ieee80211.c ieee80211_crypto.c ieee80211_crypto_none.c ieee80211_dfs.c \
 	ieee80211_freebsd.c ieee80211_input.c ieee80211_ioctl.c \
-	ieee80211_node.c ieee80211_output.c ieee80211_power.c \
-	ieee80211_proto.c ieee80211_scan.c ieee80211_regdomain.c \
-	ieee80211_ht.c
-SRCS+=	bus_if.h device_if.h opt_compat.h opt_inet.h opt_ipx.h
+	ieee80211_node.c ieee80211_output.c ieee80211_phy.c ieee80211_power.c \
+	ieee80211_proto.c ieee80211_scan.c ieee80211_scan_sta.c \
+	ieee80211_regdomain.c ieee80211_ht.c \
+	ieee80211_adhoc.c ieee80211_hostap.c ieee80211_monitor.c \
+	ieee80211_sta.c ieee80211_wds.c
+SRCS+=	bus_if.h device_if.h opt_inet.h opt_ipx.h opt_wlan.h
 
 .if !defined(KERNBUILDDIR)
-opt_compat.h:
-	echo "#define COMPAT_FREEBSD6 1" > ${.TARGET}
+opt_wlan.h:
+	echo "#define IEEE80211_DEBUG 1" > opt_wlan.h
 
 opt_inet.h:
 	echo "#define INET 1" > opt_inet.h
diff --git a/sys/modules/wlan_acl/Makefile b/sys/modules/wlan_acl/Makefile
index aa71de2eebf8..59228599996e 100644
--- a/sys/modules/wlan_acl/Makefile
+++ b/sys/modules/wlan_acl/Makefile
@@ -4,5 +4,11 @@
 
 KMOD=	wlan_acl
 SRCS=	ieee80211_acl.c
+SRCS+=	opt_wlan.h
+
+.if !defined(KERNBUILDDIR)
+opt_wlan.h:
+	echo "#define IEEE80211_DEBUG 1" > opt_wlan.h
+.endif
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/wlan_amrr/Makefile b/sys/modules/wlan_amrr/Makefile
index ac7b5ce25517..481d124d280e 100644
--- a/sys/modules/wlan_amrr/Makefile
+++ b/sys/modules/wlan_amrr/Makefile
@@ -4,5 +4,11 @@
 
 KMOD=	wlan_amrr
 SRCS=	ieee80211_amrr.c
+SRCS+=	opt_wlan.h
+
+.if !defined(KERNBUILDDIR)
+opt_wlan.h:
+	echo "#define IEEE80211_DEBUG 1" > opt_wlan.h
+.endif
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/wlan_ccmp/Makefile b/sys/modules/wlan_ccmp/Makefile
index 06bafcec6eed..bbf8f6207fa4 100644
--- a/sys/modules/wlan_ccmp/Makefile
+++ b/sys/modules/wlan_ccmp/Makefile
@@ -6,5 +6,11 @@
 KMOD=	wlan_ccmp
 SRCS=	ieee80211_crypto_ccmp.c
 SRCS+=	rijndael-alg-fst.c rijndael-api.c
+SRCS+=	opt_wlan.h
+
+.if !defined(KERNBUILDDIR)
+opt_wlan.h:
+	echo "#define IEEE80211_DEBUG 1" > opt_wlan.h
+.endif
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/wlan_rssadapt/Makefile b/sys/modules/wlan_rssadapt/Makefile
new file mode 100644
index 000000000000..2285afc34dd6
--- /dev/null
+++ b/sys/modules/wlan_rssadapt/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../net80211
+
+KMOD=	wlan_rssadapt
+SRCS=	ieee80211_rssadapt.c
+SRCS+=	opt_wlan.h
+
+.if !defined(KERNBUILDDIR)
+opt_wlan.h:
+	echo "#define IEEE80211_DEBUG 1" > opt_wlan.h
+.endif
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/wlan_scan_ap/Makefile b/sys/modules/wlan_scan_ap/Makefile
deleted file mode 100644
index 117a6bca3d87..000000000000
--- a/sys/modules/wlan_scan_ap/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../net80211
-
-KMOD=	wlan_scan_ap
-SRCS=	ieee80211_scan_ap.c
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/wlan_scan_sta/Makefile b/sys/modules/wlan_scan_sta/Makefile
deleted file mode 100644
index 8d96875d5fdf..000000000000
--- a/sys/modules/wlan_scan_sta/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../net80211
-
-KMOD=	wlan_scan_sta
-SRCS=	ieee80211_scan_sta.c
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/wlan_tkip/Makefile b/sys/modules/wlan_tkip/Makefile
index 1449b78479e0..80c19f85fa05 100644
--- a/sys/modules/wlan_tkip/Makefile
+++ b/sys/modules/wlan_tkip/Makefile
@@ -4,5 +4,11 @@
 
 KMOD=	wlan_tkip
 SRCS=	ieee80211_crypto_tkip.c
+SRCS+=	opt_wlan.h
+
+.if !defined(KERNBUILDDIR)
+opt_wlan.h:
+	echo "#define IEEE80211_DEBUG 1" > opt_wlan.h
+.endif
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/wlan_wep/Makefile b/sys/modules/wlan_wep/Makefile
index 88ad322bb5e7..3a5c6dcb9792 100644
--- a/sys/modules/wlan_wep/Makefile
+++ b/sys/modules/wlan_wep/Makefile
@@ -4,5 +4,11 @@
 
 KMOD=	wlan_wep
 SRCS=	ieee80211_crypto_wep.c
+SRCS+=	opt_wlan.h
+
+.if !defined(KERNBUILDDIR)
+opt_wlan.h:
+	echo "#define IEEE80211_DEBUG 1" > opt_wlan.h
+.endif
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/wlan_xauth/Makefile b/sys/modules/wlan_xauth/Makefile
index fba6f8aabb46..1877fd18eb44 100644
--- a/sys/modules/wlan_xauth/Makefile
+++ b/sys/modules/wlan_xauth/Makefile
@@ -4,5 +4,11 @@
 
 KMOD=	wlan_xauth
 SRCS=	ieee80211_xauth.c
+SRCS+=	opt_wlan.h
+
+.if !defined(KERNBUILDDIR)
+opt_wlan.h:
+	echo "#define IEEE80211_DEBUG 1" > opt_wlan.h
+.endif
 
 .include <bsd.kmod.mk>